This commit was manufactured by cvs2svn to create branch 'R3_2_5_patches'.
diff --git a/features/org.eclipse.jst.enterprise_core.feature.patch/.project b/features/org.eclipse.jst.enterprise_core.feature.patch/.project
new file mode 100644
index 0000000..fa4494a
--- /dev/null
+++ b/features/org.eclipse.jst.enterprise_core.feature.patch/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.jst.enterprise_core.feature.patch</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/features/org.eclipse.jst.enterprise_core.feature.patch/build.properties b/features/org.eclipse.jst.enterprise_core.feature.patch/build.properties
new file mode 100644
index 0000000..cb50260
--- /dev/null
+++ b/features/org.eclipse.jst.enterprise_core.feature.patch/build.properties
@@ -0,0 +1,5 @@
+bin.includes = feature.xml,\
+ license.html,\
+ feature.properties,\
+ epl-v10.html,\
+ eclipse_update_120.jpg
diff --git a/features/org.eclipse.jst.enterprise_core.feature.patch/buildnotes_org.eclipse.jst.enterprise_core.feature.patch.html b/features/org.eclipse.jst.enterprise_core.feature.patch/buildnotes_org.eclipse.jst.enterprise_core.feature.patch.html
new file mode 100644
index 0000000..e5f8898
--- /dev/null
+++ b/features/org.eclipse.jst.enterprise_core.feature.patch/buildnotes_org.eclipse.jst.enterprise_core.feature.patch.html
@@ -0,0 +1,38 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta name="Build" content="Build">
+<title>WTP 3.0.5 Patches</title>
+</head>
+
+<body>
+
+<h1>WTP 3.0.5 Patches</h1>
+
+<h2>org.eclipse.jst.enterprise_core.feature</h2>
+<p>Bug <a
+ href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=280624'>280624</a>.
+WebServicesManager's getAllWorkspaceServiceRefs should get the JEE 5 versions as well</p>
+<p>Bug <a
+ href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=291225'>291225</a>.
+Output folder support in JavaEE projects</p>
+<p>Bug <a
+ href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=292457'>292457</a>.
+EJB client project source and ouput should synch up with EJB project</p>
+<p>Bug <a
+ href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=299770'>299770</a>.
+Warning occurs on MessageDrivenBean creation due to .javajet template</p>
+<p>Bug <a
+ href='https://bugs.eclipse.org/313630'>313630</a>.
+V1 Validator extension point changes for performance</p>
+<p>Bug <a
+ href='https://bugs.eclipse.org/319735'>319735</a>.
+Unwanted newlines before display name value</p>
+<p>Bug <a
+ href='https://bugs.eclipse.org/346300'>346300</a>.
+Create EJB Client Jar action creates an empty project but with no source code or interfaces</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_core.feature.patch/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_core.feature.patch/eclipse_update_120.jpg
new file mode 100644
index 0000000..bfdf708
--- /dev/null
+++ b/features/org.eclipse.jst.enterprise_core.feature.patch/eclipse_update_120.jpg
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_core.feature.patch/epl-v10.html b/features/org.eclipse.jst.enterprise_core.feature.patch/epl-v10.html
new file mode 100644
index 0000000..ed4b196
--- /dev/null
+++ b/features/org.eclipse.jst.enterprise_core.feature.patch/epl-v10.html
@@ -0,0 +1,328 @@
+<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 ("AGREEMENT"). 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'>"Contribution" 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'>"Contributor" means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>"Licensed Patents " 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'>"Program" means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>"Recipient" 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 ("Commercial
+Contributor") hereby agrees to defend and indemnify every other
+Contributor ("Indemnified Contributor") against any losses, damages and
+costs (collectively "Losses") 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 "AS IS" 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]> <![endif]><o:p></o:p></p>
+
+</div>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_core.feature.patch/feature.properties b/features/org.eclipse.jst.enterprise_core.feature.patch/feature.properties
new file mode 100644
index 0000000..45438bb
--- /dev/null
+++ b/features/org.eclipse.jst.enterprise_core.feature.patch/feature.properties
@@ -0,0 +1,153 @@
+###############################################################################
+# Copyright (c) 2007 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=WTP Patch for org.eclipse.jst.enterprise_core.feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "updateSiteName" property - label for the update site
+updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
+
+# "description" property - description of the feature
+description=\
+This patch feature fixes problems as described in following bugs:\n\
+Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=280624 WebServicesManager's getAllWorkspaceServiceRefs should get the JEE 5 versions as well\n\
+Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=291225 Output folder support in JavaEE projects\n\
+Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=292457 EJB client project source and ouput should synch up with EJB project\n\
+Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=299770 Warning occurs on MessageDrivenBean creation due to .javajet template\n\
+Bug https://bugs.eclipse.org/313630 V1 Validator extension point changes for performance\n\
+Bug https://bugs.eclipse.org/319735 Unwanted newlines before display name value\n\
+Bug https://bugs.eclipse.org/346300 Create EJB Client Jar action creates an empty project but with no source code or interfaces\n\
+\n\
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2007 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+ IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+licenseURL=license.html
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+September 27, 2007\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+ - Content may be structured and packaged into modules to facilitate delivering,\n\
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+ plug-in fragments ("Fragments"), and features ("Features").\n\
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
+ in a directory named "plugins".\n\
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+ Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+ Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+ numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+ - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+ - The top-level (root) directory\n\
+ - Plug-in and Fragment directories\n\
+ - Inside Plug-ins and Fragments packaged as JARs\n\
+ - Sub-directories of the directory named "src" of certain Plug-ins\n\
+ - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+ - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+ - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_core.feature.patch/feature.xml b/features/org.eclipse.jst.enterprise_core.feature.patch/feature.xml
new file mode 100644
index 0000000..0f21149
--- /dev/null
+++ b/features/org.eclipse.jst.enterprise_core.feature.patch/feature.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.jst.enterprise_core.feature.patch"
+ label="%featureName"
+ version="3.0.5.qualifier"
+ provider-name="%providerName">
+
+ <description>%description</description>
+
+ <copyright>%copyright</copyright>
+
+ <license url="%licenseURL">%license</license>
+
+
+ <requires>
+ <import feature="org.eclipse.jst.enterprise_core.feature" version="3.0.5.v200905070430-42E_5_kE77d9ICR7Z_H" patch="true"/>
+ </requires>
+
+ <plugin
+ id="org.eclipse.jst.j2ee.webservice"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jst.j2ee.ejb"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jst.j2ee.jca"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+</feature>
diff --git a/features/org.eclipse.jst.enterprise_core.feature.patch/license.html b/features/org.eclipse.jst.enterprise_core.feature.patch/license.html
new file mode 100644
index 0000000..2347060
--- /dev/null
+++ b/features/org.eclipse.jst.enterprise_core.feature.patch/license.html
@@ -0,0 +1,93 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
+<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
+<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
+<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
+<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
+<BODY lang=EN-US vLink=purple link=blue>
+<H2>Eclipse Foundation Software User Agreement</H2>
+<P>January 28, 2005</P>
+<H3>Usage Of Content</H3>
+<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
+THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
+TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
+BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
+AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
+APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
+MAY NOT USE THE CONTENT.</P>
+<H3>Applicable Licenses</H3>
+<P>Unless otherwise indicated, all Content made available by the Eclipse
+Foundation is provided to you under the terms and conditions of the Eclipse
+Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
+Content and is also available at <A
+href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
+For purposes of the EPL, "Program" will mean the Content.</P>
+<P>Content includes, but is not limited to, source code, object code,
+documentation and other files maintained in the Eclipse.org CVS repository
+("Repository") in CVS modules ("Modules") and made available as downloadable
+archives ("Downloads").</P>
+<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
+("Fragments"), and features ("Features"). A Feature is a bundle of one or more
+Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
+contain a list of the names and version numbers of the Plug-ins and/or Fragments
+associated with a Feature. Plug-ins and Fragments are located in directories
+named "plugins" and Features are located in directories named "features".</P>
+<P>Features may also include other Features ("Included Features"). Files named
+"feature.xml" may contain a list of the names and version numbers of Included
+Features.</P>
+<P>The terms and conditions governing Plug-ins and Fragments should be contained
+in files named "about.html" ("Abouts"). The terms and conditions governing
+Features and Included Features should be contained in files named "license.html"
+("Feature Licenses"). Abouts and Feature Licenses may be located in any
+directory of a Download or Module including, but not limited to the following
+locations:</P>
+<UL>
+ <LI>The top-level (root) directory
+ <LI>Plug-in and Fragment directories
+ <LI>Subdirectories of the directory named "src" of certain Plug-ins
+ <LI>Feature directories </LI></UL>
+<P>Note: if a Feature made available by the Eclipse Foundation is installed
+using the Eclipse Update Manager, you must agree to a license ("Feature Update
+License") during the installation process. If the Feature contains Included
+Features, the Feature Update License should either provide you with the terms
+and conditions governing the Included Features or inform you where you can
+locate them. Feature Update Licenses may be found in the "license" property of
+files named "feature.properties". Such Abouts, Feature Licenses and Feature
+Update Licenses contain the terms and conditions (or references to such terms
+and conditions) that govern your use of the associated Content in that
+directory.</P>
+<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
+OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
+<UL>
+ <LI>Common Public License Version 1.0 (available at <A
+ href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
+
+ <LI>Apache Software License 1.1 (available at <A
+ href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
+
+ <LI>Apache Software License 2.0 (available at <A
+ href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
+
+ <LI>IBM Public License 1.0 (available at <A
+ href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
+
+ <LI>Metro Link Public License 1.00 (available at <A
+ href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
+
+ <LI>Mozilla Public License Version 1.1 (available at <A
+ href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
+ </LI></UL>
+<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
+provided, please contact the Eclipse Foundation to determine what terms and
+conditions govern that particular Content.</P>
+<H3>Cryptography</H3>
+<P>Content may contain encryption software. The country in which you are
+currently may have restrictions on the import, possession, and use, and/or
+re-export to another country, of encryption software. BEFORE using any
+encryption software, please check the country's laws, regulations and policies
+concerning the import, possession, or use, and re-export of encryption software,
+to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html b/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html
index d1d3642..be6108e 100644
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html
+++ b/features/org.eclipse.jst.enterprise_ui.feature.patch/buildnotes_org.eclipse.jst.enterprise_ui.feature.patch.html
@@ -4,21 +4,17 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="Build" content="Build">
-<title>WTP 3.2.2 Patches</title>
+<title>WTP 3.2.4 Patches</title>
</head>
<body>
-<h1>WTP 3.2.2 Patches</h1>
+<h1>WTP 3.2.4 Patches</h1>
<h2>org.eclipse.jst.enterprise_ui.feature</h2>
-<p>Bug <a href='https://bugs.eclipse.org/325990'>325990</a>. The "Use an existing Servlet class or JSP" option in the new servlet wizard does not work for Web 3.0 projects</p>
-<p>Bug <a href='https://bugs.eclipse.org/326102'>326102</a>. Better classpath tagging defaults</p>
-<p>Bug <a href='https://bugs.eclipse.org/326417'>326417</a>. Deployment Assembly Verifier for classpath entries</p>
-<p>Bug <a href='https://bugs.eclipse.org/326468'>326468</a>. Duplicate accelerator key in new web project wizard</p>
-<p>Bug <a href='https://bugs.eclipse.org/326549'>326549</a>. Web Service Wizard Can Default to invalid project type</p>
-<p>Bug <a href='https://bugs.eclipse.org/326963'>326963</a>. NPE when running Servlet on server if servlet-class is not defined</p>
+<p>Bug <a href='https://bugs.eclipse.org/344733'>344733</a>. [JAX-RS] Upon selection, the JAX-RS Configuration page is blank when Project Facets page has unapplied changes</p>
+<p>Bug <a href='https://bugs.eclipse.org/345667'>345667</a>. NPE when creating a servlet if created in a source folder with java build path exclusion patters</p>
</body>
</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties
index 8fc5680..4500af7 100644
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties
+++ b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.properties
@@ -28,12 +28,8 @@
\n\
The fixes are described in the following bugzilla entries:\n\
\n\
-Bug https://bugs.eclipse.org/325990 The "Use an existing Servlet class or JSP" option in the new servlet wizard does not work for Web 3.0 projects\n\
-Bug https://bugs.eclipse.org/326102 Better classpath tagging defaults\n\
-Bug https://bugs.eclipse.org/326417 Deployment Assembly Verifier for classpath entries\n\
-Bug https://bugs.eclipse.org/326468 Duplicate accelerator key in new web project wizard\n\
-Bug https://bugs.eclipse.org/326549 Web Service Wizard Can Default to invalid project type\n\
-Bug https://bugs.eclipse.org/326963 NPE when running Servlet on server if <servlet-class> is not defined\n\
+Bug https://bugs.eclipse.org/344733 [JAX-RS] Upon selection, the JAX-RS Configuration page is blank when Project Facets page has unapplied changes\n\
+Bug https://bugs.eclipse.org/345667 NPE when creating a servlet if created in a source folder with java build path exclusion patters\n\
\n\
# "copyright" property - text of the "Feature Update Copyright"
diff --git a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml
index 39f9fd1..69fead2 100644
--- a/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml
+++ b/features/org.eclipse.jst.enterprise_ui.feature.patch/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.enterprise_ui.feature.patch"
label="%featureName"
- version="3.2.2.qualifier"
+ version="3.2.4.qualifier"
provider-name="%providerName">
<description>
@@ -18,17 +18,10 @@
</license>
<requires>
- <import feature="org.eclipse.jst.enterprise_ui.feature" version="3.2.2.v201008190400-7b7GHf2FSK2WBLQ2D-mrubYEOrRh" patch="true"/>
+ <import feature="org.eclipse.jst.enterprise_ui.feature" version="3.2.4.v201104201417-7b7HHfYFSK2WDvSHB0pTyNZ7TpYo" patch="true"/>
</requires>
<plugin
- id="org.eclipse.jst.j2ee.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.jst.servlet.ui"
download-size="0"
install-size="0"
@@ -36,21 +29,7 @@
unpack="false"/>
<plugin
- id="org.eclipse.jst.ws.creation.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.consumption.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jee.ui"
+ id="org.eclipse.jst.ws.jaxrs.ui"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html b/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html
index 7fd27b2..f6a6b85 100644
--- a/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html
+++ b/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html
@@ -9,21 +9,13 @@
<body>
-<h1>WTP 3.2.2 Patches</h1>
+<h1>WTP 3.2.4 Patches</h1>
<h2>org.eclipse.jst.web_core.feature</h2>
-<p>Bug <a href='https://bugs.eclipse.org/325529'>325529</a>. TaglibIndex cache turning over references too frequently</p>
-<p>Bug <a href='https://bugs.eclipse.org/325800'>325800</a>. EAR Import failing with improper interpreted spec versions</p>
-<p>Bug <a href='https://bugs.eclipse.org/325818'>325818</a>. Attribute value parsed incorrectly in a jsp</p>
-<p>Bug <a href='https://bugs.eclipse.org/325879'>325879</a>. NPE in org.eclipse.jst.jsp.core.internal.java.XMLJSPRegionHelper.decodeRemainingRegions(XMLJSPRegionHelper.java:278)</p>
-<p>Bug <a href='https://bugs.eclipse.org/325894'>325894</a>. Protect EARUtilities.getJ2EEModuleReferences from NPE</p>
-<p>Bug <a href='https://bugs.eclipse.org/326102'>326102</a>. Better classpath tagging defaults</p>
-<p>Bug <a href='https://bugs.eclipse.org/326413'>326413</a>. Imported Utility JARs should have their deploy path set to the library directory</p>
-<p>Bug <a href='https://bugs.eclipse.org/326467'>326467</a>. NPE when removing an EAR reference with no archiveName attribute defined</p>
-<p>Bug <a href='https://bugs.eclipse.org/326576'>326576</a>. When importing an EAR archive, the Component file's Archive names and Deployment Paths are incorrect</p>
-<p>Bug <a href='https://bugs.eclipse.org/326713'>326713</a>. ConnectorResourceImpl not setting versionID</p>
-<p>Bug <a href='https://bugs.eclipse.org/326934'>326934</a>. Changing warning message string</p>
+<p>Bug <a href='https://bugs.eclipse.org/345778'>345778</a>. Duplicate tld entries in taglib index</p>
+<p>Bug <a href='https://bugs.eclipse.org/352515'>352515</a>. ContainerImpl#getFile(String URI) will not always find a file (even if the container has the file)</p>
+<p>Bug <a href='https://bugs.eclipse.org/362308'>362308</a>. Deadlock when changing the target runtime of EAR project and its modules during autobuild</p>
</body>
</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_core.feature.patch/feature.properties b/features/org.eclipse.jst.web_core.feature.patch/feature.properties
index 2d952b9..dc4868e 100644
--- a/features/org.eclipse.jst.web_core.feature.patch/feature.properties
+++ b/features/org.eclipse.jst.web_core.feature.patch/feature.properties
@@ -27,17 +27,9 @@
description=\
The bugs and fixes are described in the following bugzilla entries:\n\
\n\
-Bug https://bugs.eclipse.org/325529 TaglibIndex cache turning over references too frequently\n\
-Bug https://bugs.eclipse.org/325800 EAR Import failing with improper interpreted spec versions\n\
-Bug https://bugs.eclipse.org/325818 Attribute value parsed incorrectly in a jsp\n\
-Bug https://bugs.eclipse.org/325879 NPE in org.eclipse.jst.jsp.core.internal.java.XMLJSPRegionHelper.decodeRemainingRegions(XMLJSPRegionHelper.java:278)\n\
-Bug https://bugs.eclipse.org/325894 Protect EARUtilities.getJ2EEModuleReferences from NPE\n\
-Bug https://bugs.eclipse.org/326102 Better classpath tagging defaults\n\
-Bug https://bugs.eclipse.org/326413 Imported Utility JARs should have their deploy path set to the library directory\n\
-Bug https://bugs.eclipse.org/326467 NPE when removing an EAR reference with no archiveName attribute defined\n\
-Bug https://bugs.eclipse.org/326576 When importing an EAR archive, the Component file's Archive names and Deployment Paths are incorrect\n\
-Bug https://bugs.eclipse.org/326713 ConnectorResourceImpl not setting versionID\n\
-Bug https://bugs.eclipse.org/326934 Changing warning message string\n\
+Bug https://bugs.eclipse.org/345778 Duplicate tld entries in taglib index\n\
+Bug https://bugs.eclipse.org/359892 ContainerImpl#getFile(String URI) will not always find a file (even if the container has the file)\n\
+Bug https://bugs.eclipse.org/362308 Deadlock when changing the target runtime of EAR project and its modules during autobuild\n\
\n\
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
diff --git a/features/org.eclipse.jst.web_core.feature.patch/feature.xml b/features/org.eclipse.jst.web_core.feature.patch/feature.xml
index 7d97041..82aaa9d 100644
--- a/features/org.eclipse.jst.web_core.feature.patch/feature.xml
+++ b/features/org.eclipse.jst.web_core.feature.patch/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.web_core.feature.patch"
label="%featureName"
- version="3.2.2.qualifier"
+ version="3.2.4.qualifier"
provider-name="%providerName">
<description>
@@ -18,7 +18,7 @@
</license>
<requires>
- <import feature="org.eclipse.jst.web_core.feature" version="3.2.2.v201008170029-7Q7BG75FE9Le9BCy-tZxTqohz000" patch="true"/>
+ <import feature="org.eclipse.jst.web_core.feature" version="3.2.4.v201103231838-7Q7BG7OFE9LeABBX5jb4Ltojqz-7oEpj5963" patch="true"/>
</requires>
<plugin
@@ -27,14 +27,7 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.web"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
+
<plugin
id="org.eclipse.jst.j2ee.core"
download-size="0"
diff --git a/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF
index c5a3f64..8373e00 100644
--- a/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.jst.j2ee.core; singleton:=true
-Bundle-Version: 1.2.3.qualifier
+Bundle-Version: 1.2.7.qualifier
Bundle-Activator: org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveOpenFailureException.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveOpenFailureException.java
index 053a0e9..e2e3ffc 100644
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveOpenFailureException.java
+++ b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveOpenFailureException.java
@@ -10,10 +10,14 @@
*******************************************************************************/
package org.eclipse.jst.jee.archive;
+import org.eclipse.core.runtime.IPath;
+
public class ArchiveOpenFailureException extends ArchiveException {
private static final long serialVersionUID = -7366116122777721148L;
+ private IPath _archivePath = null;
+
public ArchiveOpenFailureException(String message) {
super(message);
}
@@ -26,4 +30,13 @@
super(message, cause);
}
+ public ArchiveOpenFailureException(IPath archivePath, String message, Throwable cause){
+ super(message, cause);
+ this._archivePath = archivePath;
+ }
+
+ public IPath getArchivePath() {
+ return _archivePath;
+ }
+
}
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
index aa7d8bc..9dd0ba9 100644
--- 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
@@ -39,11 +39,11 @@
import org.eclipse.jst.j2ee.commonarchivecore.internal.WebModuleRef;
import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage;
import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseconfigPackageImpl;
+import org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin;
import org.eclipse.jst.j2ee.ejb.EjbPackage;
+import org.eclipse.jst.j2ee.internal.J2EEInit;
import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
/**
@@ -170,14 +170,7 @@
// Initialize simple dependencies
EcorePackage.eINSTANCE.eClass();
- Webservice_clientPackage.eINSTANCE.eClass();
- CommonPackage.eINSTANCE.eClass();
- WebapplicationPackage.eINSTANCE.eClass();
- EjbPackage.eINSTANCE.eClass();
- JspPackage.eINSTANCE.eClass();
- ApplicationPackage.eINSTANCE.eClass();
- ClientPackage.eINSTANCE.eClass();
- JcaPackage.eINSTANCE.eClass();
+ J2EEInit.initEMFModels();
JavaRefPackage.eINSTANCE.eClass();
// Obtain or create and register interdependencies
@@ -542,74 +535,86 @@
// Add subpackages
getESubpackages().add(theLooseconfigPackage);
- // Add supertypes to classes
- fileEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
- archiveEClass.getESuperTypes().add(this.getContainer());
- ejbJarFileEClass.getESuperTypes().add(this.getModuleFile());
- warFileEClass.getESuperTypes().add(this.getModuleFile());
- earFileEClass.getESuperTypes().add(this.getModuleFile());
- applicationClientFileEClass.getESuperTypes().add(this.getModuleFile());
- moduleFileEClass.getESuperTypes().add(this.getArchive());
- containerEClass.getESuperTypes().add(this.getFile());
- readOnlyDirectoryEClass.getESuperTypes().add(this.getContainer());
- rarFileEClass.getESuperTypes().add(this.getModuleFile());
- moduleRefEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
- ejbModuleRefEClass.getESuperTypes().add(this.getModuleRef());
- webModuleRefEClass.getESuperTypes().add(this.getModuleRef());
- clientModuleRefEClass.getESuperTypes().add(this.getModuleRef());
- connectorModuleRefEClass.getESuperTypes().add(this.getModuleRef());
-
- // Initialize classes and features; add operations and parameters
- initEClass(fileEClass, File.class, "File", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getFile_URI(), ecorePackage.getEString(), "URI", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFile_LastModified(), ecorePackage.getELong(), "lastModified", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFile_Size(), ecorePackage.getELong(), "size", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFile_DirectoryEntry(), ecorePackage.getEBoolean(), "directoryEntry", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFile_OriginalURI(), ecorePackage.getEString(), "originalURI", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFile_LoadingContainer(), this.getContainer(), null, "loadingContainer", null, 1, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFile_Container(), this.getContainer(), this.getContainer_Files(), "container", null, 0, 1, File.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(archiveEClass, Archive.class, "Archive", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getArchive_Types(), ecorePackage.getEString(), "types", null, 0, -1, Archive.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(ejbJarFileEClass, EJBJarFile.class, "EJBJarFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getEJBJarFile_DeploymentDescriptor(), theEjbPackage.getEJBJar(), null, "deploymentDescriptor", null, 1, 1, EJBJarFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(warFileEClass, WARFile.class, "WARFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getWARFile_DeploymentDescriptor(), theWebapplicationPackage.getWebApp(), null, "deploymentDescriptor", null, 1, 1, WARFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(earFileEClass, EARFile.class, "EARFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getEARFile_ModuleRefs(), this.getModuleRef(), this.getModuleRef_EarFile(), "moduleRefs", null, 1, -1, EARFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEARFile_DeploymentDescriptor(), theApplicationPackage.getApplication(), null, "deploymentDescriptor", null, 1, 1, EARFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(applicationClientFileEClass, ApplicationClientFile.class, "ApplicationClientFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getApplicationClientFile_DeploymentDescriptor(), theClientPackage.getApplicationClient(), null, "deploymentDescriptor", null, 1, 1, ApplicationClientFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(moduleFileEClass, ModuleFile.class, "ModuleFile", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(containerEClass, Container.class, "Container", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getContainer_Files(), this.getFile(), this.getFile_Container(), "files", null, 0, -1, Container.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(readOnlyDirectoryEClass, ReadOnlyDirectory.class, "ReadOnlyDirectory", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(rarFileEClass, RARFile.class, "RARFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getRARFile_DeploymentDescriptor(), theJcaPackage.getConnector(), null, "deploymentDescriptor", null, 1, 1, RARFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(moduleRefEClass, ModuleRef.class, "ModuleRef", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getModuleRef_ModuleFile(), this.getModuleFile(), null, "moduleFile", null, 1, 1, ModuleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getModuleRef_EarFile(), this.getEARFile(), this.getEARFile_ModuleRefs(), "earFile", null, 1, 1, ModuleRef.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getModuleRef_Module(), theApplicationPackage.getModule(), null, "module", null, 1, 1, ModuleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(ejbModuleRefEClass, EJBModuleRef.class, "EJBModuleRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(webModuleRefEClass, WebModuleRef.class, "WebModuleRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(clientModuleRefEClass, ClientModuleRef.class, "ClientModuleRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(connectorModuleRefEClass, ConnectorModuleRef.class, "ConnectorModuleRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- // Create resource
- createResource(eNS_URI);
+ boolean hasLock = false;
+ try {
+ hasLock = J2EEInit.aquireInitializePackageContentsLock();
+ } catch (InterruptedException e) {
+ J2EECorePlugin.logError(e);
+ }
+
+ try{
+ // Add supertypes to classes
+ fileEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
+ archiveEClass.getESuperTypes().add(this.getContainer());
+ ejbJarFileEClass.getESuperTypes().add(this.getModuleFile());
+ warFileEClass.getESuperTypes().add(this.getModuleFile());
+ earFileEClass.getESuperTypes().add(this.getModuleFile());
+ applicationClientFileEClass.getESuperTypes().add(this.getModuleFile());
+ moduleFileEClass.getESuperTypes().add(this.getArchive());
+ containerEClass.getESuperTypes().add(this.getFile());
+ readOnlyDirectoryEClass.getESuperTypes().add(this.getContainer());
+ rarFileEClass.getESuperTypes().add(this.getModuleFile());
+ moduleRefEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
+ ejbModuleRefEClass.getESuperTypes().add(this.getModuleRef());
+ webModuleRefEClass.getESuperTypes().add(this.getModuleRef());
+ clientModuleRefEClass.getESuperTypes().add(this.getModuleRef());
+ connectorModuleRefEClass.getESuperTypes().add(this.getModuleRef());
+
+ // Initialize classes and features; add operations and parameters
+ initEClass(fileEClass, File.class, "File", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getFile_URI(), ecorePackage.getEString(), "URI", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getFile_LastModified(), ecorePackage.getELong(), "lastModified", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getFile_Size(), ecorePackage.getELong(), "size", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getFile_DirectoryEntry(), ecorePackage.getEBoolean(), "directoryEntry", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getFile_OriginalURI(), ecorePackage.getEString(), "originalURI", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getFile_LoadingContainer(), this.getContainer(), null, "loadingContainer", null, 1, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getFile_Container(), this.getContainer(), this.getContainer_Files(), "container", null, 0, 1, File.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(archiveEClass, Archive.class, "Archive", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getArchive_Types(), ecorePackage.getEString(), "types", null, 0, -1, Archive.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(ejbJarFileEClass, EJBJarFile.class, "EJBJarFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getEJBJarFile_DeploymentDescriptor(), theEjbPackage.getEJBJar(), null, "deploymentDescriptor", null, 1, 1, EJBJarFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(warFileEClass, WARFile.class, "WARFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getWARFile_DeploymentDescriptor(), theWebapplicationPackage.getWebApp(), null, "deploymentDescriptor", null, 1, 1, WARFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(earFileEClass, EARFile.class, "EARFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getEARFile_ModuleRefs(), this.getModuleRef(), this.getModuleRef_EarFile(), "moduleRefs", null, 1, -1, EARFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEARFile_DeploymentDescriptor(), theApplicationPackage.getApplication(), null, "deploymentDescriptor", null, 1, 1, EARFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(applicationClientFileEClass, ApplicationClientFile.class, "ApplicationClientFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getApplicationClientFile_DeploymentDescriptor(), theClientPackage.getApplicationClient(), null, "deploymentDescriptor", null, 1, 1, ApplicationClientFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(moduleFileEClass, ModuleFile.class, "ModuleFile", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ initEClass(containerEClass, Container.class, "Container", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getContainer_Files(), this.getFile(), this.getFile_Container(), "files", null, 0, -1, Container.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(readOnlyDirectoryEClass, ReadOnlyDirectory.class, "ReadOnlyDirectory", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ initEClass(rarFileEClass, RARFile.class, "RARFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getRARFile_DeploymentDescriptor(), theJcaPackage.getConnector(), null, "deploymentDescriptor", null, 1, 1, RARFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(moduleRefEClass, ModuleRef.class, "ModuleRef", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getModuleRef_ModuleFile(), this.getModuleFile(), null, "moduleFile", null, 1, 1, ModuleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getModuleRef_EarFile(), this.getEARFile(), this.getEARFile_ModuleRefs(), "earFile", null, 1, 1, ModuleRef.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getModuleRef_Module(), theApplicationPackage.getModule(), null, "module", null, 1, 1, ModuleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(ejbModuleRefEClass, EJBModuleRef.class, "EJBModuleRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ initEClass(webModuleRefEClass, WebModuleRef.class, "WebModuleRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ initEClass(clientModuleRefEClass, ClientModuleRef.class, "ClientModuleRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ initEClass(connectorModuleRefEClass, ConnectorModuleRef.class, "ConnectorModuleRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ // Create resource
+ createResource(eNS_URI);
+ }finally{
+ if( hasLock )
+ J2EEInit.releaseInitializePackageContentsLock();
+ }
}
} //CommonarchivePackageImpl
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
index 66dc15b..6f61e94 100644
--- 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
@@ -18,6 +18,8 @@
import java.util.List;
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.NotificationChain;
import org.eclipse.emf.common.notify.Notifier;
@@ -199,7 +201,20 @@
if (!isIndexed()) {
getFiles();
}
+
+ // Some load strategies load the files as relative, and some as absolute paths, so...
+ // First try with the original URI
File file = (File) getFileIndex().get(URI);
+
+ if (file == null){
+ // If the file was not found, try using absolute path
+ IPath URIPath = new Path(URI);
+ if (URIPath.segmentCount() > 1){
+ URIPath = URIPath.makeAbsolute();
+ file = (File) getFileIndex().get(URIPath.toString());
+ }
+ }
+
if (file == null) {
throw new java.io.FileNotFoundException(URI);
}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseconfigPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseconfigPackageImpl.java
index 050a654..f2f8a85 100644
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseconfigPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseconfigPackageImpl.java
@@ -18,8 +18,6 @@
import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecore.impl.EPackageImpl;
import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.client.ClientPackage;
import org.eclipse.jst.j2ee.common.CommonPackage;
import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl;
@@ -31,12 +29,8 @@
import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile;
import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigFactory;
import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
+import org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin;
+import org.eclipse.jst.j2ee.internal.J2EEInit;
/**
* @lastgen class LooseconfigPackageImpl extends EPackageImpl implements LooseconfigPackage,
@@ -108,14 +102,7 @@
// Initialize simple dependencies
EcorePackage.eINSTANCE.eClass();
- Webservice_clientPackage.eINSTANCE.eClass();
- CommonPackage.eINSTANCE.eClass();
- WebapplicationPackage.eINSTANCE.eClass();
- EjbPackage.eINSTANCE.eClass();
- JspPackage.eINSTANCE.eClass();
- ApplicationPackage.eINSTANCE.eClass();
- ClientPackage.eINSTANCE.eClass();
- JcaPackage.eINSTANCE.eClass();
+ J2EEInit.initEMFModels();
JavaRefPackage.eINSTANCE.eClass();
// Obtain or create and register interdependencies
@@ -313,37 +300,49 @@
// Obtain other dependent packages
CommonPackage theCommonPackage = (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
- // Add supertypes to classes
- looseApplicationEClass.getESuperTypes().add(this.getLooseArchive());
- looseArchiveEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
- looseLibraryEClass.getESuperTypes().add(this.getLooseArchive());
- looseModuleEClass.getESuperTypes().add(this.getLooseArchive());
- looseConfigurationEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
- looseWARFileEClass.getESuperTypes().add(this.getLooseModule());
-
- // Initialize classes and features; add operations and parameters
- initEClass(looseApplicationEClass, LooseApplication.class, "LooseApplication", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getLooseApplication_LooseArchives(), this.getLooseArchive(), this.getLooseArchive_LooseApp(), "looseArchives", null, 0, -1, LooseApplication.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(looseArchiveEClass, LooseArchive.class, "LooseArchive", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getLooseArchive_Uri(), ecorePackage.getEString(), "uri", null, 0, 1, LooseArchive.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getLooseArchive_BinariesPath(), ecorePackage.getEString(), "binariesPath", null, 0, 1, LooseArchive.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getLooseArchive_ResourcesPath(), ecorePackage.getEString(), "resourcesPath", null, 0, 1, LooseArchive.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getLooseArchive_LooseApp(), this.getLooseApplication(), this.getLooseApplication_LooseArchives(), "looseApp", null, 0, 1, LooseArchive.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- addEOperation(looseArchiveEClass, ecorePackage.getEBoolean(), "isModule", 0, 1); //$NON-NLS-1$
-
- initEClass(looseLibraryEClass, LooseLibrary.class, "LooseLibrary", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getLooseLibrary_LooseWAR(), this.getLooseWARFile(), this.getLooseWARFile_LooseLibs(), "looseWAR", null, 0, 1, LooseLibrary.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(looseModuleEClass, LooseModule.class, "LooseModule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getLooseModule_AltDD(), ecorePackage.getEString(), "altDD", null, 0, 1, LooseModule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(looseConfigurationEClass, LooseConfiguration.class, "LooseConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getLooseConfiguration_Applications(), this.getLooseApplication(), null, "applications", null, 0, -1, LooseConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(looseWARFileEClass, LooseWARFile.class, "LooseWARFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getLooseWARFile_LooseLibs(), this.getLooseLibrary(), this.getLooseLibrary_LooseWAR(), "looseLibs", null, 0, -1, LooseWARFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ boolean hasLock = false;
+ try {
+ hasLock = J2EEInit.aquireInitializePackageContentsLock();
+ } catch (InterruptedException e) {
+ J2EECorePlugin.logError(e);
+ }
+
+ try{
+ // Add supertypes to classes
+ looseApplicationEClass.getESuperTypes().add(this.getLooseArchive());
+ looseArchiveEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
+ looseLibraryEClass.getESuperTypes().add(this.getLooseArchive());
+ looseModuleEClass.getESuperTypes().add(this.getLooseArchive());
+ looseConfigurationEClass.getESuperTypes().add(theCommonPackage.getJ2EEEObject());
+ looseWARFileEClass.getESuperTypes().add(this.getLooseModule());
+
+ // Initialize classes and features; add operations and parameters
+ initEClass(looseApplicationEClass, LooseApplication.class, "LooseApplication", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getLooseApplication_LooseArchives(), this.getLooseArchive(), this.getLooseArchive_LooseApp(), "looseArchives", null, 0, -1, LooseApplication.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(looseArchiveEClass, LooseArchive.class, "LooseArchive", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getLooseArchive_Uri(), ecorePackage.getEString(), "uri", null, 0, 1, LooseArchive.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getLooseArchive_BinariesPath(), ecorePackage.getEString(), "binariesPath", null, 0, 1, LooseArchive.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getLooseArchive_ResourcesPath(), ecorePackage.getEString(), "resourcesPath", null, 0, 1, LooseArchive.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getLooseArchive_LooseApp(), this.getLooseApplication(), this.getLooseApplication_LooseArchives(), "looseApp", null, 0, 1, LooseArchive.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ addEOperation(looseArchiveEClass, ecorePackage.getEBoolean(), "isModule", 0, 1); //$NON-NLS-1$
+
+ initEClass(looseLibraryEClass, LooseLibrary.class, "LooseLibrary", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getLooseLibrary_LooseWAR(), this.getLooseWARFile(), this.getLooseWARFile_LooseLibs(), "looseWAR", null, 0, 1, LooseLibrary.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(looseModuleEClass, LooseModule.class, "LooseModule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getLooseModule_AltDD(), ecorePackage.getEString(), "altDD", null, 0, 1, LooseModule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(looseConfigurationEClass, LooseConfiguration.class, "LooseConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getLooseConfiguration_Applications(), this.getLooseApplication(), null, "applications", null, 0, -1, LooseConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(looseWARFileEClass, LooseWARFile.class, "LooseWARFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getLooseWARFile_LooseLibs(), this.getLooseLibrary(), this.getLooseLibrary_LooseWAR(), "looseLibs", null, 0, -1, LooseWARFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ }finally{
+ if( hasLock )
+ J2EEInit.releaseInitializePackageContentsLock();
+ }
}
} //LooseconfigPackageImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationPackageImpl.java
index bfe8df8..45f23db 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationPackageImpl.java
@@ -21,6 +21,8 @@
import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
+import org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin;
+import org.eclipse.jst.j2ee.internal.J2EEInit;
import org.eclipse.jst.javaee.application.Application;
import org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor;
import org.eclipse.jst.javaee.application.ApplicationFactory;
@@ -29,32 +31,8 @@
import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
-import org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationclientPackageImpl;
-
-import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
-
-import org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl;
-
import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-import org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-import org.eclipse.jst.javaee.jca.internal.impl.JcaPackageImpl;
-import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
-import org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl;
-
-import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
-
-import org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-import org.eclipse.jst.javaee.webapp.internal.impl.WebappPackageImpl;
-import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
-import org.eclipse.jst.javaee.webfragment.internal.impl.WebfragmentPackageImpl;
-import org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage;
-
/**
* <!-- begin-user-doc -->
* An implementation of the model <b>Package</b>.
@@ -114,7 +92,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private static boolean isInited = false;
+ private volatile static boolean isInited = false;
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
@@ -140,37 +118,11 @@
XMLNamespacePackage.eINSTANCE.eClass();
XMLTypePackage.eINSTANCE.eClass();
- // Obtain or create and register interdependencies
- JavaeePackageImpl theJavaeePackage = (JavaeePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) instanceof JavaeePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) : JavaeePackage.eINSTANCE);
- ApplicationclientPackageImpl theApplicationclientPackage = (ApplicationclientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) instanceof ApplicationclientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) : ApplicationclientPackage.eINSTANCE);
- JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
- EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
- JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
- WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) : WebPackage.eINSTANCE);
- WebappPackageImpl theWebappPackage = (WebappPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) instanceof WebappPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) : WebappPackage.eINSTANCE);
- WebfragmentPackageImpl theWebfragmentPackage = (WebfragmentPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) instanceof WebfragmentPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) : WebfragmentPackage.eINSTANCE);
-
// Create package meta-data objects
theApplicationPackage.createPackageContents();
- theJavaeePackage.createPackageContents();
- theApplicationclientPackage.createPackageContents();
- theJcaPackage.createPackageContents();
- theEjbPackage.createPackageContents();
- theJspPackage.createPackageContents();
- theWebPackage.createPackageContents();
- theWebappPackage.createPackageContents();
- theWebfragmentPackage.createPackageContents();
// Initialize created meta-data
theApplicationPackage.initializePackageContents();
- theJavaeePackage.initializePackageContents();
- theApplicationclientPackage.initializePackageContents();
- theJcaPackage.initializePackageContents();
- theEjbPackage.initializePackageContents();
- theJspPackage.initializePackageContents();
- theWebPackage.initializePackageContents();
- theWebappPackage.initializePackageContents();
- theWebfragmentPackage.initializePackageContents();
// Mark meta-data to indicate it can't be changed
theApplicationPackage.freeze();
@@ -179,6 +131,8 @@
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(ApplicationPackage.eNS_URI, theApplicationPackage);
EPackage.Registry.INSTANCE.put(ApplicationPackage.eNS_URI2, theApplicationPackage);
+
+ J2EEInit.initEMFModels();
return theApplicationPackage;
}
@@ -626,57 +580,69 @@
// Set bounds for type parameters
- // Add supertypes to classes
-
- // Initialize classes and features; add operations and parameters
- initEClass(applicationEClass, Application.class, "Application", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getApplication_ApplicationName(), theXMLTypePackage.getToken(), "applicationName", null, 0, 1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplication_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplication_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplication_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getApplication_InitializeInOrder(), theJavaeePackage.getGenericBooleanType(), "initializeInOrder", null, 0, 1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplication_Modules(), this.getModule(), null, "modules", null, 1, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplication_SecurityRoles(), theJavaeePackage.getSecurityRole(), null, "securityRoles", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getApplication_LibraryDirectory(), theJavaeePackage.getPathType(), "libraryDirectory", null, 0, 1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplication_EnvEntry(), theJavaeePackage.getEnvEntry(), null, "envEntry", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplication_EjbRef(), theJavaeePackage.getEjbRef(), null, "ejbRef", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplication_EjbLocalRef(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRef", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplication_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplication_ResourceRef(), theJavaeePackage.getResourceRef(), null, "resourceRef", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplication_ResourceEnvRef(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRef", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplication_MessageDestinationRef(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRef", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplication_PersistenceContextRef(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRef", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplication_PersistenceUnitRef(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRef", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplication_MessageDestination(), theJavaeePackage.getMessageDestination(), null, "messageDestination", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplication_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getApplication_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getApplication_Version(), theJavaeePackage.getDeweyVersionType(), "version", "6", 1, 1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
- initEClass(applicationDeploymentDescriptorEClass, ApplicationDeploymentDescriptor.class, "ApplicationDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getApplicationDeploymentDescriptor_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplicationDeploymentDescriptor_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplicationDeploymentDescriptor_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplicationDeploymentDescriptor_Application(), this.getApplication(), null, "application", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(moduleEClass, Module.class, "Module", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getModule_Connector(), theJavaeePackage.getPathType(), "connector", null, 0, 1, Module.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getModule_Ejb(), theJavaeePackage.getPathType(), "ejb", null, 0, 1, Module.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getModule_Java(), theJavaeePackage.getPathType(), "java", null, 0, 1, Module.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getModule_Web(), this.getWeb(), null, "web", null, 0, 1, Module.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getModule_AltDd(), theJavaeePackage.getPathType(), "altDd", null, 0, 1, Module.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getModule_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Module.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(webEClass, Web.class, "Web", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getWeb_WebUri(), theJavaeePackage.getPathType(), "webUri", null, 1, 1, Web.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getWeb_ContextRoot(), theXMLTypePackage.getToken(), "contextRoot", null, 1, 1, Web.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getWeb_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Web.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- // Create resource
- createResource(eNS_URI);
-
- // Create annotations
- // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
- createExtendedMetaDataAnnotations();
+ boolean hasLock = false;
+ try {
+ hasLock = J2EEInit.aquireInitializePackageContentsLock();
+ } catch (InterruptedException e) {
+ J2EECorePlugin.logError(e);
+ }
+
+ try{
+ // Add supertypes to classes
+
+ // Initialize classes and features; add operations and parameters
+ initEClass(applicationEClass, Application.class, "Application", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getApplication_ApplicationName(), theXMLTypePackage.getToken(), "applicationName", null, 0, 1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplication_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplication_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplication_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getApplication_InitializeInOrder(), theJavaeePackage.getGenericBooleanType(), "initializeInOrder", null, 0, 1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplication_Modules(), this.getModule(), null, "modules", null, 1, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplication_SecurityRoles(), theJavaeePackage.getSecurityRole(), null, "securityRoles", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getApplication_LibraryDirectory(), theJavaeePackage.getPathType(), "libraryDirectory", null, 0, 1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplication_EnvEntry(), theJavaeePackage.getEnvEntry(), null, "envEntry", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplication_EjbRef(), theJavaeePackage.getEjbRef(), null, "ejbRef", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplication_EjbLocalRef(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRef", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplication_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplication_ResourceRef(), theJavaeePackage.getResourceRef(), null, "resourceRef", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplication_ResourceEnvRef(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRef", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplication_MessageDestinationRef(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRef", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplication_PersistenceContextRef(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRef", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplication_PersistenceUnitRef(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRef", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplication_MessageDestination(), theJavaeePackage.getMessageDestination(), null, "messageDestination", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplication_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getApplication_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getApplication_Version(), theJavaeePackage.getDeweyVersionType(), "version", "6", 1, 1, Application.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+ initEClass(applicationDeploymentDescriptorEClass, ApplicationDeploymentDescriptor.class, "ApplicationDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getApplicationDeploymentDescriptor_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplicationDeploymentDescriptor_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplicationDeploymentDescriptor_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplicationDeploymentDescriptor_Application(), this.getApplication(), null, "application", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(moduleEClass, Module.class, "Module", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getModule_Connector(), theJavaeePackage.getPathType(), "connector", null, 0, 1, Module.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getModule_Ejb(), theJavaeePackage.getPathType(), "ejb", null, 0, 1, Module.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getModule_Java(), theJavaeePackage.getPathType(), "java", null, 0, 1, Module.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getModule_Web(), this.getWeb(), null, "web", null, 0, 1, Module.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getModule_AltDd(), theJavaeePackage.getPathType(), "altDd", null, 0, 1, Module.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getModule_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Module.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(webEClass, Web.class, "Web", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getWeb_WebUri(), theJavaeePackage.getPathType(), "webUri", null, 1, 1, Web.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getWeb_ContextRoot(), theXMLTypePackage.getToken(), "contextRoot", null, 1, 1, Web.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getWeb_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Web.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ // Create resource
+ createResource(eNS_URI);
+
+ // Create annotations
+ // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
+ createExtendedMetaDataAnnotations();
+ }finally{
+ if( hasLock )
+ J2EEInit.releaseInitializePackageContentsLock();
+ }
}
/**
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientPackageImpl.java
index 012c794..6e7b518 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientPackageImpl.java
@@ -21,9 +21,8 @@
import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl;
-
-import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
+import org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin;
+import org.eclipse.jst.j2ee.internal.J2EEInit;
import org.eclipse.jst.javaee.applicationclient.ApplicationClient;
import org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor;
@@ -31,28 +30,8 @@
import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
-import org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl;
-
import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-import org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-import org.eclipse.jst.javaee.jca.internal.impl.JcaPackageImpl;
-import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
-import org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl;
-
-import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
-
-import org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-import org.eclipse.jst.javaee.webapp.internal.impl.WebappPackageImpl;
-import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
-import org.eclipse.jst.javaee.webfragment.internal.impl.WebfragmentPackageImpl;
-import org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage;
-
/**
* <!-- begin-user-doc -->
* An implementation of the model <b>Package</b>.
@@ -98,7 +77,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private static boolean isInited = false;
+ private volatile static boolean isInited = false;
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
@@ -124,37 +103,11 @@
XMLNamespacePackage.eINSTANCE.eClass();
XMLTypePackage.eINSTANCE.eClass();
- // Obtain or create and register interdependencies
- ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
- JavaeePackageImpl theJavaeePackage = (JavaeePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) instanceof JavaeePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) : JavaeePackage.eINSTANCE);
- JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
- EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
- JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
- WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) : WebPackage.eINSTANCE);
- WebappPackageImpl theWebappPackage = (WebappPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) instanceof WebappPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) : WebappPackage.eINSTANCE);
- WebfragmentPackageImpl theWebfragmentPackage = (WebfragmentPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) instanceof WebfragmentPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) : WebfragmentPackage.eINSTANCE);
-
// Create package meta-data objects
theApplicationclientPackage.createPackageContents();
- theApplicationPackage.createPackageContents();
- theJavaeePackage.createPackageContents();
- theJcaPackage.createPackageContents();
- theEjbPackage.createPackageContents();
- theJspPackage.createPackageContents();
- theWebPackage.createPackageContents();
- theWebappPackage.createPackageContents();
- theWebfragmentPackage.createPackageContents();
// Initialize created meta-data
theApplicationclientPackage.initializePackageContents();
- theApplicationPackage.initializePackageContents();
- theJavaeePackage.initializePackageContents();
- theJcaPackage.initializePackageContents();
- theEjbPackage.initializePackageContents();
- theJspPackage.initializePackageContents();
- theWebPackage.initializePackageContents();
- theWebappPackage.initializePackageContents();
- theWebfragmentPackage.initializePackageContents();
// Mark meta-data to indicate it can't be changed
theApplicationclientPackage.freeze();
@@ -163,6 +116,8 @@
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(ApplicationclientPackage.eNS_URI, theApplicationclientPackage);
EPackage.Registry.INSTANCE.put(ApplicationclientPackage.eNS_URI2, theApplicationclientPackage);
+
+ J2EEInit.initEMFModels();
return theApplicationclientPackage;
}
@@ -478,42 +433,54 @@
// Set bounds for type parameters
- // Add supertypes to classes
-
- // Initialize classes and features; add operations and parameters
- initEClass(applicationClientEClass, ApplicationClient.class, "ApplicationClient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getApplicationClient_ModuleName(), theXMLTypePackage.getToken(), "moduleName", null, 0, 1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplicationClient_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplicationClient_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplicationClient_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplicationClient_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplicationClient_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplicationClient_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplicationClient_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplicationClient_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplicationClient_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplicationClient_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplicationClient_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplicationClient_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getApplicationClient_CallbackHandler(), theJavaeePackage.getFullyQualifiedClassType(), "callbackHandler", null, 0, 1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplicationClient_MessageDestinations(), theJavaeePackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplicationClient_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getApplicationClient_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getApplicationClient_MetadataComplete(), theXMLTypePackage.getBoolean(), "metadataComplete", null, 0, 1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getApplicationClient_Version(), theJavaeePackage.getDeweyVersionType(), "version", "6", 1, 1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
- initEClass(applicationClientDeploymentDescriptorEClass, ApplicationClientDeploymentDescriptor.class, "ApplicationClientDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getApplicationClientDeploymentDescriptor_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplicationClientDeploymentDescriptor_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplicationClientDeploymentDescriptor_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getApplicationClientDeploymentDescriptor_ApplicationClient(), this.getApplicationClient(), null, "applicationClient", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- // Create resource
- createResource(eNS_URI);
-
- // Create annotations
- // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
- createExtendedMetaDataAnnotations();
+ boolean hasLock = false;
+ try {
+ hasLock = J2EEInit.aquireInitializePackageContentsLock();
+ } catch (InterruptedException e) {
+ J2EECorePlugin.logError(e);
+ }
+
+ try{
+ // Add supertypes to classes
+
+ // Initialize classes and features; add operations and parameters
+ initEClass(applicationClientEClass, ApplicationClient.class, "ApplicationClient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getApplicationClient_ModuleName(), theXMLTypePackage.getToken(), "moduleName", null, 0, 1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplicationClient_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplicationClient_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplicationClient_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplicationClient_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplicationClient_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplicationClient_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplicationClient_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplicationClient_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplicationClient_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplicationClient_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplicationClient_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplicationClient_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getApplicationClient_CallbackHandler(), theJavaeePackage.getFullyQualifiedClassType(), "callbackHandler", null, 0, 1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplicationClient_MessageDestinations(), theJavaeePackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplicationClient_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getApplicationClient_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getApplicationClient_MetadataComplete(), theXMLTypePackage.getBoolean(), "metadataComplete", null, 0, 1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getApplicationClient_Version(), theJavaeePackage.getDeweyVersionType(), "version", "6", 1, 1, ApplicationClient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+ initEClass(applicationClientDeploymentDescriptorEClass, ApplicationClientDeploymentDescriptor.class, "ApplicationClientDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getApplicationClientDeploymentDescriptor_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplicationClientDeploymentDescriptor_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplicationClientDeploymentDescriptor_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplicationClientDeploymentDescriptor_ApplicationClient(), this.getApplicationClient(), null, "applicationClient", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ // Create resource
+ createResource(eNS_URI);
+
+ // Create annotations
+ // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
+ createExtendedMetaDataAnnotations();
+ }finally{
+ if( hasLock )
+ J2EEInit.releaseInitializePackageContentsLock();
+ }
}
/**
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java
index 17a44fd..7b8c156 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java
@@ -26,13 +26,8 @@
import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl;
-
-import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
-
-import org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationclientPackageImpl;
-
-import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
+import org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin;
+import org.eclipse.jst.j2ee.internal.J2EEInit;
import org.eclipse.jst.javaee.core.AddressingResponsesType;
import org.eclipse.jst.javaee.core.AddressingType;
@@ -78,24 +73,6 @@
import org.eclipse.jst.javaee.core.internal.util.JavaeeValidator;
-import org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-import org.eclipse.jst.javaee.jca.internal.impl.JcaPackageImpl;
-import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
-import org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl;
-
-import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
-
-import org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-import org.eclipse.jst.javaee.webapp.internal.impl.WebappPackageImpl;
-import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
-import org.eclipse.jst.javaee.webfragment.internal.impl.WebfragmentPackageImpl;
-import org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage;
-
/**
* <!-- begin-user-doc -->
* An implementation of the model <b>Package</b>.
@@ -610,7 +587,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private static boolean isInited = false;
+ private volatile static boolean isInited = false;
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
@@ -636,37 +613,11 @@
XMLNamespacePackage.eINSTANCE.eClass();
XMLTypePackage.eINSTANCE.eClass();
- // Obtain or create and register interdependencies
- ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
- ApplicationclientPackageImpl theApplicationclientPackage = (ApplicationclientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) instanceof ApplicationclientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) : ApplicationclientPackage.eINSTANCE);
- JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
- EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
- JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
- WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) : WebPackage.eINSTANCE);
- WebappPackageImpl theWebappPackage = (WebappPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) instanceof WebappPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) : WebappPackage.eINSTANCE);
- WebfragmentPackageImpl theWebfragmentPackage = (WebfragmentPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) instanceof WebfragmentPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) : WebfragmentPackage.eINSTANCE);
-
// Create package meta-data objects
theJavaeePackage.createPackageContents();
- theApplicationPackage.createPackageContents();
- theApplicationclientPackage.createPackageContents();
- theJcaPackage.createPackageContents();
- theEjbPackage.createPackageContents();
- theJspPackage.createPackageContents();
- theWebPackage.createPackageContents();
- theWebappPackage.createPackageContents();
- theWebfragmentPackage.createPackageContents();
// Initialize created meta-data
theJavaeePackage.initializePackageContents();
- theApplicationPackage.initializePackageContents();
- theApplicationclientPackage.initializePackageContents();
- theJcaPackage.initializePackageContents();
- theEjbPackage.initializePackageContents();
- theJspPackage.initializePackageContents();
- theWebPackage.initializePackageContents();
- theWebappPackage.initializePackageContents();
- theWebfragmentPackage.initializePackageContents();
// Register package validator
EValidator.Registry.INSTANCE.put
@@ -683,6 +634,8 @@
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(JavaeePackage.eNS_URI, theJavaeePackage);
+
+ J2EEInit.initEMFModels();
return theJavaeePackage;
}
@@ -3200,320 +3153,332 @@
// Set bounds for type parameters
- // Add supertypes to classes
-
- // Initialize classes and features; add operations and parameters
- initEClass(addressingTypeEClass, AddressingType.class, "AddressingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getAddressingType_Enabled(), this.getTrueFalseType(), "enabled", null, 0, 1, AddressingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getAddressingType_Required(), this.getTrueFalseType(), "required", null, 0, 1, AddressingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getAddressingType_Responses(), this.getAddressingResponsesType(), "responses", null, 0, 1, AddressingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(dataSourceTypeEClass, DataSourceType.class, "DataSourceType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getDataSourceType_Description(), this.getDescription(), null, "description", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getDataSourceType_Name(), this.getJNDIName(), "name", null, 1, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getDataSourceType_ClassName(), this.getFullyQualifiedClassType(), "className", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getDataSourceType_ServerName(), theXMLTypePackage.getString(), "serverName", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getDataSourceType_PortNumber(), theXMLTypePackage.getInteger(), "portNumber", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getDataSourceType_DatabaseName(), theXMLTypePackage.getString(), "databaseName", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getDataSourceType_Url(), this.getJdbcUrlType(), "url", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getDataSourceType_User(), theXMLTypePackage.getString(), "user", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getDataSourceType_Password(), theXMLTypePackage.getString(), "password", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getDataSourceType_Property(), this.getPropertyType(), null, "property", null, 0, -1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getDataSourceType_LoginTimeout(), theXMLTypePackage.getInteger(), "loginTimeout", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getDataSourceType_Transactional(), theXMLTypePackage.getBoolean(), "transactional", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getDataSourceType_IsolationLevel(), this.getIsolationLevelType(), "isolationLevel", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getDataSourceType_InitialPoolSize(), theXMLTypePackage.getInteger(), "initialPoolSize", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getDataSourceType_MaxPoolSize(), theXMLTypePackage.getInteger(), "maxPoolSize", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getDataSourceType_MinPoolSize(), theXMLTypePackage.getInteger(), "minPoolSize", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getDataSourceType_MaxIdleTime(), theXMLTypePackage.getInteger(), "maxIdleTime", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getDataSourceType_MaxStatements(), theXMLTypePackage.getInteger(), "maxStatements", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getDataSourceType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(descriptionEClass, Description.class, "Description", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getDescription_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, Description.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getDescription_Lang(), theXMLNamespacePackage.getLangType(), "lang", null, 0, 1, Description.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(displayNameEClass, DisplayName.class, "DisplayName", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getDisplayName_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, DisplayName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getDisplayName_Lang(), theXMLNamespacePackage.getLangType(), "lang", null, 0, 1, DisplayName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(ejbLocalRefEClass, EjbLocalRef.class, "EjbLocalRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getEjbLocalRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEjbLocalRef_EjbRefName(), this.getEjbRefNameType(), "ejbRefName", null, 1, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEjbLocalRef_EjbRefType(), this.getEjbRefType(), "ejbRefType", null, 0, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEjbLocalRef_LocalHome(), this.getLocalHome(), "localHome", null, 0, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEjbLocalRef_Local(), this.getLocal(), "local", null, 0, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEjbLocalRef_EjbLink(), this.getEJBLink(), "ejbLink", null, 0, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEjbLocalRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEjbLocalRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEjbLocalRef_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEjbLocalRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(ejbRefEClass, EjbRef.class, "EjbRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getEjbRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEjbRef_EjbRefName(), this.getEjbRefNameType(), "ejbRefName", null, 1, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEjbRef_EjbRefType(), this.getEjbRefType(), "ejbRefType", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEjbRef_Home(), this.getHome(), "home", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEjbRef_Remote(), this.getRemote(), "remote", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEjbRef_EjbLink(), this.getEJBLink(), "ejbLink", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEjbRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEjbRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEjbRef_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEjbRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(emptyTypeEClass, EmptyType.class, "EmptyType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getEmptyType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EmptyType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(envEntryEClass, EnvEntry.class, "EnvEntry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getEnvEntry_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEnvEntry_EnvEntryName(), this.getJNDIName(), "envEntryName", null, 1, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEnvEntry_EnvEntryType(), this.getEnvEntryType(), "envEntryType", null, 0, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEnvEntry_EnvEntryValue(), theXMLTypePackage.getString(), "envEntryValue", null, 0, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEnvEntry_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEnvEntry_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEnvEntry_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEnvEntry_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(iconEClass, Icon.class, "Icon", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getIcon_SmallIcon(), this.getPathType(), "smallIcon", null, 0, 1, Icon.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIcon_LargeIcon(), this.getPathType(), "largeIcon", null, 0, 1, Icon.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIcon_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Icon.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIcon_Lang(), theXMLNamespacePackage.getLangType(), "lang", null, 0, 1, Icon.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(injectionTargetEClass, InjectionTarget.class, "InjectionTarget", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getInjectionTarget_InjectionTargetClass(), this.getFullyQualifiedClassType(), "injectionTargetClass", null, 1, 1, InjectionTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getInjectionTarget_InjectionTargetName(), this.getJavaIdentifier(), "injectionTargetName", null, 1, 1, InjectionTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(lifecycleCallbackEClass, LifecycleCallback.class, "LifecycleCallback", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getLifecycleCallback_LifecycleCallbackClass(), this.getFullyQualifiedClassType(), "lifecycleCallbackClass", null, 0, 1, LifecycleCallback.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getLifecycleCallback_LifecycleCallbackMethod(), this.getJavaIdentifier(), "lifecycleCallbackMethod", null, 1, 1, LifecycleCallback.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(listenerEClass, Listener.class, "Listener", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getListener_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, Listener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getListener_DisplayNames(), this.getDisplayName(), null, "displayNames", null, 0, -1, Listener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getListener_Icons(), this.getIcon(), null, "icons", null, 0, -1, Listener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getListener_ListenerClass(), this.getFullyQualifiedClassType(), "listenerClass", null, 1, 1, Listener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getListener_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Listener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(messageDestinationEClass, MessageDestination.class, "MessageDestination", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getMessageDestination_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDestination_DisplayNames(), this.getDisplayName(), null, "displayNames", null, 0, -1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDestination_Icons(), this.getIcon(), null, "icons", null, 0, -1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageDestination_MessageDestinationName(), theXMLTypePackage.getToken(), "messageDestinationName", null, 1, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageDestination_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageDestination_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageDestination_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(messageDestinationRefEClass, MessageDestinationRef.class, "MessageDestinationRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getMessageDestinationRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageDestinationRef_MessageDestinationRefName(), this.getJNDIName(), "messageDestinationRefName", null, 1, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageDestinationRef_MessageDestinationType(), this.getMessageDestinationTypeType(), "messageDestinationType", null, 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageDestinationRef_MessageDestinationUsage(), this.getMessageDestinationUsageType(), "messageDestinationUsage", null, 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageDestinationRef_MessageDestinationLink(), this.getMessageDestinationLink(), "messageDestinationLink", null, 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageDestinationRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDestinationRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageDestinationRef_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageDestinationRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(paramValueEClass, ParamValue.class, "ParamValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getParamValue_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, ParamValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getParamValue_ParamName(), theXMLTypePackage.getToken(), "paramName", null, 1, 1, ParamValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getParamValue_ParamValue(), theXMLTypePackage.getString(), "paramValue", null, 1, 1, ParamValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getParamValue_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ParamValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(persistenceContextRefEClass, PersistenceContextRef.class, "PersistenceContextRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getPersistenceContextRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getPersistenceContextRef_PersistenceContextRefName(), this.getJNDIName(), "persistenceContextRefName", null, 1, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getPersistenceContextRef_PersistenceUnitName(), theXMLTypePackage.getToken(), "persistenceUnitName", null, 0, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getPersistenceContextRef_PersistenceContextType(), this.getPersistenceContextType(), "persistenceContextType", null, 0, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getPersistenceContextRef_PersistenceProperties(), this.getPropertyType(), null, "persistenceProperties", null, 0, -1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getPersistenceContextRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getPersistenceContextRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getPersistenceContextRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(persistenceUnitRefEClass, PersistenceUnitRef.class, "PersistenceUnitRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getPersistenceUnitRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getPersistenceUnitRef_PersistenceUnitRefName(), this.getJNDIName(), "persistenceUnitRefName", null, 1, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getPersistenceUnitRef_PersistenceUnitName(), theXMLTypePackage.getToken(), "persistenceUnitName", null, 0, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getPersistenceUnitRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getPersistenceUnitRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getPersistenceUnitRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(portComponentRefEClass, PortComponentRef.class, "PortComponentRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getPortComponentRef_ServiceEndpointInterface(), this.getFullyQualifiedClassType(), "serviceEndpointInterface", null, 1, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getPortComponentRef_EnableMtom(), this.getTrueFalseType(), "enableMtom", null, 0, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getPortComponentRef_MtomThreshold(), theXMLTypePackage.getNonNegativeInteger(), "mtomThreshold", null, 0, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getPortComponentRef_Addressing(), this.getAddressingType(), null, "addressing", null, 0, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getPortComponentRef_RespectBinding(), this.getRespectBindingType(), null, "respectBinding", null, 0, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getPortComponentRef_PortComponentLink(), theXMLTypePackage.getToken(), "portComponentLink", null, 0, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getPortComponentRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(propertyTypeEClass, PropertyType.class, "PropertyType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getPropertyType_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, PropertyType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getPropertyType_Value(), theXMLTypePackage.getString(), "value", null, 1, 1, PropertyType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getPropertyType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, PropertyType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(resourceEnvRefEClass, ResourceEnvRef.class, "ResourceEnvRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getResourceEnvRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getResourceEnvRef_ResourceEnvRefName(), this.getJNDIName(), "resourceEnvRefName", null, 1, 1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getResourceEnvRef_ResourceEnvRefType(), this.getFullyQualifiedClassType(), "resourceEnvRefType", null, 0, 1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getResourceEnvRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getResourceEnvRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getResourceEnvRef_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getResourceEnvRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(resourceRefEClass, ResourceRef.class, "ResourceRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getResourceRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getResourceRef_ResRefName(), this.getJNDIName(), "resRefName", null, 1, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getResourceRef_ResType(), this.getFullyQualifiedClassType(), "resType", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getResourceRef_ResAuth(), this.getResAuthType(), "resAuth", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getResourceRef_ResSharingScope(), this.getResSharingScopeType(), "resSharingScope", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getResourceRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getResourceRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getResourceRef_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getResourceRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(respectBindingTypeEClass, RespectBindingType.class, "RespectBindingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getRespectBindingType_Enabled(), this.getTrueFalseType(), "enabled", null, 0, 1, RespectBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(runAsEClass, RunAs.class, "RunAs", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getRunAs_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, RunAs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getRunAs_RoleName(), this.getRoleName(), "roleName", null, 1, 1, RunAs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getRunAs_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, RunAs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(securityRoleEClass, SecurityRole.class, "SecurityRole", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getSecurityRole_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, SecurityRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSecurityRole_RoleName(), this.getRoleName(), "roleName", null, 1, 1, SecurityRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSecurityRole_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SecurityRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(securityRoleRefEClass, SecurityRoleRef.class, "SecurityRoleRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getSecurityRoleRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, SecurityRoleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSecurityRoleRef_RoleName(), this.getRoleName(), "roleName", null, 1, 1, SecurityRoleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSecurityRoleRef_RoleLink(), this.getRoleName(), "roleLink", null, 0, 1, SecurityRoleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSecurityRoleRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SecurityRoleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(serviceRefEClass, ServiceRef.class, "ServiceRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getServiceRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getServiceRef_DisplayNames(), this.getDisplayName(), null, "displayNames", null, 0, -1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getServiceRef_Icons(), this.getIcon(), null, "icons", null, 0, -1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServiceRef_ServiceRefName(), this.getJNDIName(), "serviceRefName", null, 1, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServiceRef_ServiceInterface(), this.getFullyQualifiedClassType(), "serviceInterface", null, 1, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServiceRef_ServiceRefType(), this.getFullyQualifiedClassType(), "serviceRefType", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServiceRef_WsdlFile(), theXMLTypePackage.getAnyURI(), "wsdlFile", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServiceRef_JaxrpcMappingFile(), this.getPathType(), "jaxrpcMappingFile", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServiceRef_ServiceQname(), theXMLTypePackage.getQName(), "serviceQname", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getServiceRef_PortComponentRefs(), this.getPortComponentRef(), null, "portComponentRefs", null, 0, -1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getServiceRef_Handlers(), this.getServiceRefHandler(), null, "handlers", null, 0, -1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getServiceRef_HandlerChains(), this.getServiceRefHandlerChains(), null, "handlerChains", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServiceRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getServiceRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServiceRef_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServiceRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(serviceRefHandlerEClass, ServiceRefHandler.class, "ServiceRefHandler", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getServiceRefHandler_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getServiceRefHandler_DisplayNames(), this.getDisplayName(), null, "displayNames", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getServiceRefHandler_Icons(), this.getIcon(), null, "icons", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServiceRefHandler_HandlerName(), theXMLTypePackage.getToken(), "handlerName", null, 1, 1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServiceRefHandler_HandlerClass(), this.getFullyQualifiedClassType(), "handlerClass", null, 1, 1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getServiceRefHandler_InitParams(), this.getParamValue(), null, "initParams", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServiceRefHandler_SoapHeaders(), theXMLTypePackage.getQName(), "soapHeaders", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServiceRefHandler_SoapRoles(), theXMLTypePackage.getToken(), "soapRoles", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServiceRefHandler_PortNames(), theXMLTypePackage.getToken(), "portNames", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServiceRefHandler_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(serviceRefHandlerChainEClass, ServiceRefHandlerChain.class, "ServiceRefHandlerChain", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getServiceRefHandlerChain_ServiceNamePattern(), this.getQnamePattern(), "serviceNamePattern", null, 0, 1, ServiceRefHandlerChain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServiceRefHandlerChain_PortNamePattern(), this.getQnamePattern(), "portNamePattern", null, 0, 1, ServiceRefHandlerChain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServiceRefHandlerChain_ProtocolBindings(), this.getProtocolBindingListType(), "protocolBindings", null, 0, 1, ServiceRefHandlerChain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getServiceRefHandlerChain_Handlers(), this.getServiceRefHandler(), null, "handlers", null, 1, -1, ServiceRefHandlerChain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServiceRefHandlerChain_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ServiceRefHandlerChain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(serviceRefHandlerChainsEClass, ServiceRefHandlerChains.class, "ServiceRefHandlerChains", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getServiceRefHandlerChains_HandlerChains(), this.getServiceRefHandlerChain(), null, "handlerChains", null, 0, -1, ServiceRefHandlerChains.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServiceRefHandlerChains_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ServiceRefHandlerChains.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(urlPatternTypeEClass, UrlPatternType.class, "UrlPatternType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getUrlPatternType_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, UrlPatternType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- // Initialize enums and add enum literals
- initEEnum(addressingResponsesTypeEEnum, AddressingResponsesType.class, "AddressingResponsesType"); //$NON-NLS-1$
- addEEnumLiteral(addressingResponsesTypeEEnum, AddressingResponsesType.ANONYMOUS);
- addEEnumLiteral(addressingResponsesTypeEEnum, AddressingResponsesType.NONANONYMOUS);
- addEEnumLiteral(addressingResponsesTypeEEnum, AddressingResponsesType.ALL);
-
- initEEnum(ejbRefTypeEEnum, EjbRefType.class, "EjbRefType"); //$NON-NLS-1$
- addEEnumLiteral(ejbRefTypeEEnum, EjbRefType.ENTITY_LITERAL);
- addEEnumLiteral(ejbRefTypeEEnum, EjbRefType.SESSION_LITERAL);
-
- initEEnum(genericBooleanTypeEEnum, GenericBooleanType.class, "GenericBooleanType"); //$NON-NLS-1$
- addEEnumLiteral(genericBooleanTypeEEnum, GenericBooleanType.TRUE);
- addEEnumLiteral(genericBooleanTypeEEnum, GenericBooleanType.FALSE);
- addEEnumLiteral(genericBooleanTypeEEnum, GenericBooleanType.YES);
- addEEnumLiteral(genericBooleanTypeEEnum, GenericBooleanType.NO);
-
- initEEnum(isolationLevelTypeEEnum, IsolationLevelType.class, "IsolationLevelType"); //$NON-NLS-1$
- addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONREADUNCOMMITTED);
- addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONREADCOMMITTED);
- addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONREPEATABLEREAD);
- addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONSERIALIZABLE);
-
- initEEnum(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.class, "MessageDestinationUsageType"); //$NON-NLS-1$
- addEEnumLiteral(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.CONSUMES_LITERAL);
- addEEnumLiteral(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.PRODUCES_LITERAL);
- addEEnumLiteral(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.CONSUMES_PRODUCES_LITERAL);
-
- initEEnum(persistenceContextTypeEEnum, PersistenceContextType.class, "PersistenceContextType"); //$NON-NLS-1$
- addEEnumLiteral(persistenceContextTypeEEnum, PersistenceContextType.TRANSACTION_LITERAL);
- addEEnumLiteral(persistenceContextTypeEEnum, PersistenceContextType.EXTENDED_LITERAL);
-
- initEEnum(resAuthTypeEEnum, ResAuthType.class, "ResAuthType"); //$NON-NLS-1$
- addEEnumLiteral(resAuthTypeEEnum, ResAuthType.APPLICATION_LITERAL);
- addEEnumLiteral(resAuthTypeEEnum, ResAuthType.CONTAINER_LITERAL);
-
- initEEnum(resSharingScopeTypeEEnum, ResSharingScopeType.class, "ResSharingScopeType"); //$NON-NLS-1$
- addEEnumLiteral(resSharingScopeTypeEEnum, ResSharingScopeType.SHAREABLE_LITERAL);
- addEEnumLiteral(resSharingScopeTypeEEnum, ResSharingScopeType.UNSHAREABLE_LITERAL);
-
- // Initialize data types
- initEDataType(addressingResponsesTypeObjectEDataType, AddressingResponsesType.class, "AddressingResponsesTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(deweyVersionTypeEDataType, String.class, "DeweyVersionType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(ejbLinkEDataType, String.class, "EJBLink", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(ejbRefNameTypeEDataType, String.class, "EjbRefNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(ejbRefTypeObjectEDataType, EjbRefType.class, "EjbRefTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(envEntryTypeEDataType, String.class, "EnvEntryType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(fullyQualifiedClassTypeEDataType, String.class, "FullyQualifiedClassType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(genericBooleanTypeObjectEDataType, GenericBooleanType.class, "GenericBooleanTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(homeEDataType, String.class, "Home", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(isolationLevelTypeObjectEDataType, IsolationLevelType.class, "IsolationLevelTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(javaIdentifierEDataType, String.class, "JavaIdentifier", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(javaTypeEDataType, String.class, "JavaType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(jdbcUrlTypeEDataType, String.class, "JdbcUrlType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(jndiNameEDataType, String.class, "JNDIName", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(localEDataType, String.class, "Local", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(localHomeEDataType, String.class, "LocalHome", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(messageDestinationLinkEDataType, String.class, "MessageDestinationLink", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(messageDestinationTypeTypeEDataType, String.class, "MessageDestinationTypeType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(messageDestinationUsageTypeObjectEDataType, MessageDestinationUsageType.class, "MessageDestinationUsageTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(pathTypeEDataType, String.class, "PathType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(persistenceContextTypeObjectEDataType, PersistenceContextType.class, "PersistenceContextTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(protocolBindingListTypeEDataType, List.class, "ProtocolBindingListType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(protocolBindingTypeEDataType, String.class, "ProtocolBindingType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(protocolURIAliasTypeEDataType, String.class, "ProtocolURIAliasType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(qnamePatternEDataType, String.class, "QnamePattern", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(remoteEDataType, String.class, "Remote", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(resAuthTypeObjectEDataType, ResAuthType.class, "ResAuthTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(resSharingScopeTypeObjectEDataType, ResSharingScopeType.class, "ResSharingScopeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(roleNameEDataType, String.class, "RoleName", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(trueFalseTypeEDataType, boolean.class, "TrueFalseType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(trueFalseTypeObjectEDataType, Boolean.class, "TrueFalseTypeObject", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- // Create resource
- createResource(eNS_URI);
-
- // Create annotations
- // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
- createExtendedMetaDataAnnotations();
+ boolean hasLock = false;
+ try {
+ hasLock = J2EEInit.aquireInitializePackageContentsLock();
+ } catch (InterruptedException e) {
+ J2EECorePlugin.logError(e);
+ }
+
+ try{
+ // Add supertypes to classes
+
+ // Initialize classes and features; add operations and parameters
+ initEClass(addressingTypeEClass, AddressingType.class, "AddressingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getAddressingType_Enabled(), this.getTrueFalseType(), "enabled", null, 0, 1, AddressingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getAddressingType_Required(), this.getTrueFalseType(), "required", null, 0, 1, AddressingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getAddressingType_Responses(), this.getAddressingResponsesType(), "responses", null, 0, 1, AddressingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(dataSourceTypeEClass, DataSourceType.class, "DataSourceType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getDataSourceType_Description(), this.getDescription(), null, "description", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getDataSourceType_Name(), this.getJNDIName(), "name", null, 1, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getDataSourceType_ClassName(), this.getFullyQualifiedClassType(), "className", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getDataSourceType_ServerName(), theXMLTypePackage.getString(), "serverName", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getDataSourceType_PortNumber(), theXMLTypePackage.getInteger(), "portNumber", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getDataSourceType_DatabaseName(), theXMLTypePackage.getString(), "databaseName", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getDataSourceType_Url(), this.getJdbcUrlType(), "url", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getDataSourceType_User(), theXMLTypePackage.getString(), "user", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getDataSourceType_Password(), theXMLTypePackage.getString(), "password", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getDataSourceType_Property(), this.getPropertyType(), null, "property", null, 0, -1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getDataSourceType_LoginTimeout(), theXMLTypePackage.getInteger(), "loginTimeout", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getDataSourceType_Transactional(), theXMLTypePackage.getBoolean(), "transactional", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getDataSourceType_IsolationLevel(), this.getIsolationLevelType(), "isolationLevel", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getDataSourceType_InitialPoolSize(), theXMLTypePackage.getInteger(), "initialPoolSize", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getDataSourceType_MaxPoolSize(), theXMLTypePackage.getInteger(), "maxPoolSize", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getDataSourceType_MinPoolSize(), theXMLTypePackage.getInteger(), "minPoolSize", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getDataSourceType_MaxIdleTime(), theXMLTypePackage.getInteger(), "maxIdleTime", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getDataSourceType_MaxStatements(), theXMLTypePackage.getInteger(), "maxStatements", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getDataSourceType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, DataSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(descriptionEClass, Description.class, "Description", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getDescription_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, Description.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getDescription_Lang(), theXMLNamespacePackage.getLangType(), "lang", null, 0, 1, Description.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(displayNameEClass, DisplayName.class, "DisplayName", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getDisplayName_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, DisplayName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getDisplayName_Lang(), theXMLNamespacePackage.getLangType(), "lang", null, 0, 1, DisplayName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(ejbLocalRefEClass, EjbLocalRef.class, "EjbLocalRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getEjbLocalRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEjbLocalRef_EjbRefName(), this.getEjbRefNameType(), "ejbRefName", null, 1, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEjbLocalRef_EjbRefType(), this.getEjbRefType(), "ejbRefType", null, 0, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEjbLocalRef_LocalHome(), this.getLocalHome(), "localHome", null, 0, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEjbLocalRef_Local(), this.getLocal(), "local", null, 0, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEjbLocalRef_EjbLink(), this.getEJBLink(), "ejbLink", null, 0, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEjbLocalRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEjbLocalRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEjbLocalRef_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEjbLocalRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EjbLocalRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(ejbRefEClass, EjbRef.class, "EjbRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getEjbRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEjbRef_EjbRefName(), this.getEjbRefNameType(), "ejbRefName", null, 1, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEjbRef_EjbRefType(), this.getEjbRefType(), "ejbRefType", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEjbRef_Home(), this.getHome(), "home", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEjbRef_Remote(), this.getRemote(), "remote", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEjbRef_EjbLink(), this.getEJBLink(), "ejbLink", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEjbRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEjbRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEjbRef_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEjbRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EjbRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(emptyTypeEClass, EmptyType.class, "EmptyType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getEmptyType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EmptyType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(envEntryEClass, EnvEntry.class, "EnvEntry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getEnvEntry_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEnvEntry_EnvEntryName(), this.getJNDIName(), "envEntryName", null, 1, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEnvEntry_EnvEntryType(), this.getEnvEntryType(), "envEntryType", null, 0, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEnvEntry_EnvEntryValue(), theXMLTypePackage.getString(), "envEntryValue", null, 0, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEnvEntry_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEnvEntry_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEnvEntry_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEnvEntry_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EnvEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(iconEClass, Icon.class, "Icon", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getIcon_SmallIcon(), this.getPathType(), "smallIcon", null, 0, 1, Icon.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getIcon_LargeIcon(), this.getPathType(), "largeIcon", null, 0, 1, Icon.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getIcon_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Icon.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getIcon_Lang(), theXMLNamespacePackage.getLangType(), "lang", null, 0, 1, Icon.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(injectionTargetEClass, InjectionTarget.class, "InjectionTarget", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getInjectionTarget_InjectionTargetClass(), this.getFullyQualifiedClassType(), "injectionTargetClass", null, 1, 1, InjectionTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getInjectionTarget_InjectionTargetName(), this.getJavaIdentifier(), "injectionTargetName", null, 1, 1, InjectionTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(lifecycleCallbackEClass, LifecycleCallback.class, "LifecycleCallback", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getLifecycleCallback_LifecycleCallbackClass(), this.getFullyQualifiedClassType(), "lifecycleCallbackClass", null, 0, 1, LifecycleCallback.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getLifecycleCallback_LifecycleCallbackMethod(), this.getJavaIdentifier(), "lifecycleCallbackMethod", null, 1, 1, LifecycleCallback.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(listenerEClass, Listener.class, "Listener", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getListener_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, Listener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getListener_DisplayNames(), this.getDisplayName(), null, "displayNames", null, 0, -1, Listener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getListener_Icons(), this.getIcon(), null, "icons", null, 0, -1, Listener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getListener_ListenerClass(), this.getFullyQualifiedClassType(), "listenerClass", null, 1, 1, Listener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getListener_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Listener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(messageDestinationEClass, MessageDestination.class, "MessageDestination", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getMessageDestination_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDestination_DisplayNames(), this.getDisplayName(), null, "displayNames", null, 0, -1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDestination_Icons(), this.getIcon(), null, "icons", null, 0, -1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageDestination_MessageDestinationName(), theXMLTypePackage.getToken(), "messageDestinationName", null, 1, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageDestination_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageDestination_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageDestination_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageDestination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(messageDestinationRefEClass, MessageDestinationRef.class, "MessageDestinationRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getMessageDestinationRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageDestinationRef_MessageDestinationRefName(), this.getJNDIName(), "messageDestinationRefName", null, 1, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageDestinationRef_MessageDestinationType(), this.getMessageDestinationTypeType(), "messageDestinationType", null, 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageDestinationRef_MessageDestinationUsage(), this.getMessageDestinationUsageType(), "messageDestinationUsage", null, 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageDestinationRef_MessageDestinationLink(), this.getMessageDestinationLink(), "messageDestinationLink", null, 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageDestinationRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDestinationRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageDestinationRef_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageDestinationRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageDestinationRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(paramValueEClass, ParamValue.class, "ParamValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getParamValue_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, ParamValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getParamValue_ParamName(), theXMLTypePackage.getToken(), "paramName", null, 1, 1, ParamValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getParamValue_ParamValue(), theXMLTypePackage.getString(), "paramValue", null, 1, 1, ParamValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getParamValue_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ParamValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(persistenceContextRefEClass, PersistenceContextRef.class, "PersistenceContextRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getPersistenceContextRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getPersistenceContextRef_PersistenceContextRefName(), this.getJNDIName(), "persistenceContextRefName", null, 1, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getPersistenceContextRef_PersistenceUnitName(), theXMLTypePackage.getToken(), "persistenceUnitName", null, 0, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getPersistenceContextRef_PersistenceContextType(), this.getPersistenceContextType(), "persistenceContextType", null, 0, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getPersistenceContextRef_PersistenceProperties(), this.getPropertyType(), null, "persistenceProperties", null, 0, -1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getPersistenceContextRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getPersistenceContextRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getPersistenceContextRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, PersistenceContextRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(persistenceUnitRefEClass, PersistenceUnitRef.class, "PersistenceUnitRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getPersistenceUnitRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getPersistenceUnitRef_PersistenceUnitRefName(), this.getJNDIName(), "persistenceUnitRefName", null, 1, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getPersistenceUnitRef_PersistenceUnitName(), theXMLTypePackage.getToken(), "persistenceUnitName", null, 0, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getPersistenceUnitRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getPersistenceUnitRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getPersistenceUnitRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, PersistenceUnitRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(portComponentRefEClass, PortComponentRef.class, "PortComponentRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getPortComponentRef_ServiceEndpointInterface(), this.getFullyQualifiedClassType(), "serviceEndpointInterface", null, 1, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getPortComponentRef_EnableMtom(), this.getTrueFalseType(), "enableMtom", null, 0, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getPortComponentRef_MtomThreshold(), theXMLTypePackage.getNonNegativeInteger(), "mtomThreshold", null, 0, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getPortComponentRef_Addressing(), this.getAddressingType(), null, "addressing", null, 0, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getPortComponentRef_RespectBinding(), this.getRespectBindingType(), null, "respectBinding", null, 0, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getPortComponentRef_PortComponentLink(), theXMLTypePackage.getToken(), "portComponentLink", null, 0, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getPortComponentRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, PortComponentRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(propertyTypeEClass, PropertyType.class, "PropertyType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getPropertyType_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, PropertyType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getPropertyType_Value(), theXMLTypePackage.getString(), "value", null, 1, 1, PropertyType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getPropertyType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, PropertyType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(resourceEnvRefEClass, ResourceEnvRef.class, "ResourceEnvRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getResourceEnvRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getResourceEnvRef_ResourceEnvRefName(), this.getJNDIName(), "resourceEnvRefName", null, 1, 1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getResourceEnvRef_ResourceEnvRefType(), this.getFullyQualifiedClassType(), "resourceEnvRefType", null, 0, 1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getResourceEnvRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getResourceEnvRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getResourceEnvRef_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getResourceEnvRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ResourceEnvRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(resourceRefEClass, ResourceRef.class, "ResourceRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getResourceRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getResourceRef_ResRefName(), this.getJNDIName(), "resRefName", null, 1, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getResourceRef_ResType(), this.getFullyQualifiedClassType(), "resType", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getResourceRef_ResAuth(), this.getResAuthType(), "resAuth", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getResourceRef_ResSharingScope(), this.getResSharingScopeType(), "resSharingScope", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getResourceRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getResourceRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getResourceRef_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getResourceRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ResourceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(respectBindingTypeEClass, RespectBindingType.class, "RespectBindingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getRespectBindingType_Enabled(), this.getTrueFalseType(), "enabled", null, 0, 1, RespectBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(runAsEClass, RunAs.class, "RunAs", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getRunAs_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, RunAs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getRunAs_RoleName(), this.getRoleName(), "roleName", null, 1, 1, RunAs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getRunAs_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, RunAs.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(securityRoleEClass, SecurityRole.class, "SecurityRole", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getSecurityRole_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, SecurityRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSecurityRole_RoleName(), this.getRoleName(), "roleName", null, 1, 1, SecurityRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSecurityRole_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SecurityRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(securityRoleRefEClass, SecurityRoleRef.class, "SecurityRoleRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getSecurityRoleRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, SecurityRoleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSecurityRoleRef_RoleName(), this.getRoleName(), "roleName", null, 1, 1, SecurityRoleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSecurityRoleRef_RoleLink(), this.getRoleName(), "roleLink", null, 0, 1, SecurityRoleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSecurityRoleRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SecurityRoleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(serviceRefEClass, ServiceRef.class, "ServiceRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getServiceRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getServiceRef_DisplayNames(), this.getDisplayName(), null, "displayNames", null, 0, -1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getServiceRef_Icons(), this.getIcon(), null, "icons", null, 0, -1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServiceRef_ServiceRefName(), this.getJNDIName(), "serviceRefName", null, 1, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServiceRef_ServiceInterface(), this.getFullyQualifiedClassType(), "serviceInterface", null, 1, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServiceRef_ServiceRefType(), this.getFullyQualifiedClassType(), "serviceRefType", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServiceRef_WsdlFile(), theXMLTypePackage.getAnyURI(), "wsdlFile", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServiceRef_JaxrpcMappingFile(), this.getPathType(), "jaxrpcMappingFile", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServiceRef_ServiceQname(), theXMLTypePackage.getQName(), "serviceQname", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getServiceRef_PortComponentRefs(), this.getPortComponentRef(), null, "portComponentRefs", null, 0, -1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getServiceRef_Handlers(), this.getServiceRefHandler(), null, "handlers", null, 0, -1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getServiceRef_HandlerChains(), this.getServiceRefHandlerChains(), null, "handlerChains", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServiceRef_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getServiceRef_InjectionTargets(), this.getInjectionTarget(), null, "injectionTargets", null, 0, -1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServiceRef_LookupName(), theXMLTypePackage.getString(), "lookupName", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServiceRef_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ServiceRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(serviceRefHandlerEClass, ServiceRefHandler.class, "ServiceRefHandler", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getServiceRefHandler_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getServiceRefHandler_DisplayNames(), this.getDisplayName(), null, "displayNames", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getServiceRefHandler_Icons(), this.getIcon(), null, "icons", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServiceRefHandler_HandlerName(), theXMLTypePackage.getToken(), "handlerName", null, 1, 1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServiceRefHandler_HandlerClass(), this.getFullyQualifiedClassType(), "handlerClass", null, 1, 1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getServiceRefHandler_InitParams(), this.getParamValue(), null, "initParams", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServiceRefHandler_SoapHeaders(), theXMLTypePackage.getQName(), "soapHeaders", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServiceRefHandler_SoapRoles(), theXMLTypePackage.getToken(), "soapRoles", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServiceRefHandler_PortNames(), theXMLTypePackage.getToken(), "portNames", null, 0, -1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServiceRefHandler_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ServiceRefHandler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(serviceRefHandlerChainEClass, ServiceRefHandlerChain.class, "ServiceRefHandlerChain", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getServiceRefHandlerChain_ServiceNamePattern(), this.getQnamePattern(), "serviceNamePattern", null, 0, 1, ServiceRefHandlerChain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServiceRefHandlerChain_PortNamePattern(), this.getQnamePattern(), "portNamePattern", null, 0, 1, ServiceRefHandlerChain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServiceRefHandlerChain_ProtocolBindings(), this.getProtocolBindingListType(), "protocolBindings", null, 0, 1, ServiceRefHandlerChain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getServiceRefHandlerChain_Handlers(), this.getServiceRefHandler(), null, "handlers", null, 1, -1, ServiceRefHandlerChain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServiceRefHandlerChain_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ServiceRefHandlerChain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(serviceRefHandlerChainsEClass, ServiceRefHandlerChains.class, "ServiceRefHandlerChains", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getServiceRefHandlerChains_HandlerChains(), this.getServiceRefHandlerChain(), null, "handlerChains", null, 0, -1, ServiceRefHandlerChains.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServiceRefHandlerChains_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ServiceRefHandlerChains.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(urlPatternTypeEClass, UrlPatternType.class, "UrlPatternType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getUrlPatternType_Value(), theXMLTypePackage.getString(), "value", null, 0, 1, UrlPatternType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ // Initialize enums and add enum literals
+ initEEnum(addressingResponsesTypeEEnum, AddressingResponsesType.class, "AddressingResponsesType"); //$NON-NLS-1$
+ addEEnumLiteral(addressingResponsesTypeEEnum, AddressingResponsesType.ANONYMOUS);
+ addEEnumLiteral(addressingResponsesTypeEEnum, AddressingResponsesType.NONANONYMOUS);
+ addEEnumLiteral(addressingResponsesTypeEEnum, AddressingResponsesType.ALL);
+
+ initEEnum(ejbRefTypeEEnum, EjbRefType.class, "EjbRefType"); //$NON-NLS-1$
+ addEEnumLiteral(ejbRefTypeEEnum, EjbRefType.ENTITY_LITERAL);
+ addEEnumLiteral(ejbRefTypeEEnum, EjbRefType.SESSION_LITERAL);
+
+ initEEnum(genericBooleanTypeEEnum, GenericBooleanType.class, "GenericBooleanType"); //$NON-NLS-1$
+ addEEnumLiteral(genericBooleanTypeEEnum, GenericBooleanType.TRUE);
+ addEEnumLiteral(genericBooleanTypeEEnum, GenericBooleanType.FALSE);
+ addEEnumLiteral(genericBooleanTypeEEnum, GenericBooleanType.YES);
+ addEEnumLiteral(genericBooleanTypeEEnum, GenericBooleanType.NO);
+
+ initEEnum(isolationLevelTypeEEnum, IsolationLevelType.class, "IsolationLevelType"); //$NON-NLS-1$
+ addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONREADUNCOMMITTED);
+ addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONREADCOMMITTED);
+ addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONREPEATABLEREAD);
+ addEEnumLiteral(isolationLevelTypeEEnum, IsolationLevelType.TRANSACTIONSERIALIZABLE);
+
+ initEEnum(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.class, "MessageDestinationUsageType"); //$NON-NLS-1$
+ addEEnumLiteral(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.CONSUMES_LITERAL);
+ addEEnumLiteral(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.PRODUCES_LITERAL);
+ addEEnumLiteral(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.CONSUMES_PRODUCES_LITERAL);
+
+ initEEnum(persistenceContextTypeEEnum, PersistenceContextType.class, "PersistenceContextType"); //$NON-NLS-1$
+ addEEnumLiteral(persistenceContextTypeEEnum, PersistenceContextType.TRANSACTION_LITERAL);
+ addEEnumLiteral(persistenceContextTypeEEnum, PersistenceContextType.EXTENDED_LITERAL);
+
+ initEEnum(resAuthTypeEEnum, ResAuthType.class, "ResAuthType"); //$NON-NLS-1$
+ addEEnumLiteral(resAuthTypeEEnum, ResAuthType.APPLICATION_LITERAL);
+ addEEnumLiteral(resAuthTypeEEnum, ResAuthType.CONTAINER_LITERAL);
+
+ initEEnum(resSharingScopeTypeEEnum, ResSharingScopeType.class, "ResSharingScopeType"); //$NON-NLS-1$
+ addEEnumLiteral(resSharingScopeTypeEEnum, ResSharingScopeType.SHAREABLE_LITERAL);
+ addEEnumLiteral(resSharingScopeTypeEEnum, ResSharingScopeType.UNSHAREABLE_LITERAL);
+
+ // Initialize data types
+ initEDataType(addressingResponsesTypeObjectEDataType, AddressingResponsesType.class, "AddressingResponsesTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(deweyVersionTypeEDataType, String.class, "DeweyVersionType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(ejbLinkEDataType, String.class, "EJBLink", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(ejbRefNameTypeEDataType, String.class, "EjbRefNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(ejbRefTypeObjectEDataType, EjbRefType.class, "EjbRefTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(envEntryTypeEDataType, String.class, "EnvEntryType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(fullyQualifiedClassTypeEDataType, String.class, "FullyQualifiedClassType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(genericBooleanTypeObjectEDataType, GenericBooleanType.class, "GenericBooleanTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(homeEDataType, String.class, "Home", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(isolationLevelTypeObjectEDataType, IsolationLevelType.class, "IsolationLevelTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(javaIdentifierEDataType, String.class, "JavaIdentifier", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(javaTypeEDataType, String.class, "JavaType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(jdbcUrlTypeEDataType, String.class, "JdbcUrlType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(jndiNameEDataType, String.class, "JNDIName", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(localEDataType, String.class, "Local", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(localHomeEDataType, String.class, "LocalHome", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(messageDestinationLinkEDataType, String.class, "MessageDestinationLink", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(messageDestinationTypeTypeEDataType, String.class, "MessageDestinationTypeType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(messageDestinationUsageTypeObjectEDataType, MessageDestinationUsageType.class, "MessageDestinationUsageTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(pathTypeEDataType, String.class, "PathType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(persistenceContextTypeObjectEDataType, PersistenceContextType.class, "PersistenceContextTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(protocolBindingListTypeEDataType, List.class, "ProtocolBindingListType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(protocolBindingTypeEDataType, String.class, "ProtocolBindingType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(protocolURIAliasTypeEDataType, String.class, "ProtocolURIAliasType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(qnamePatternEDataType, String.class, "QnamePattern", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(remoteEDataType, String.class, "Remote", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(resAuthTypeObjectEDataType, ResAuthType.class, "ResAuthTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(resSharingScopeTypeObjectEDataType, ResSharingScopeType.class, "ResSharingScopeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(roleNameEDataType, String.class, "RoleName", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(trueFalseTypeEDataType, boolean.class, "TrueFalseType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(trueFalseTypeObjectEDataType, Boolean.class, "TrueFalseTypeObject", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ // Create resource
+ createResource(eNS_URI);
+
+ // Create annotations
+ // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
+ createExtendedMetaDataAnnotations();
+ }finally{
+ if( hasLock )
+ J2EEInit.releaseInitializePackageContentsLock();
+ }
}
/**
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java
index 7570e6e..a8f2817 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java
@@ -19,11 +19,8 @@
import org.eclipse.emf.ecore.impl.EPackageImpl;
import org.eclipse.emf.ecore.xml.namespace.XMLNamespacePackage;
import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl;
-import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
-import org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationclientPackageImpl;
-import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
-import org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl;
+import org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin;
+import org.eclipse.jst.j2ee.internal.J2EEInit;
import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
import org.eclipse.jst.javaee.ejb.AccessTimeoutType;
import org.eclipse.jst.javaee.ejb.ActivationConfig;
@@ -79,16 +76,6 @@
import org.eclipse.jst.javaee.ejb.TransactionAttributeType;
import org.eclipse.jst.javaee.ejb.TransactionType;
import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-import org.eclipse.jst.javaee.jca.internal.impl.JcaPackageImpl;
-import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
-import org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl;
-import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
-import org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl;
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-import org.eclipse.jst.javaee.webapp.internal.impl.WebappPackageImpl;
-import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
-import org.eclipse.jst.javaee.webfragment.internal.impl.WebfragmentPackageImpl;
-import org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage;
/**
* <!-- begin-user-doc -->
@@ -590,7 +577,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private static boolean isInited = false;
+ private volatile static boolean isInited = false;
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
@@ -616,37 +603,11 @@
XMLNamespacePackage.eINSTANCE.eClass();
XMLTypePackage.eINSTANCE.eClass();
- // Obtain or create and register interdependencies
- ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
- JavaeePackageImpl theJavaeePackage = (JavaeePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) instanceof JavaeePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) : JavaeePackage.eINSTANCE);
- ApplicationclientPackageImpl theApplicationclientPackage = (ApplicationclientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) instanceof ApplicationclientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) : ApplicationclientPackage.eINSTANCE);
- JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
- JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
- WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) : WebPackage.eINSTANCE);
- WebappPackageImpl theWebappPackage = (WebappPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) instanceof WebappPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) : WebappPackage.eINSTANCE);
- WebfragmentPackageImpl theWebfragmentPackage = (WebfragmentPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) instanceof WebfragmentPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) : WebfragmentPackage.eINSTANCE);
-
// Create package meta-data objects
theEjbPackage.createPackageContents();
- theApplicationPackage.createPackageContents();
- theJavaeePackage.createPackageContents();
- theApplicationclientPackage.createPackageContents();
- theJcaPackage.createPackageContents();
- theJspPackage.createPackageContents();
- theWebPackage.createPackageContents();
- theWebappPackage.createPackageContents();
- theWebfragmentPackage.createPackageContents();
// Initialize created meta-data
theEjbPackage.initializePackageContents();
- theApplicationPackage.initializePackageContents();
- theJavaeePackage.initializePackageContents();
- theApplicationclientPackage.initializePackageContents();
- theJcaPackage.initializePackageContents();
- theJspPackage.initializePackageContents();
- theWebPackage.initializePackageContents();
- theWebappPackage.initializePackageContents();
- theWebfragmentPackage.initializePackageContents();
// Mark meta-data to indicate it can't be changed
theEjbPackage.freeze();
@@ -655,6 +616,8 @@
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(EjbPackage.eNS_URI, theEjbPackage);
EPackage.Registry.INSTANCE.put(EjbPackage.eNS_URI2, theEjbPackage);
+
+ J2EEInit.initEMFModels();
return theEjbPackage;
}
@@ -4262,459 +4225,471 @@
// Set bounds for type parameters
- // Add supertypes to classes
-
- // Initialize classes and features; add operations and parameters
- initEClass(accessTimeoutTypeEClass, AccessTimeoutType.class, "AccessTimeoutType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getAccessTimeoutType_Timeout(), theXMLTypePackage.getInteger(), "timeout", null, 1, 1, AccessTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getAccessTimeoutType_Unit(), this.getTimeUnitTypeType(), "unit", null, 1, 1, AccessTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getAccessTimeoutType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AccessTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(activationConfigEClass, ActivationConfig.class, "ActivationConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getActivationConfig_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, ActivationConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getActivationConfig_ActivationConfigProperties(), this.getActivationConfigProperty(), null, "activationConfigProperties", null, 1, -1, ActivationConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getActivationConfig_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ActivationConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(activationConfigPropertyEClass, ActivationConfigProperty.class, "ActivationConfigProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getActivationConfigProperty_ActivationConfigPropertyName(), theXMLTypePackage.getString(), "activationConfigPropertyName", null, 1, 1, ActivationConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getActivationConfigProperty_ActivationConfigPropertyValue(), theXMLTypePackage.getString(), "activationConfigPropertyValue", null, 1, 1, ActivationConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getActivationConfigProperty_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ActivationConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(applicationExceptionEClass, ApplicationException.class, "ApplicationException", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getApplicationException_ExceptionClass(), theJavaeePackage.getFullyQualifiedClassType(), "exceptionClass", null, 1, 1, ApplicationException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getApplicationException_Rollback(), theJavaeePackage.getTrueFalseType(), "rollback", null, 0, 1, ApplicationException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getApplicationException_Inherited(), theJavaeePackage.getTrueFalseType(), "inherited", null, 0, 1, ApplicationException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getApplicationException_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ApplicationException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(aroundInvokeTypeEClass, AroundInvokeType.class, "AroundInvokeType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getAroundInvokeType_Class(), theJavaeePackage.getFullyQualifiedClassType(), "class", null, 0, 1, AroundInvokeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getAroundInvokeType_MethodName(), theJavaeePackage.getJavaIdentifier(), "methodName", null, 1, 1, AroundInvokeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(aroundTimeoutTypeEClass, AroundTimeoutType.class, "AroundTimeoutType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getAroundTimeoutType_Class(), theJavaeePackage.getFullyQualifiedClassType(), "class", null, 0, 1, AroundTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getAroundTimeoutType_MethodName(), theJavaeePackage.getJavaIdentifier(), "methodName", null, 1, 1, AroundTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(assemblyDescriptorEClass, AssemblyDescriptor.class, "AssemblyDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getAssemblyDescriptor_SecurityRoles(), theJavaeePackage.getSecurityRole(), null, "securityRoles", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getAssemblyDescriptor_MethodPermissions(), this.getMethodPermission(), null, "methodPermissions", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getAssemblyDescriptor_ContainerTransactions(), this.getContainerTransactionType(), null, "containerTransactions", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getAssemblyDescriptor_InterceptorBindings(), this.getInterceptorBindingType(), null, "interceptorBindings", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getAssemblyDescriptor_MessageDestinations(), theJavaeePackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getAssemblyDescriptor_ExcludeList(), this.getExcludeList(), null, "excludeList", null, 0, 1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getAssemblyDescriptor_ApplicationExceptions(), this.getApplicationException(), null, "applicationExceptions", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getAssemblyDescriptor_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(asyncMethodTypeEClass, AsyncMethodType.class, "AsyncMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getAsyncMethodType_MethodName(), theXMLTypePackage.getToken(), "methodName", null, 1, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getAsyncMethodType_MethodParams(), this.getMethodParams(), null, "methodParams", null, 0, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getAsyncMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(cmpFieldEClass, CMPField.class, "CMPField", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getCMPField_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, CMPField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getCMPField_FieldName(), theJavaeePackage.getJavaIdentifier(), "fieldName", null, 1, 1, CMPField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getCMPField_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, CMPField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(cmrFieldEClass, CMRField.class, "CMRField", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getCMRField_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, CMRField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getCMRField_CmrFieldName(), theXMLTypePackage.getToken(), "cmrFieldName", null, 1, 1, CMRField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getCMRField_CmrFieldType(), this.getCMRFieldType(), "cmrFieldType", null, 0, 1, CMRField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getCMRField_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, CMRField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(concurrentMethodTypeEClass, ConcurrentMethodType.class, "ConcurrentMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getConcurrentMethodType_Method(), this.getNamedMethodType(), null, "method", null, 1, 1, ConcurrentMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConcurrentMethodType_Lock(), this.getConcurrentLockTypeType(), "lock", null, 0, 1, ConcurrentMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getConcurrentMethodType_AccessTimeout(), this.getAccessTimeoutType(), null, "accessTimeout", null, 0, 1, ConcurrentMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConcurrentMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ConcurrentMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(containerTransactionTypeEClass, ContainerTransactionType.class, "ContainerTransactionType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getContainerTransactionType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, ContainerTransactionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getContainerTransactionType_Methods(), this.getMethodType(), null, "methods", null, 1, -1, ContainerTransactionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getContainerTransactionType_TransAttribute(), this.getTransactionAttributeType(), "transAttribute", null, 1, 1, ContainerTransactionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getContainerTransactionType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ContainerTransactionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(dependsOnTypeEClass, DependsOnType.class, "DependsOnType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getDependsOnType_EjbName(), theJavaeePackage.getEJBLink(), "ejbName", null, 1, -1, DependsOnType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getDependsOnType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, DependsOnType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(ejbJarEClass, EJBJar.class, "EJBJar", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getEJBJar_ModuleName(), theXMLTypePackage.getToken(), "moduleName", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEJBJar_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEJBJar_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEJBJar_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEJBJar_EnterpriseBeans(), this.getEnterpriseBeans(), null, "enterpriseBeans", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEJBJar_Interceptors(), this.getInterceptorsType(), null, "interceptors", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEJBJar_Relationships(), this.getRelationships(), null, "relationships", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEJBJar_AssemblyDescriptor(), this.getAssemblyDescriptor(), null, "assemblyDescriptor", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEJBJar_EjbClientJar(), theJavaeePackage.getPathType(), "ejbClientJar", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEJBJar_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEJBJar_MetadataComplete(), theXMLTypePackage.getBoolean(), "metadataComplete", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEJBJar_Version(), theJavaeePackage.getDeweyVersionType(), "version", "3.1", 1, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
- initEClass(ejbJarDeploymentDescriptorEClass, EJBJarDeploymentDescriptor.class, "EJBJarDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getEJBJarDeploymentDescriptor_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEJBJarDeploymentDescriptor_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEJBJarDeploymentDescriptor_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEJBJarDeploymentDescriptor_EjbJar(), this.getEJBJar(), null, "ejbJar", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(ejbRelationEClass, EJBRelation.class, "EJBRelation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getEJBRelation_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEJBRelation_EjbRelationName(), theXMLTypePackage.getToken(), "ejbRelationName", null, 0, 1, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEJBRelation_EjbRelationshipRoles(), this.getEJBRelationshipRole(), null, "ejbRelationshipRoles", null, 2, 2, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEJBRelation_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(ejbRelationshipRoleEClass, EJBRelationshipRole.class, "EJBRelationshipRole", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getEJBRelationshipRole_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEJBRelationshipRole_EjbRelationshipRoleName(), theXMLTypePackage.getToken(), "ejbRelationshipRoleName", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEJBRelationshipRole_Multiplicity(), this.getMultiplicityType(), "multiplicity", null, 1, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEJBRelationshipRole_CascadeDelete(), theJavaeePackage.getEmptyType(), null, "cascadeDelete", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEJBRelationshipRole_RelationshipRoleSource(), this.getRelationshipRoleSourceType(), null, "relationshipRoleSource", null, 1, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEJBRelationshipRole_CmrField(), this.getCMRField(), null, "cmrField", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEJBRelationshipRole_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(enterpriseBeansEClass, EnterpriseBeans.class, "EnterpriseBeans", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getEnterpriseBeans_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, EnterpriseBeans.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEnterpriseBeans_SessionBeans(), this.getSessionBean(), null, "sessionBeans", null, 0, -1, EnterpriseBeans.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEnterpriseBeans_EntityBeans(), this.getEntityBean(), null, "entityBeans", null, 0, -1, EnterpriseBeans.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEnterpriseBeans_MessageDrivenBeans(), this.getMessageDrivenBean(), null, "messageDrivenBeans", null, 0, -1, EnterpriseBeans.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEnterpriseBeans_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EnterpriseBeans.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(entityBeanEClass, EntityBean.class, "EntityBean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getEntityBean_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEntityBean_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEntityBean_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEntityBean_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEntityBean_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEntityBean_Home(), theJavaeePackage.getHome(), "home", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEntityBean_Remote(), theJavaeePackage.getRemote(), "remote", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEntityBean_LocalHome(), theJavaeePackage.getLocalHome(), "localHome", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEntityBean_Local(), theJavaeePackage.getLocal(), "local", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEntityBean_EjbClass(), this.getEjbClassType(), "ejbClass", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEntityBean_PersistenceType(), this.getPersistenceType(), "persistenceType", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEntityBean_PrimKeyClass(), theJavaeePackage.getFullyQualifiedClassType(), "primKeyClass", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEntityBean_Reentrant(), theJavaeePackage.getTrueFalseType(), "reentrant", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEntityBean_CmpVersion(), this.getCmpVersionType(), "cmpVersion", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEntityBean_AbstractSchemaName(), theJavaeePackage.getJavaIdentifier(), "abstractSchemaName", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEntityBean_CmpFields(), this.getCMPField(), null, "cmpFields", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEntityBean_PrimkeyField(), theXMLTypePackage.getToken(), "primkeyField", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEntityBean_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEntityBean_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEntityBean_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEntityBean_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEntityBean_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEntityBean_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEntityBean_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEntityBean_PersistenceContextRefs(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEntityBean_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEntityBean_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEntityBean_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEntityBean_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEntityBean_SecurityRoleRefs(), theJavaeePackage.getSecurityRoleRef(), null, "securityRoleRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEntityBean_SecurityIdentity(), this.getSecurityIdentityType(), null, "securityIdentity", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEntityBean_Queries(), this.getQuery(), null, "queries", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEntityBean_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(excludeListEClass, ExcludeList.class, "ExcludeList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getExcludeList_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, ExcludeList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getExcludeList_Methods(), this.getMethodType(), null, "methods", null, 1, -1, ExcludeList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getExcludeList_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ExcludeList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(initMethodTypeEClass, InitMethodType.class, "InitMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getInitMethodType_CreateMethod(), this.getNamedMethodType(), null, "createMethod", null, 1, 1, InitMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getInitMethodType_BeanMethod(), this.getNamedMethodType(), null, "beanMethod", null, 1, 1, InitMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getInitMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InitMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(interceptorBindingTypeEClass, InterceptorBindingType.class, "InterceptorBindingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getInterceptorBindingType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getInterceptorBindingType_EjbName(), theXMLTypePackage.getToken(), "ejbName", null, 1, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getInterceptorBindingType_InterceptorClasses(), theJavaeePackage.getFullyQualifiedClassType(), "interceptorClasses", null, 0, -1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getInterceptorBindingType_InterceptorOrder(), this.getInterceptorOrderType(), null, "interceptorOrder", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getInterceptorBindingType_ExcludeDefaultInterceptors(), theJavaeePackage.getTrueFalseType(), "excludeDefaultInterceptors", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getInterceptorBindingType_ExcludeClassInterceptors(), theJavaeePackage.getTrueFalseType(), "excludeClassInterceptors", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getInterceptorBindingType_Method(), this.getNamedMethodType(), null, "method", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getInterceptorBindingType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(interceptorOrderTypeEClass, InterceptorOrderType.class, "InterceptorOrderType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getInterceptorOrderType_InterceptorClasses(), theJavaeePackage.getFullyQualifiedClassType(), "interceptorClasses", null, 1, -1, InterceptorOrderType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getInterceptorOrderType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InterceptorOrderType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(interceptorsTypeEClass, InterceptorsType.class, "InterceptorsType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getInterceptorsType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, InterceptorsType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getInterceptorsType_Interceptors(), this.getInterceptorType(), null, "interceptors", null, 1, -1, InterceptorsType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getInterceptorsType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InterceptorsType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(interceptorTypeEClass, InterceptorType.class, "InterceptorType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getInterceptorType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getInterceptorType_InterceptorClass(), theJavaeePackage.getFullyQualifiedClassType(), "interceptorClass", null, 1, 1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getInterceptorType_AroundInvokes(), this.getAroundInvokeType(), null, "aroundInvokes", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getInterceptorType_AroundTimeouts(), this.getAroundTimeoutType(), null, "aroundTimeouts", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getInterceptorType_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getInterceptorType_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getInterceptorType_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getInterceptorType_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getInterceptorType_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getInterceptorType_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getInterceptorType_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getInterceptorType_PersistenceContextRefs(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getInterceptorType_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getInterceptorType_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getInterceptorType_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getInterceptorType_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getInterceptorType_PostActivates(), theJavaeePackage.getLifecycleCallback(), null, "postActivates", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getInterceptorType_PrePassivates(), theJavaeePackage.getLifecycleCallback(), null, "prePassivates", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getInterceptorType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(messageDrivenBeanEClass, MessageDrivenBean.class, "MessageDrivenBean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageDrivenBean_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageDrivenBean_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageDrivenBean_EjbClass(), this.getEjbClassType(), "ejbClass", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageDrivenBean_MessagingType(), theJavaeePackage.getFullyQualifiedClassType(), "messagingType", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_TimeoutMethod(), this.getNamedMethodType(), null, "timeoutMethod", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_Timer(), this.getTimerType(), null, "timer", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageDrivenBean_TransactionType(), this.getTransactionType(), "transactionType", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageDrivenBean_MessageDestinationType(), theJavaeePackage.getMessageDestinationTypeType(), "messageDestinationType", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageDrivenBean_MessageDestinationLink(), theJavaeePackage.getMessageDestinationLink(), "messageDestinationLink", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_ActivationConfig(), this.getActivationConfig(), null, "activationConfig", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_AroundInvokes(), this.getAroundInvokeType(), null, "aroundInvokes", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_AroundTimeouts(), this.getAroundTimeoutType(), null, "aroundTimeouts", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_PersistenceContextRefs(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_SecurityRoleRef(), theJavaeePackage.getSecurityRoleRef(), null, "securityRoleRef", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageDrivenBean_SecurityIdentity(), this.getSecurityIdentityType(), null, "securityIdentity", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageDrivenBean_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(methodParamsEClass, MethodParams.class, "MethodParams", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getMethodParams_MethodParams(), theJavaeePackage.getJavaType(), "methodParams", null, 0, -1, MethodParams.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMethodParams_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MethodParams.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(methodPermissionEClass, MethodPermission.class, "MethodPermission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getMethodPermission_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMethodPermission_RoleNames(), theJavaeePackage.getRoleName(), "roleNames", null, 0, -1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMethodPermission_Unchecked(), theJavaeePackage.getEmptyType(), null, "unchecked", null, 0, 1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMethodPermission_Methods(), this.getMethodType(), null, "methods", null, 1, -1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMethodPermission_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(methodTypeEClass, MethodType.class, "MethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getMethodType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMethodType_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMethodType_MethodIntf(), this.getMethodInterfaceType(), "methodIntf", null, 0, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMethodType_MethodName(), this.getMethodNameType(), "methodName", null, 1, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMethodType_MethodParams(), this.getMethodParams(), null, "methodParams", null, 0, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(namedMethodTypeEClass, NamedMethodType.class, "NamedMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getNamedMethodType_MethodName(), theXMLTypePackage.getToken(), "methodName", null, 1, 1, NamedMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getNamedMethodType_MethodParams(), this.getMethodParams(), null, "methodParams", null, 0, 1, NamedMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getNamedMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, NamedMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(queryEClass, Query.class, "Query", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getQuery_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getQuery_QueryMethod(), this.getQueryMethod(), null, "queryMethod", null, 1, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getQuery_ResultTypeMapping(), this.getResultTypeMappingType(), "resultTypeMapping", null, 0, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getQuery_EjbQl(), theXMLTypePackage.getString(), "ejbQl", null, 1, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getQuery_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(queryMethodEClass, QueryMethod.class, "QueryMethod", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getQueryMethod_MethodName(), this.getMethodNameType(), "methodName", null, 1, 1, QueryMethod.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getQueryMethod_MethodParams(), this.getMethodParams(), null, "methodParams", null, 1, 1, QueryMethod.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getQueryMethod_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, QueryMethod.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(relationshipRoleSourceTypeEClass, RelationshipRoleSourceType.class, "RelationshipRoleSourceType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getRelationshipRoleSourceType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, RelationshipRoleSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getRelationshipRoleSourceType_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, RelationshipRoleSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getRelationshipRoleSourceType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, RelationshipRoleSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(relationshipsEClass, Relationships.class, "Relationships", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getRelationships_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Relationships.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getRelationships_EjbRelations(), this.getEJBRelation(), null, "ejbRelations", null, 1, -1, Relationships.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getRelationships_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Relationships.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(removeMethodTypeEClass, RemoveMethodType.class, "RemoveMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getRemoveMethodType_BeanMethod(), this.getNamedMethodType(), null, "beanMethod", null, 1, 1, RemoveMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getRemoveMethodType_RetainIfException(), theJavaeePackage.getTrueFalseType(), "retainIfException", null, 0, 1, RemoveMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getRemoveMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, RemoveMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(securityIdentityTypeEClass, SecurityIdentityType.class, "SecurityIdentityType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getSecurityIdentityType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, SecurityIdentityType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSecurityIdentityType_UseCallerIdentity(), theJavaeePackage.getEmptyType(), null, "useCallerIdentity", null, 0, 1, SecurityIdentityType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSecurityIdentityType_RunAs(), theJavaeePackage.getRunAs(), null, "runAs", null, 0, 1, SecurityIdentityType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSecurityIdentityType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SecurityIdentityType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(sessionBeanEClass, SessionBean.class, "SessionBean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getSessionBean_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSessionBean_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSessionBean_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSessionBean_Home(), theJavaeePackage.getHome(), "home", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSessionBean_Remote(), theJavaeePackage.getRemote(), "remote", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSessionBean_LocalHome(), theJavaeePackage.getLocalHome(), "localHome", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSessionBean_Local(), theJavaeePackage.getLocal(), "local", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSessionBean_BusinessLocals(), theJavaeePackage.getFullyQualifiedClassType(), "businessLocals", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSessionBean_BusinessRemotes(), theJavaeePackage.getFullyQualifiedClassType(), "businessRemotes", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_LocalBean(), theJavaeePackage.getEmptyType(), null, "localBean", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSessionBean_ServiceEndpoint(), theJavaeePackage.getFullyQualifiedClassType(), "serviceEndpoint", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSessionBean_EjbClass(), this.getEjbClassType(), "ejbClass", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSessionBean_SessionType(), this.getSessionType(), "sessionType", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_StatefulTimeout(), this.getStatefulTimeoutType(), null, "statefulTimeout", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_TimeoutMethod(), this.getNamedMethodType(), null, "timeoutMethod", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_Timer(), this.getTimerType(), null, "timer", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSessionBean_InitOnStartup(), theJavaeePackage.getTrueFalseType(), "initOnStartup", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSessionBean_ConcurrencyManagementType(), this.getConcurrencyManagementTypeType(), "concurrencyManagementType", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_ConcurrentMethod(), this.getConcurrentMethodType(), null, "concurrentMethod", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_DependsOn(), this.getDependsOnType(), null, "dependsOn", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_InitMethods(), this.getInitMethodType(), null, "initMethods", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_RemoveMethods(), this.getRemoveMethodType(), null, "removeMethods", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_AsyncMethod(), this.getAsyncMethodType(), null, "asyncMethod", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSessionBean_TransactionType(), this.getTransactionType(), "transactionType", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_AfterBeginMethod(), this.getNamedMethodType(), null, "afterBeginMethod", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_BeforeCompletionMethod(), this.getNamedMethodType(), null, "beforeCompletionMethod", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_AfterCompletionMethod(), this.getNamedMethodType(), null, "afterCompletionMethod", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_AroundInvokes(), this.getAroundInvokeType(), null, "aroundInvokes", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_AroundTimeouts(), this.getAroundTimeoutType(), null, "aroundTimeouts", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_PersistenceContextRefs(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_PostActivates(), theJavaeePackage.getLifecycleCallback(), null, "postActivates", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_PrePassivates(), theJavaeePackage.getLifecycleCallback(), null, "prePassivates", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_SecurityRoleRefs(), theJavaeePackage.getSecurityRoleRef(), null, "securityRoleRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionBean_SecurityIdentities(), this.getSecurityIdentityType(), null, "securityIdentities", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSessionBean_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(statefulTimeoutTypeEClass, StatefulTimeoutType.class, "StatefulTimeoutType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getStatefulTimeoutType_Timeout(), theXMLTypePackage.getInteger(), "timeout", null, 1, 1, StatefulTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getStatefulTimeoutType_Unit(), this.getTimeUnitTypeType(), "unit", null, 1, 1, StatefulTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getStatefulTimeoutType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, StatefulTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(timerScheduleTypeEClass, TimerScheduleType.class, "TimerScheduleType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getTimerScheduleType_Second(), theXMLTypePackage.getToken(), "second", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getTimerScheduleType_Minute(), theXMLTypePackage.getToken(), "minute", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getTimerScheduleType_Hour(), theXMLTypePackage.getToken(), "hour", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getTimerScheduleType_DayOfMonth(), theXMLTypePackage.getToken(), "dayOfMonth", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getTimerScheduleType_Month(), theXMLTypePackage.getToken(), "month", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getTimerScheduleType_DayOfWeek(), theXMLTypePackage.getToken(), "dayOfWeek", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getTimerScheduleType_Year(), theXMLTypePackage.getToken(), "year", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getTimerScheduleType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(timerTypeEClass, TimerType.class, "TimerType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getTimerType_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, -1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getTimerType_Schedule(), this.getTimerScheduleType(), null, "schedule", null, 1, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getTimerType_Start(), theXMLTypePackage.getDateTime(), "start", null, 0, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getTimerType_End(), theXMLTypePackage.getDateTime(), "end", null, 0, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getTimerType_TimeoutMethod(), this.getNamedMethodType(), null, "timeoutMethod", null, 1, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getTimerType_Persistent(), theJavaeePackage.getTrueFalseType(), "persistent", null, 0, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getTimerType_Timezone(), theXMLTypePackage.getToken(), "timezone", null, 0, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getTimerType_Info(), theXMLTypePackage.getToken(), "info", null, 0, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getTimerType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- // Initialize enums and add enum literals
- initEEnum(cmpVersionTypeEEnum, CmpVersionType.class, "CmpVersionType"); //$NON-NLS-1$
- addEEnumLiteral(cmpVersionTypeEEnum, CmpVersionType._1X_LITERAL);
- addEEnumLiteral(cmpVersionTypeEEnum, CmpVersionType._2X_LITERAL);
-
- initEEnum(cmrFieldTypeEEnum, CMRFieldType.class, "CMRFieldType"); //$NON-NLS-1$
- addEEnumLiteral(cmrFieldTypeEEnum, CMRFieldType.JAVA_UTIL_COLLECTION_LITERAL);
- addEEnumLiteral(cmrFieldTypeEEnum, CMRFieldType.JAVA_UTIL_SET_LITERAL);
-
- initEEnum(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.class, "ConcurrencyManagementTypeType"); //$NON-NLS-1$
- addEEnumLiteral(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.BEAN);
- addEEnumLiteral(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.CONTAINER);
-
- initEEnum(concurrentLockTypeTypeEEnum, ConcurrentLockTypeType.class, "ConcurrentLockTypeType"); //$NON-NLS-1$
- addEEnumLiteral(concurrentLockTypeTypeEEnum, ConcurrentLockTypeType.READ);
- addEEnumLiteral(concurrentLockTypeTypeEEnum, ConcurrentLockTypeType.WRITE);
-
- initEEnum(methodInterfaceTypeEEnum, MethodInterfaceType.class, "MethodInterfaceType"); //$NON-NLS-1$
- addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.HOME_LITERAL);
- addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.REMOTE_LITERAL);
- addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.LOCAL_HOME_LITERAL);
- addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.LOCAL_LITERAL);
- addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.SERVICE_ENDPOINT_LITERAL);
- addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.TIMER_LITERAL);
- addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.MESSAGE_ENDPOINT_LITERAL);
-
- initEEnum(multiplicityTypeEEnum, MultiplicityType.class, "MultiplicityType"); //$NON-NLS-1$
- addEEnumLiteral(multiplicityTypeEEnum, MultiplicityType.ONE_LITERAL);
- addEEnumLiteral(multiplicityTypeEEnum, MultiplicityType.MANY_LITERAL);
-
- initEEnum(persistenceTypeEEnum, PersistenceType.class, "PersistenceType"); //$NON-NLS-1$
- addEEnumLiteral(persistenceTypeEEnum, PersistenceType.BEAN_LITERAL);
- addEEnumLiteral(persistenceTypeEEnum, PersistenceType.CONTAINER_LITERAL);
-
- initEEnum(resultTypeMappingTypeEEnum, ResultTypeMappingType.class, "ResultTypeMappingType"); //$NON-NLS-1$
- addEEnumLiteral(resultTypeMappingTypeEEnum, ResultTypeMappingType.LOCAL_LITERAL);
- addEEnumLiteral(resultTypeMappingTypeEEnum, ResultTypeMappingType.REMOTE_LITERAL);
-
- initEEnum(sessionTypeEEnum, SessionType.class, "SessionType"); //$NON-NLS-1$
- addEEnumLiteral(sessionTypeEEnum, SessionType.SINGLETON_LITERAL);
- addEEnumLiteral(sessionTypeEEnum, SessionType.STATEFUL_LITERAL);
- addEEnumLiteral(sessionTypeEEnum, SessionType.STATELESS_LITERAL);
-
- initEEnum(timeUnitTypeTypeEEnum, TimeUnitTypeType.class, "TimeUnitTypeType"); //$NON-NLS-1$
- addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.DAYS);
- addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.HOURS);
- addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.MINUTES);
- addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.SECONDS);
- addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.MILLISECONDS);
- addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.MICROSECONDS);
- addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.NANOSECONDS);
-
- 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);
-
- // Initialize data types
- initEDataType(cmpVersionTypeObjectEDataType, CmpVersionType.class, "CmpVersionTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(cmrFieldTypeObjectEDataType, CMRFieldType.class, "CMRFieldTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(concurrencyManagementTypeTypeObjectEDataType, ConcurrencyManagementTypeType.class, "ConcurrencyManagementTypeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(concurrentLockTypeTypeObjectEDataType, ConcurrentLockTypeType.class, "ConcurrentLockTypeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(ejbClassTypeEDataType, String.class, "EjbClassType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(ejbNameTypeEDataType, String.class, "EjbNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(methodInterfaceTypeObjectEDataType, MethodInterfaceType.class, "MethodInterfaceTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(methodNameTypeEDataType, String.class, "MethodNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(multiplicityTypeObjectEDataType, MultiplicityType.class, "MultiplicityTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(persistenceTypeObjectEDataType, PersistenceType.class, "PersistenceTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(resultTypeMappingTypeObjectEDataType, ResultTypeMappingType.class, "ResultTypeMappingTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(sessionTypeObjectEDataType, SessionType.class, "SessionTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(timeUnitTypeTypeObjectEDataType, TimeUnitTypeType.class, "TimeUnitTypeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(transactionAttributeTypeObjectEDataType, TransactionAttributeType.class, "TransactionAttributeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(transactionTypeObjectEDataType, TransactionType.class, "TransactionTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- // Create resource
- createResource(eNS_URI);
-
- // Create annotations
- // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
- createExtendedMetaDataAnnotations();
+ boolean hasLock = false;
+ try {
+ hasLock = J2EEInit.aquireInitializePackageContentsLock();
+ } catch (InterruptedException e) {
+ J2EECorePlugin.logError(e);
+ }
+
+ try{
+ // Add supertypes to classes
+
+ // Initialize classes and features; add operations and parameters
+ initEClass(accessTimeoutTypeEClass, AccessTimeoutType.class, "AccessTimeoutType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getAccessTimeoutType_Timeout(), theXMLTypePackage.getInteger(), "timeout", null, 1, 1, AccessTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getAccessTimeoutType_Unit(), this.getTimeUnitTypeType(), "unit", null, 1, 1, AccessTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getAccessTimeoutType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AccessTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(activationConfigEClass, ActivationConfig.class, "ActivationConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getActivationConfig_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, ActivationConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getActivationConfig_ActivationConfigProperties(), this.getActivationConfigProperty(), null, "activationConfigProperties", null, 1, -1, ActivationConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getActivationConfig_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ActivationConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(activationConfigPropertyEClass, ActivationConfigProperty.class, "ActivationConfigProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getActivationConfigProperty_ActivationConfigPropertyName(), theXMLTypePackage.getString(), "activationConfigPropertyName", null, 1, 1, ActivationConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getActivationConfigProperty_ActivationConfigPropertyValue(), theXMLTypePackage.getString(), "activationConfigPropertyValue", null, 1, 1, ActivationConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getActivationConfigProperty_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ActivationConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(applicationExceptionEClass, ApplicationException.class, "ApplicationException", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getApplicationException_ExceptionClass(), theJavaeePackage.getFullyQualifiedClassType(), "exceptionClass", null, 1, 1, ApplicationException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getApplicationException_Rollback(), theJavaeePackage.getTrueFalseType(), "rollback", null, 0, 1, ApplicationException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getApplicationException_Inherited(), theJavaeePackage.getTrueFalseType(), "inherited", null, 0, 1, ApplicationException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getApplicationException_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ApplicationException.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(aroundInvokeTypeEClass, AroundInvokeType.class, "AroundInvokeType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getAroundInvokeType_Class(), theJavaeePackage.getFullyQualifiedClassType(), "class", null, 0, 1, AroundInvokeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getAroundInvokeType_MethodName(), theJavaeePackage.getJavaIdentifier(), "methodName", null, 1, 1, AroundInvokeType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(aroundTimeoutTypeEClass, AroundTimeoutType.class, "AroundTimeoutType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getAroundTimeoutType_Class(), theJavaeePackage.getFullyQualifiedClassType(), "class", null, 0, 1, AroundTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getAroundTimeoutType_MethodName(), theJavaeePackage.getJavaIdentifier(), "methodName", null, 1, 1, AroundTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(assemblyDescriptorEClass, AssemblyDescriptor.class, "AssemblyDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getAssemblyDescriptor_SecurityRoles(), theJavaeePackage.getSecurityRole(), null, "securityRoles", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getAssemblyDescriptor_MethodPermissions(), this.getMethodPermission(), null, "methodPermissions", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getAssemblyDescriptor_ContainerTransactions(), this.getContainerTransactionType(), null, "containerTransactions", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getAssemblyDescriptor_InterceptorBindings(), this.getInterceptorBindingType(), null, "interceptorBindings", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getAssemblyDescriptor_MessageDestinations(), theJavaeePackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getAssemblyDescriptor_ExcludeList(), this.getExcludeList(), null, "excludeList", null, 0, 1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getAssemblyDescriptor_ApplicationExceptions(), this.getApplicationException(), null, "applicationExceptions", null, 0, -1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getAssemblyDescriptor_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AssemblyDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(asyncMethodTypeEClass, AsyncMethodType.class, "AsyncMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getAsyncMethodType_MethodName(), theXMLTypePackage.getToken(), "methodName", null, 1, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getAsyncMethodType_MethodParams(), this.getMethodParams(), null, "methodParams", null, 0, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getAsyncMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AsyncMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(cmpFieldEClass, CMPField.class, "CMPField", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getCMPField_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, CMPField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getCMPField_FieldName(), theJavaeePackage.getJavaIdentifier(), "fieldName", null, 1, 1, CMPField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getCMPField_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, CMPField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(cmrFieldEClass, CMRField.class, "CMRField", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getCMRField_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, CMRField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getCMRField_CmrFieldName(), theXMLTypePackage.getToken(), "cmrFieldName", null, 1, 1, CMRField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getCMRField_CmrFieldType(), this.getCMRFieldType(), "cmrFieldType", null, 0, 1, CMRField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getCMRField_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, CMRField.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(concurrentMethodTypeEClass, ConcurrentMethodType.class, "ConcurrentMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getConcurrentMethodType_Method(), this.getNamedMethodType(), null, "method", null, 1, 1, ConcurrentMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConcurrentMethodType_Lock(), this.getConcurrentLockTypeType(), "lock", null, 0, 1, ConcurrentMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getConcurrentMethodType_AccessTimeout(), this.getAccessTimeoutType(), null, "accessTimeout", null, 0, 1, ConcurrentMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConcurrentMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ConcurrentMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(containerTransactionTypeEClass, ContainerTransactionType.class, "ContainerTransactionType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getContainerTransactionType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, ContainerTransactionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getContainerTransactionType_Methods(), this.getMethodType(), null, "methods", null, 1, -1, ContainerTransactionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getContainerTransactionType_TransAttribute(), this.getTransactionAttributeType(), "transAttribute", null, 1, 1, ContainerTransactionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getContainerTransactionType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ContainerTransactionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(dependsOnTypeEClass, DependsOnType.class, "DependsOnType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getDependsOnType_EjbName(), theJavaeePackage.getEJBLink(), "ejbName", null, 1, -1, DependsOnType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getDependsOnType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, DependsOnType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(ejbJarEClass, EJBJar.class, "EJBJar", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getEJBJar_ModuleName(), theXMLTypePackage.getToken(), "moduleName", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEJBJar_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEJBJar_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEJBJar_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEJBJar_EnterpriseBeans(), this.getEnterpriseBeans(), null, "enterpriseBeans", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEJBJar_Interceptors(), this.getInterceptorsType(), null, "interceptors", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEJBJar_Relationships(), this.getRelationships(), null, "relationships", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEJBJar_AssemblyDescriptor(), this.getAssemblyDescriptor(), null, "assemblyDescriptor", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEJBJar_EjbClientJar(), theJavaeePackage.getPathType(), "ejbClientJar", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEJBJar_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEJBJar_MetadataComplete(), theXMLTypePackage.getBoolean(), "metadataComplete", null, 0, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEJBJar_Version(), theJavaeePackage.getDeweyVersionType(), "version", "3.1", 1, 1, EJBJar.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+ initEClass(ejbJarDeploymentDescriptorEClass, EJBJarDeploymentDescriptor.class, "EJBJarDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getEJBJarDeploymentDescriptor_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEJBJarDeploymentDescriptor_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEJBJarDeploymentDescriptor_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEJBJarDeploymentDescriptor_EjbJar(), this.getEJBJar(), null, "ejbJar", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(ejbRelationEClass, EJBRelation.class, "EJBRelation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getEJBRelation_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEJBRelation_EjbRelationName(), theXMLTypePackage.getToken(), "ejbRelationName", null, 0, 1, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEJBRelation_EjbRelationshipRoles(), this.getEJBRelationshipRole(), null, "ejbRelationshipRoles", null, 2, 2, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEJBRelation_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EJBRelation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(ejbRelationshipRoleEClass, EJBRelationshipRole.class, "EJBRelationshipRole", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getEJBRelationshipRole_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEJBRelationshipRole_EjbRelationshipRoleName(), theXMLTypePackage.getToken(), "ejbRelationshipRoleName", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEJBRelationshipRole_Multiplicity(), this.getMultiplicityType(), "multiplicity", null, 1, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEJBRelationshipRole_CascadeDelete(), theJavaeePackage.getEmptyType(), null, "cascadeDelete", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEJBRelationshipRole_RelationshipRoleSource(), this.getRelationshipRoleSourceType(), null, "relationshipRoleSource", null, 1, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEJBRelationshipRole_CmrField(), this.getCMRField(), null, "cmrField", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEJBRelationshipRole_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EJBRelationshipRole.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(enterpriseBeansEClass, EnterpriseBeans.class, "EnterpriseBeans", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getEnterpriseBeans_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, EnterpriseBeans.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEnterpriseBeans_SessionBeans(), this.getSessionBean(), null, "sessionBeans", null, 0, -1, EnterpriseBeans.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEnterpriseBeans_EntityBeans(), this.getEntityBean(), null, "entityBeans", null, 0, -1, EnterpriseBeans.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEnterpriseBeans_MessageDrivenBeans(), this.getMessageDrivenBean(), null, "messageDrivenBeans", null, 0, -1, EnterpriseBeans.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEnterpriseBeans_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EnterpriseBeans.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(entityBeanEClass, EntityBean.class, "EntityBean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getEntityBean_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEntityBean_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEntityBean_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEntityBean_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEntityBean_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEntityBean_Home(), theJavaeePackage.getHome(), "home", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEntityBean_Remote(), theJavaeePackage.getRemote(), "remote", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEntityBean_LocalHome(), theJavaeePackage.getLocalHome(), "localHome", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEntityBean_Local(), theJavaeePackage.getLocal(), "local", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEntityBean_EjbClass(), this.getEjbClassType(), "ejbClass", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEntityBean_PersistenceType(), this.getPersistenceType(), "persistenceType", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEntityBean_PrimKeyClass(), theJavaeePackage.getFullyQualifiedClassType(), "primKeyClass", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEntityBean_Reentrant(), theJavaeePackage.getTrueFalseType(), "reentrant", null, 1, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEntityBean_CmpVersion(), this.getCmpVersionType(), "cmpVersion", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEntityBean_AbstractSchemaName(), theJavaeePackage.getJavaIdentifier(), "abstractSchemaName", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEntityBean_CmpFields(), this.getCMPField(), null, "cmpFields", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEntityBean_PrimkeyField(), theXMLTypePackage.getToken(), "primkeyField", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEntityBean_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEntityBean_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEntityBean_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEntityBean_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEntityBean_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEntityBean_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEntityBean_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEntityBean_PersistenceContextRefs(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEntityBean_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEntityBean_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEntityBean_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEntityBean_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEntityBean_SecurityRoleRefs(), theJavaeePackage.getSecurityRoleRef(), null, "securityRoleRefs", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEntityBean_SecurityIdentity(), this.getSecurityIdentityType(), null, "securityIdentity", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getEntityBean_Queries(), this.getQuery(), null, "queries", null, 0, -1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getEntityBean_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, EntityBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(excludeListEClass, ExcludeList.class, "ExcludeList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getExcludeList_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, ExcludeList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getExcludeList_Methods(), this.getMethodType(), null, "methods", null, 1, -1, ExcludeList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getExcludeList_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ExcludeList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(initMethodTypeEClass, InitMethodType.class, "InitMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getInitMethodType_CreateMethod(), this.getNamedMethodType(), null, "createMethod", null, 1, 1, InitMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getInitMethodType_BeanMethod(), this.getNamedMethodType(), null, "beanMethod", null, 1, 1, InitMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getInitMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InitMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(interceptorBindingTypeEClass, InterceptorBindingType.class, "InterceptorBindingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getInterceptorBindingType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getInterceptorBindingType_EjbName(), theXMLTypePackage.getToken(), "ejbName", null, 1, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getInterceptorBindingType_InterceptorClasses(), theJavaeePackage.getFullyQualifiedClassType(), "interceptorClasses", null, 0, -1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getInterceptorBindingType_InterceptorOrder(), this.getInterceptorOrderType(), null, "interceptorOrder", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getInterceptorBindingType_ExcludeDefaultInterceptors(), theJavaeePackage.getTrueFalseType(), "excludeDefaultInterceptors", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getInterceptorBindingType_ExcludeClassInterceptors(), theJavaeePackage.getTrueFalseType(), "excludeClassInterceptors", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getInterceptorBindingType_Method(), this.getNamedMethodType(), null, "method", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getInterceptorBindingType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InterceptorBindingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(interceptorOrderTypeEClass, InterceptorOrderType.class, "InterceptorOrderType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getInterceptorOrderType_InterceptorClasses(), theJavaeePackage.getFullyQualifiedClassType(), "interceptorClasses", null, 1, -1, InterceptorOrderType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getInterceptorOrderType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InterceptorOrderType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(interceptorsTypeEClass, InterceptorsType.class, "InterceptorsType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getInterceptorsType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, InterceptorsType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getInterceptorsType_Interceptors(), this.getInterceptorType(), null, "interceptors", null, 1, -1, InterceptorsType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getInterceptorsType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InterceptorsType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(interceptorTypeEClass, InterceptorType.class, "InterceptorType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getInterceptorType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getInterceptorType_InterceptorClass(), theJavaeePackage.getFullyQualifiedClassType(), "interceptorClass", null, 1, 1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getInterceptorType_AroundInvokes(), this.getAroundInvokeType(), null, "aroundInvokes", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getInterceptorType_AroundTimeouts(), this.getAroundTimeoutType(), null, "aroundTimeouts", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getInterceptorType_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getInterceptorType_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getInterceptorType_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getInterceptorType_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getInterceptorType_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getInterceptorType_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getInterceptorType_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getInterceptorType_PersistenceContextRefs(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getInterceptorType_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getInterceptorType_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getInterceptorType_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getInterceptorType_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getInterceptorType_PostActivates(), theJavaeePackage.getLifecycleCallback(), null, "postActivates", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getInterceptorType_PrePassivates(), theJavaeePackage.getLifecycleCallback(), null, "prePassivates", null, 0, -1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getInterceptorType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InterceptorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(messageDrivenBeanEClass, MessageDrivenBean.class, "MessageDrivenBean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageDrivenBean_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageDrivenBean_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageDrivenBean_EjbClass(), this.getEjbClassType(), "ejbClass", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageDrivenBean_MessagingType(), theJavaeePackage.getFullyQualifiedClassType(), "messagingType", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_TimeoutMethod(), this.getNamedMethodType(), null, "timeoutMethod", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_Timer(), this.getTimerType(), null, "timer", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageDrivenBean_TransactionType(), this.getTransactionType(), "transactionType", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageDrivenBean_MessageDestinationType(), theJavaeePackage.getMessageDestinationTypeType(), "messageDestinationType", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageDrivenBean_MessageDestinationLink(), theJavaeePackage.getMessageDestinationLink(), "messageDestinationLink", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_ActivationConfig(), this.getActivationConfig(), null, "activationConfig", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_AroundInvokes(), this.getAroundInvokeType(), null, "aroundInvokes", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_AroundTimeouts(), this.getAroundTimeoutType(), null, "aroundTimeouts", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_PersistenceContextRefs(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_SecurityRoleRef(), theJavaeePackage.getSecurityRoleRef(), null, "securityRoleRef", null, 0, -1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageDrivenBean_SecurityIdentity(), this.getSecurityIdentityType(), null, "securityIdentity", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageDrivenBean_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageDrivenBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(methodParamsEClass, MethodParams.class, "MethodParams", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getMethodParams_MethodParams(), theJavaeePackage.getJavaType(), "methodParams", null, 0, -1, MethodParams.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMethodParams_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MethodParams.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(methodPermissionEClass, MethodPermission.class, "MethodPermission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getMethodPermission_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMethodPermission_RoleNames(), theJavaeePackage.getRoleName(), "roleNames", null, 0, -1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMethodPermission_Unchecked(), theJavaeePackage.getEmptyType(), null, "unchecked", null, 0, 1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMethodPermission_Methods(), this.getMethodType(), null, "methods", null, 1, -1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMethodPermission_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MethodPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(methodTypeEClass, MethodType.class, "MethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getMethodType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMethodType_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMethodType_MethodIntf(), this.getMethodInterfaceType(), "methodIntf", null, 0, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMethodType_MethodName(), this.getMethodNameType(), "methodName", null, 1, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMethodType_MethodParams(), this.getMethodParams(), null, "methodParams", null, 0, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(namedMethodTypeEClass, NamedMethodType.class, "NamedMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getNamedMethodType_MethodName(), theXMLTypePackage.getToken(), "methodName", null, 1, 1, NamedMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getNamedMethodType_MethodParams(), this.getMethodParams(), null, "methodParams", null, 0, 1, NamedMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getNamedMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, NamedMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(queryEClass, Query.class, "Query", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getQuery_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getQuery_QueryMethod(), this.getQueryMethod(), null, "queryMethod", null, 1, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getQuery_ResultTypeMapping(), this.getResultTypeMappingType(), "resultTypeMapping", null, 0, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getQuery_EjbQl(), theXMLTypePackage.getString(), "ejbQl", null, 1, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getQuery_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(queryMethodEClass, QueryMethod.class, "QueryMethod", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getQueryMethod_MethodName(), this.getMethodNameType(), "methodName", null, 1, 1, QueryMethod.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getQueryMethod_MethodParams(), this.getMethodParams(), null, "methodParams", null, 1, 1, QueryMethod.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getQueryMethod_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, QueryMethod.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(relationshipRoleSourceTypeEClass, RelationshipRoleSourceType.class, "RelationshipRoleSourceType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getRelationshipRoleSourceType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, RelationshipRoleSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getRelationshipRoleSourceType_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, RelationshipRoleSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getRelationshipRoleSourceType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, RelationshipRoleSourceType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(relationshipsEClass, Relationships.class, "Relationships", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getRelationships_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Relationships.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getRelationships_EjbRelations(), this.getEJBRelation(), null, "ejbRelations", null, 1, -1, Relationships.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getRelationships_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Relationships.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(removeMethodTypeEClass, RemoveMethodType.class, "RemoveMethodType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getRemoveMethodType_BeanMethod(), this.getNamedMethodType(), null, "beanMethod", null, 1, 1, RemoveMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getRemoveMethodType_RetainIfException(), theJavaeePackage.getTrueFalseType(), "retainIfException", null, 0, 1, RemoveMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getRemoveMethodType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, RemoveMethodType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(securityIdentityTypeEClass, SecurityIdentityType.class, "SecurityIdentityType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getSecurityIdentityType_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, SecurityIdentityType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSecurityIdentityType_UseCallerIdentity(), theJavaeePackage.getEmptyType(), null, "useCallerIdentity", null, 0, 1, SecurityIdentityType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSecurityIdentityType_RunAs(), theJavaeePackage.getRunAs(), null, "runAs", null, 0, 1, SecurityIdentityType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSecurityIdentityType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SecurityIdentityType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(sessionBeanEClass, SessionBean.class, "SessionBean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getSessionBean_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSessionBean_EjbName(), this.getEjbNameType(), "ejbName", null, 1, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSessionBean_MappedName(), theXMLTypePackage.getString(), "mappedName", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSessionBean_Home(), theJavaeePackage.getHome(), "home", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSessionBean_Remote(), theJavaeePackage.getRemote(), "remote", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSessionBean_LocalHome(), theJavaeePackage.getLocalHome(), "localHome", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSessionBean_Local(), theJavaeePackage.getLocal(), "local", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSessionBean_BusinessLocals(), theJavaeePackage.getFullyQualifiedClassType(), "businessLocals", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSessionBean_BusinessRemotes(), theJavaeePackage.getFullyQualifiedClassType(), "businessRemotes", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_LocalBean(), theJavaeePackage.getEmptyType(), null, "localBean", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSessionBean_ServiceEndpoint(), theJavaeePackage.getFullyQualifiedClassType(), "serviceEndpoint", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSessionBean_EjbClass(), this.getEjbClassType(), "ejbClass", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSessionBean_SessionType(), this.getSessionType(), "sessionType", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_StatefulTimeout(), this.getStatefulTimeoutType(), null, "statefulTimeout", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_TimeoutMethod(), this.getNamedMethodType(), null, "timeoutMethod", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_Timer(), this.getTimerType(), null, "timer", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSessionBean_InitOnStartup(), theJavaeePackage.getTrueFalseType(), "initOnStartup", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSessionBean_ConcurrencyManagementType(), this.getConcurrencyManagementTypeType(), "concurrencyManagementType", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_ConcurrentMethod(), this.getConcurrentMethodType(), null, "concurrentMethod", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_DependsOn(), this.getDependsOnType(), null, "dependsOn", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_InitMethods(), this.getInitMethodType(), null, "initMethods", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_RemoveMethods(), this.getRemoveMethodType(), null, "removeMethods", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_AsyncMethod(), this.getAsyncMethodType(), null, "asyncMethod", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSessionBean_TransactionType(), this.getTransactionType(), "transactionType", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_AfterBeginMethod(), this.getNamedMethodType(), null, "afterBeginMethod", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_BeforeCompletionMethod(), this.getNamedMethodType(), null, "beforeCompletionMethod", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_AfterCompletionMethod(), this.getNamedMethodType(), null, "afterCompletionMethod", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_AroundInvokes(), this.getAroundInvokeType(), null, "aroundInvokes", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_AroundTimeouts(), this.getAroundTimeoutType(), null, "aroundTimeouts", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_PersistenceContextRefs(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_PostActivates(), theJavaeePackage.getLifecycleCallback(), null, "postActivates", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_PrePassivates(), theJavaeePackage.getLifecycleCallback(), null, "prePassivates", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_SecurityRoleRefs(), theJavaeePackage.getSecurityRoleRef(), null, "securityRoleRefs", null, 0, -1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionBean_SecurityIdentities(), this.getSecurityIdentityType(), null, "securityIdentities", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSessionBean_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SessionBean.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(statefulTimeoutTypeEClass, StatefulTimeoutType.class, "StatefulTimeoutType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getStatefulTimeoutType_Timeout(), theXMLTypePackage.getInteger(), "timeout", null, 1, 1, StatefulTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getStatefulTimeoutType_Unit(), this.getTimeUnitTypeType(), "unit", null, 1, 1, StatefulTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getStatefulTimeoutType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, StatefulTimeoutType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(timerScheduleTypeEClass, TimerScheduleType.class, "TimerScheduleType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getTimerScheduleType_Second(), theXMLTypePackage.getToken(), "second", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getTimerScheduleType_Minute(), theXMLTypePackage.getToken(), "minute", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getTimerScheduleType_Hour(), theXMLTypePackage.getToken(), "hour", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getTimerScheduleType_DayOfMonth(), theXMLTypePackage.getToken(), "dayOfMonth", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getTimerScheduleType_Month(), theXMLTypePackage.getToken(), "month", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getTimerScheduleType_DayOfWeek(), theXMLTypePackage.getToken(), "dayOfWeek", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getTimerScheduleType_Year(), theXMLTypePackage.getToken(), "year", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getTimerScheduleType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, TimerScheduleType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(timerTypeEClass, TimerType.class, "TimerType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getTimerType_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, -1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getTimerType_Schedule(), this.getTimerScheduleType(), null, "schedule", null, 1, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getTimerType_Start(), theXMLTypePackage.getDateTime(), "start", null, 0, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getTimerType_End(), theXMLTypePackage.getDateTime(), "end", null, 0, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getTimerType_TimeoutMethod(), this.getNamedMethodType(), null, "timeoutMethod", null, 1, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getTimerType_Persistent(), theJavaeePackage.getTrueFalseType(), "persistent", null, 0, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getTimerType_Timezone(), theXMLTypePackage.getToken(), "timezone", null, 0, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getTimerType_Info(), theXMLTypePackage.getToken(), "info", null, 0, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getTimerType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, TimerType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ // Initialize enums and add enum literals
+ initEEnum(cmpVersionTypeEEnum, CmpVersionType.class, "CmpVersionType"); //$NON-NLS-1$
+ addEEnumLiteral(cmpVersionTypeEEnum, CmpVersionType._1X_LITERAL);
+ addEEnumLiteral(cmpVersionTypeEEnum, CmpVersionType._2X_LITERAL);
+
+ initEEnum(cmrFieldTypeEEnum, CMRFieldType.class, "CMRFieldType"); //$NON-NLS-1$
+ addEEnumLiteral(cmrFieldTypeEEnum, CMRFieldType.JAVA_UTIL_COLLECTION_LITERAL);
+ addEEnumLiteral(cmrFieldTypeEEnum, CMRFieldType.JAVA_UTIL_SET_LITERAL);
+
+ initEEnum(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.class, "ConcurrencyManagementTypeType"); //$NON-NLS-1$
+ addEEnumLiteral(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.BEAN);
+ addEEnumLiteral(concurrencyManagementTypeTypeEEnum, ConcurrencyManagementTypeType.CONTAINER);
+
+ initEEnum(concurrentLockTypeTypeEEnum, ConcurrentLockTypeType.class, "ConcurrentLockTypeType"); //$NON-NLS-1$
+ addEEnumLiteral(concurrentLockTypeTypeEEnum, ConcurrentLockTypeType.READ);
+ addEEnumLiteral(concurrentLockTypeTypeEEnum, ConcurrentLockTypeType.WRITE);
+
+ initEEnum(methodInterfaceTypeEEnum, MethodInterfaceType.class, "MethodInterfaceType"); //$NON-NLS-1$
+ addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.HOME_LITERAL);
+ addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.REMOTE_LITERAL);
+ addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.LOCAL_HOME_LITERAL);
+ addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.LOCAL_LITERAL);
+ addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.SERVICE_ENDPOINT_LITERAL);
+ addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.TIMER_LITERAL);
+ addEEnumLiteral(methodInterfaceTypeEEnum, MethodInterfaceType.MESSAGE_ENDPOINT_LITERAL);
+
+ initEEnum(multiplicityTypeEEnum, MultiplicityType.class, "MultiplicityType"); //$NON-NLS-1$
+ addEEnumLiteral(multiplicityTypeEEnum, MultiplicityType.ONE_LITERAL);
+ addEEnumLiteral(multiplicityTypeEEnum, MultiplicityType.MANY_LITERAL);
+
+ initEEnum(persistenceTypeEEnum, PersistenceType.class, "PersistenceType"); //$NON-NLS-1$
+ addEEnumLiteral(persistenceTypeEEnum, PersistenceType.BEAN_LITERAL);
+ addEEnumLiteral(persistenceTypeEEnum, PersistenceType.CONTAINER_LITERAL);
+
+ initEEnum(resultTypeMappingTypeEEnum, ResultTypeMappingType.class, "ResultTypeMappingType"); //$NON-NLS-1$
+ addEEnumLiteral(resultTypeMappingTypeEEnum, ResultTypeMappingType.LOCAL_LITERAL);
+ addEEnumLiteral(resultTypeMappingTypeEEnum, ResultTypeMappingType.REMOTE_LITERAL);
+
+ initEEnum(sessionTypeEEnum, SessionType.class, "SessionType"); //$NON-NLS-1$
+ addEEnumLiteral(sessionTypeEEnum, SessionType.SINGLETON_LITERAL);
+ addEEnumLiteral(sessionTypeEEnum, SessionType.STATEFUL_LITERAL);
+ addEEnumLiteral(sessionTypeEEnum, SessionType.STATELESS_LITERAL);
+
+ initEEnum(timeUnitTypeTypeEEnum, TimeUnitTypeType.class, "TimeUnitTypeType"); //$NON-NLS-1$
+ addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.DAYS);
+ addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.HOURS);
+ addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.MINUTES);
+ addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.SECONDS);
+ addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.MILLISECONDS);
+ addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.MICROSECONDS);
+ addEEnumLiteral(timeUnitTypeTypeEEnum, TimeUnitTypeType.NANOSECONDS);
+
+ 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);
+
+ // Initialize data types
+ initEDataType(cmpVersionTypeObjectEDataType, CmpVersionType.class, "CmpVersionTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(cmrFieldTypeObjectEDataType, CMRFieldType.class, "CMRFieldTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(concurrencyManagementTypeTypeObjectEDataType, ConcurrencyManagementTypeType.class, "ConcurrencyManagementTypeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(concurrentLockTypeTypeObjectEDataType, ConcurrentLockTypeType.class, "ConcurrentLockTypeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(ejbClassTypeEDataType, String.class, "EjbClassType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(ejbNameTypeEDataType, String.class, "EjbNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(methodInterfaceTypeObjectEDataType, MethodInterfaceType.class, "MethodInterfaceTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(methodNameTypeEDataType, String.class, "MethodNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(multiplicityTypeObjectEDataType, MultiplicityType.class, "MultiplicityTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(persistenceTypeObjectEDataType, PersistenceType.class, "PersistenceTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(resultTypeMappingTypeObjectEDataType, ResultTypeMappingType.class, "ResultTypeMappingTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(sessionTypeObjectEDataType, SessionType.class, "SessionTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(timeUnitTypeTypeObjectEDataType, TimeUnitTypeType.class, "TimeUnitTypeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(transactionAttributeTypeObjectEDataType, TransactionAttributeType.class, "TransactionAttributeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(transactionTypeObjectEDataType, TransactionType.class, "TransactionTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ // Create resource
+ createResource(eNS_URI);
+
+ // Create annotations
+ // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
+ createExtendedMetaDataAnnotations();
+ }finally{
+ if( hasLock )
+ J2EEInit.releaseInitializePackageContentsLock();
+ }
}
/**
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java
index 1b7979a..a966252 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java
@@ -23,22 +23,11 @@
import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl;
-
-import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
-
-import org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationclientPackageImpl;
-
-import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
-
-import org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl;
+import org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin;
+import org.eclipse.jst.j2ee.internal.J2EEInit;
import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-import org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
import org.eclipse.jst.javaee.jca.ActivationSpec;
import org.eclipse.jst.javaee.jca.AdminObject;
import org.eclipse.jst.javaee.jca.AuthenticationMechanism;
@@ -61,22 +50,6 @@
import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
-import org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl;
-
-import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
-
-import org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-
-import org.eclipse.jst.javaee.webapp.internal.impl.WebappPackageImpl;
-
-import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
-
-import org.eclipse.jst.javaee.webfragment.internal.impl.WebfragmentPackageImpl;
-
-import org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage;
-
/**
* <!-- begin-user-doc -->
* An implementation of the model <b>Package</b>.
@@ -262,7 +235,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private static boolean isInited = false;
+ private volatile static boolean isInited = false;
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
@@ -288,37 +261,11 @@
XMLNamespacePackage.eINSTANCE.eClass();
XMLTypePackage.eINSTANCE.eClass();
- // Obtain or create and register interdependencies
- ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
- JavaeePackageImpl theJavaeePackage = (JavaeePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) instanceof JavaeePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) : JavaeePackage.eINSTANCE);
- ApplicationclientPackageImpl theApplicationclientPackage = (ApplicationclientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) instanceof ApplicationclientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) : ApplicationclientPackage.eINSTANCE);
- EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
- JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
- WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) : WebPackage.eINSTANCE);
- WebappPackageImpl theWebappPackage = (WebappPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) instanceof WebappPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) : WebappPackage.eINSTANCE);
- WebfragmentPackageImpl theWebfragmentPackage = (WebfragmentPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) instanceof WebfragmentPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) : WebfragmentPackage.eINSTANCE);
-
// Create package meta-data objects
theJcaPackage.createPackageContents();
- theApplicationPackage.createPackageContents();
- theJavaeePackage.createPackageContents();
- theApplicationclientPackage.createPackageContents();
- theEjbPackage.createPackageContents();
- theJspPackage.createPackageContents();
- theWebPackage.createPackageContents();
- theWebappPackage.createPackageContents();
- theWebfragmentPackage.createPackageContents();
// Initialize created meta-data
theJcaPackage.initializePackageContents();
- theApplicationPackage.initializePackageContents();
- theJavaeePackage.initializePackageContents();
- theApplicationclientPackage.initializePackageContents();
- theEjbPackage.initializePackageContents();
- theJspPackage.initializePackageContents();
- theWebPackage.initializePackageContents();
- theWebappPackage.initializePackageContents();
- theWebfragmentPackage.initializePackageContents();
// Mark meta-data to indicate it can't be changed
theJcaPackage.freeze();
@@ -326,6 +273,8 @@
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(JcaPackage.eNS_URI, theJcaPackage);
+
+ J2EEInit.initEMFModels();
return theJcaPackage;
}
@@ -1348,145 +1297,157 @@
// Set bounds for type parameters
- // Add supertypes to classes
-
- // Initialize classes and features; add operations and parameters
- initEClass(activationSpecEClass, ActivationSpec.class, "ActivationSpec", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getActivationSpec_ActivationspecClass(), theJavaeePackage.getFullyQualifiedClassType(), "activationspecClass", null, 1, 1, ActivationSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getActivationSpec_RequiredConfigProperty(), this.getRequiredConfigProperty(), null, "requiredConfigProperty", null, 0, -1, ActivationSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getActivationSpec_ConfigProperty(), this.getConfigProperty(), null, "configProperty", null, 0, -1, ActivationSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getActivationSpec_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ActivationSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(adminObjectEClass, AdminObject.class, "AdminObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getAdminObject_AdminobjectInterface(), theJavaeePackage.getFullyQualifiedClassType(), "adminobjectInterface", null, 1, 1, AdminObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getAdminObject_AdminobjectClass(), theJavaeePackage.getFullyQualifiedClassType(), "adminobjectClass", null, 1, 1, AdminObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getAdminObject_ConfigProperty(), this.getConfigProperty(), null, "configProperty", null, 0, -1, AdminObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getAdminObject_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AdminObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(authenticationMechanismEClass, AuthenticationMechanism.class, "AuthenticationMechanism", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getAuthenticationMechanism_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, -1, AuthenticationMechanism.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getAuthenticationMechanism_AuthenticationMechanismType(), theXMLTypePackage.getString(), "authenticationMechanismType", null, 1, 1, AuthenticationMechanism.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getAuthenticationMechanism_CredentialInterface(), this.getCredentialInterfaceType(), "credentialInterface", null, 1, 1, AuthenticationMechanism.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getAuthenticationMechanism_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AuthenticationMechanism.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(configPropertyEClass, ConfigProperty.class, "ConfigProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getConfigProperty_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, -1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConfigProperty_ConfigPropertyName(), this.getConfigPropertyNameType(), "configPropertyName", null, 1, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConfigProperty_ConfigPropertyType(), this.getConfigPropertyTypeType(), "configPropertyType", null, 1, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConfigProperty_ConfigPropertyValue(), theXMLTypePackage.getString(), "configPropertyValue", null, 0, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConfigProperty_ConfigPropertyIgnore(), theJavaeePackage.getTrueFalseType(), "configPropertyIgnore", null, 0, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConfigProperty_ConfigPropertySupportsDynamicUpdates(), theJavaeePackage.getTrueFalseType(), "configPropertySupportsDynamicUpdates", null, 0, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConfigProperty_ConfigPropertyConfidential(), theJavaeePackage.getTrueFalseType(), "configPropertyConfidential", null, 0, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConfigProperty_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(connectionDefinitionEClass, ConnectionDefinition.class, "ConnectionDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getConnectionDefinition_ManagedconnectionfactoryClass(), theJavaeePackage.getFullyQualifiedClassType(), "managedconnectionfactoryClass", null, 1, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getConnectionDefinition_ConfigProperty(), this.getConfigProperty(), null, "configProperty", null, 0, -1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConnectionDefinition_ConnectionfactoryInterface(), theJavaeePackage.getFullyQualifiedClassType(), "connectionfactoryInterface", null, 1, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConnectionDefinition_ConnectionfactoryImplClass(), theJavaeePackage.getFullyQualifiedClassType(), "connectionfactoryImplClass", null, 1, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConnectionDefinition_ConnectionInterface(), theJavaeePackage.getFullyQualifiedClassType(), "connectionInterface", null, 1, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConnectionDefinition_ConnectionImplClass(), theJavaeePackage.getFullyQualifiedClassType(), "connectionImplClass", null, 1, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConnectionDefinition_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(connectorEClass, Connector.class, "Connector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getConnector_ModuleName(), theXMLTypePackage.getString(), "moduleName", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getConnector_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getConnector_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getConnector_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConnector_VendorName(), theXMLTypePackage.getString(), "vendorName", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConnector_EisType(), theXMLTypePackage.getString(), "eisType", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConnector_ResourceadapterVersion(), theXMLTypePackage.getString(), "resourceadapterVersion", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getConnector_License(), this.getLicense(), null, "license", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getConnector_Resourceadapter(), this.getResourceAdapter(), null, "resourceadapter", null, 1, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConnector_RequiredWorkContext(), theJavaeePackage.getFullyQualifiedClassType(), "requiredWorkContext", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConnector_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConnector_MetadataComplete(), theXMLTypePackage.getBoolean(), "metadataComplete", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getConnector_Version(), theJavaeePackage.getDeweyVersionType(), "version", "1.6", 1, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
- initEClass(connectorDeploymentDescriptorEClass, ConnectorDeploymentDescriptor.class, "ConnectorDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getConnectorDeploymentDescriptor_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getConnectorDeploymentDescriptor_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getConnectorDeploymentDescriptor_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getConnectorDeploymentDescriptor_Connector(), this.getConnector(), null, "connector", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(inboundResourceAdapterEClass, InboundResourceAdapter.class, "InboundResourceAdapter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getInboundResourceAdapter_Messageadapter(), this.getMessageAdapter(), null, "messageadapter", null, 0, 1, InboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getInboundResourceAdapter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(licenseEClass, License.class, "License", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getLicense_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, -1, License.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getLicense_LicenseRequired(), theJavaeePackage.getTrueFalseType(), "licenseRequired", null, 1, 1, License.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getLicense_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, License.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(messageAdapterEClass, MessageAdapter.class, "MessageAdapter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getMessageAdapter_Messagelistener(), this.getMessageListener(), null, "messagelistener", null, 1, -1, MessageAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageAdapter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(messageListenerEClass, MessageListener.class, "MessageListener", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getMessageListener_MessagelistenerType(), theJavaeePackage.getFullyQualifiedClassType(), "messagelistenerType", null, 1, 1, MessageListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getMessageListener_Activationspec(), this.getActivationSpec(), null, "activationspec", null, 1, 1, MessageListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMessageListener_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(outboundResourceAdapterEClass, OutboundResourceAdapter.class, "OutboundResourceAdapter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getOutboundResourceAdapter_ConnectionDefinition(), this.getConnectionDefinition(), null, "connectionDefinition", null, 0, -1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getOutboundResourceAdapter_TransactionSupport(), this.getTransactionSupportType(), "transactionSupport", null, 0, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getOutboundResourceAdapter_AuthenticationMechanism(), this.getAuthenticationMechanism(), null, "authenticationMechanism", null, 0, -1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getOutboundResourceAdapter_ReauthenticationSupport(), theJavaeePackage.getTrueFalseType(), "reauthenticationSupport", null, 0, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getOutboundResourceAdapter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(requiredConfigPropertyEClass, RequiredConfigProperty.class, "RequiredConfigProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getRequiredConfigProperty_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, -1, RequiredConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getRequiredConfigProperty_ConfigPropertyName(), this.getConfigPropertyNameType(), "configPropertyName", null, 1, 1, RequiredConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getRequiredConfigProperty_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, RequiredConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(resourceAdapterEClass, ResourceAdapter.class, "ResourceAdapter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getResourceAdapter_ResourceadapterClass(), theJavaeePackage.getFullyQualifiedClassType(), "resourceadapterClass", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getResourceAdapter_ConfigProperty(), this.getConfigProperty(), null, "configProperty", null, 0, -1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getResourceAdapter_OutboundResourceadapter(), this.getOutboundResourceAdapter(), null, "outboundResourceadapter", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getResourceAdapter_InboundResourceadapter(), this.getInboundResourceAdapter(), null, "inboundResourceadapter", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getResourceAdapter_Adminobject(), this.getAdminObject(), null, "adminobject", null, 0, -1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getResourceAdapter_SecurityPermission(), this.getSecurityPermission(), null, "securityPermission", null, 0, -1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getResourceAdapter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(securityPermissionEClass, SecurityPermission.class, "SecurityPermission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getSecurityPermission_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, -1, SecurityPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSecurityPermission_SecurityPermissionSpec(), theXMLTypePackage.getString(), "securityPermissionSpec", null, 1, 1, SecurityPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSecurityPermission_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SecurityPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- // Initialize enums and add enum literals
- initEEnum(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.class, "ConfigPropertyTypeType"); //$NON-NLS-1$
- addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_BOOLEAN);
- addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_STRING);
- addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_INTEGER);
- addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_DOUBLE);
- addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_BYTE);
- addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_SHORT);
- addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_LONG);
- addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_FLOAT);
- addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_CHARACTER);
-
- initEEnum(credentialInterfaceTypeEEnum, CredentialInterfaceType.class, "CredentialInterfaceType"); //$NON-NLS-1$
- addEEnumLiteral(credentialInterfaceTypeEEnum, CredentialInterfaceType.JAVAX_RESOURCE_SPI_SECURITY_PASSWORD_CREDENTIAL);
- addEEnumLiteral(credentialInterfaceTypeEEnum, CredentialInterfaceType.ORG_IETF_JGSS_GSS_CREDENTIAL);
- addEEnumLiteral(credentialInterfaceTypeEEnum, CredentialInterfaceType.JAVAX_RESOURCE_SPI_SECURITY_GENERIC_CREDENTIAL);
-
- initEEnum(transactionSupportTypeEEnum, TransactionSupportType.class, "TransactionSupportType"); //$NON-NLS-1$
- addEEnumLiteral(transactionSupportTypeEEnum, TransactionSupportType.NO_TRANSACTION);
- addEEnumLiteral(transactionSupportTypeEEnum, TransactionSupportType.LOCAL_TRANSACTION);
- addEEnumLiteral(transactionSupportTypeEEnum, TransactionSupportType.XA_TRANSACTION);
-
- // Initialize data types
- initEDataType(configPropertyNameTypeEDataType, String.class, "ConfigPropertyNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(configPropertyTypeTypeObjectEDataType, ConfigPropertyTypeType.class, "ConfigPropertyTypeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(credentialInterfaceTypeObjectEDataType, CredentialInterfaceType.class, "CredentialInterfaceTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(transactionSupportTypeObjectEDataType, TransactionSupportType.class, "TransactionSupportTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- // Create resource
- createResource(eNS_URI);
-
- // Create annotations
- // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
- createExtendedMetaDataAnnotations();
+ boolean hasLock = false;
+ try {
+ hasLock = J2EEInit.aquireInitializePackageContentsLock();
+ } catch (InterruptedException e) {
+ J2EECorePlugin.logError(e);
+ }
+
+ try{
+ // Add supertypes to classes
+
+ // Initialize classes and features; add operations and parameters
+ initEClass(activationSpecEClass, ActivationSpec.class, "ActivationSpec", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getActivationSpec_ActivationspecClass(), theJavaeePackage.getFullyQualifiedClassType(), "activationspecClass", null, 1, 1, ActivationSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getActivationSpec_RequiredConfigProperty(), this.getRequiredConfigProperty(), null, "requiredConfigProperty", null, 0, -1, ActivationSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getActivationSpec_ConfigProperty(), this.getConfigProperty(), null, "configProperty", null, 0, -1, ActivationSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getActivationSpec_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ActivationSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(adminObjectEClass, AdminObject.class, "AdminObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getAdminObject_AdminobjectInterface(), theJavaeePackage.getFullyQualifiedClassType(), "adminobjectInterface", null, 1, 1, AdminObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getAdminObject_AdminobjectClass(), theJavaeePackage.getFullyQualifiedClassType(), "adminobjectClass", null, 1, 1, AdminObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getAdminObject_ConfigProperty(), this.getConfigProperty(), null, "configProperty", null, 0, -1, AdminObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getAdminObject_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AdminObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(authenticationMechanismEClass, AuthenticationMechanism.class, "AuthenticationMechanism", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getAuthenticationMechanism_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, -1, AuthenticationMechanism.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getAuthenticationMechanism_AuthenticationMechanismType(), theXMLTypePackage.getString(), "authenticationMechanismType", null, 1, 1, AuthenticationMechanism.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getAuthenticationMechanism_CredentialInterface(), this.getCredentialInterfaceType(), "credentialInterface", null, 1, 1, AuthenticationMechanism.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getAuthenticationMechanism_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AuthenticationMechanism.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(configPropertyEClass, ConfigProperty.class, "ConfigProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getConfigProperty_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, -1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConfigProperty_ConfigPropertyName(), this.getConfigPropertyNameType(), "configPropertyName", null, 1, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConfigProperty_ConfigPropertyType(), this.getConfigPropertyTypeType(), "configPropertyType", null, 1, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConfigProperty_ConfigPropertyValue(), theXMLTypePackage.getString(), "configPropertyValue", null, 0, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConfigProperty_ConfigPropertyIgnore(), theJavaeePackage.getTrueFalseType(), "configPropertyIgnore", null, 0, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConfigProperty_ConfigPropertySupportsDynamicUpdates(), theJavaeePackage.getTrueFalseType(), "configPropertySupportsDynamicUpdates", null, 0, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConfigProperty_ConfigPropertyConfidential(), theJavaeePackage.getTrueFalseType(), "configPropertyConfidential", null, 0, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConfigProperty_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(connectionDefinitionEClass, ConnectionDefinition.class, "ConnectionDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getConnectionDefinition_ManagedconnectionfactoryClass(), theJavaeePackage.getFullyQualifiedClassType(), "managedconnectionfactoryClass", null, 1, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getConnectionDefinition_ConfigProperty(), this.getConfigProperty(), null, "configProperty", null, 0, -1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConnectionDefinition_ConnectionfactoryInterface(), theJavaeePackage.getFullyQualifiedClassType(), "connectionfactoryInterface", null, 1, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConnectionDefinition_ConnectionfactoryImplClass(), theJavaeePackage.getFullyQualifiedClassType(), "connectionfactoryImplClass", null, 1, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConnectionDefinition_ConnectionInterface(), theJavaeePackage.getFullyQualifiedClassType(), "connectionInterface", null, 1, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConnectionDefinition_ConnectionImplClass(), theJavaeePackage.getFullyQualifiedClassType(), "connectionImplClass", null, 1, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConnectionDefinition_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ConnectionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(connectorEClass, Connector.class, "Connector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getConnector_ModuleName(), theXMLTypePackage.getString(), "moduleName", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getConnector_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getConnector_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getConnector_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConnector_VendorName(), theXMLTypePackage.getString(), "vendorName", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConnector_EisType(), theXMLTypePackage.getString(), "eisType", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConnector_ResourceadapterVersion(), theXMLTypePackage.getString(), "resourceadapterVersion", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getConnector_License(), this.getLicense(), null, "license", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getConnector_Resourceadapter(), this.getResourceAdapter(), null, "resourceadapter", null, 1, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConnector_RequiredWorkContext(), theJavaeePackage.getFullyQualifiedClassType(), "requiredWorkContext", null, 0, -1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConnector_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConnector_MetadataComplete(), theXMLTypePackage.getBoolean(), "metadataComplete", null, 0, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getConnector_Version(), theJavaeePackage.getDeweyVersionType(), "version", "1.6", 1, 1, Connector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+
+ initEClass(connectorDeploymentDescriptorEClass, ConnectorDeploymentDescriptor.class, "ConnectorDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getConnectorDeploymentDescriptor_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getConnectorDeploymentDescriptor_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getConnectorDeploymentDescriptor_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getConnectorDeploymentDescriptor_Connector(), this.getConnector(), null, "connector", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(inboundResourceAdapterEClass, InboundResourceAdapter.class, "InboundResourceAdapter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getInboundResourceAdapter_Messageadapter(), this.getMessageAdapter(), null, "messageadapter", null, 0, 1, InboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getInboundResourceAdapter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, InboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(licenseEClass, License.class, "License", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getLicense_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, -1, License.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getLicense_LicenseRequired(), theJavaeePackage.getTrueFalseType(), "licenseRequired", null, 1, 1, License.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getLicense_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, License.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(messageAdapterEClass, MessageAdapter.class, "MessageAdapter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getMessageAdapter_Messagelistener(), this.getMessageListener(), null, "messagelistener", null, 1, -1, MessageAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageAdapter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(messageListenerEClass, MessageListener.class, "MessageListener", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getMessageListener_MessagelistenerType(), theJavaeePackage.getFullyQualifiedClassType(), "messagelistenerType", null, 1, 1, MessageListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMessageListener_Activationspec(), this.getActivationSpec(), null, "activationspec", null, 1, 1, MessageListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMessageListener_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MessageListener.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(outboundResourceAdapterEClass, OutboundResourceAdapter.class, "OutboundResourceAdapter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getOutboundResourceAdapter_ConnectionDefinition(), this.getConnectionDefinition(), null, "connectionDefinition", null, 0, -1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getOutboundResourceAdapter_TransactionSupport(), this.getTransactionSupportType(), "transactionSupport", null, 0, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getOutboundResourceAdapter_AuthenticationMechanism(), this.getAuthenticationMechanism(), null, "authenticationMechanism", null, 0, -1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getOutboundResourceAdapter_ReauthenticationSupport(), theJavaeePackage.getTrueFalseType(), "reauthenticationSupport", null, 0, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getOutboundResourceAdapter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, OutboundResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(requiredConfigPropertyEClass, RequiredConfigProperty.class, "RequiredConfigProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getRequiredConfigProperty_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, -1, RequiredConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getRequiredConfigProperty_ConfigPropertyName(), this.getConfigPropertyNameType(), "configPropertyName", null, 1, 1, RequiredConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getRequiredConfigProperty_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, RequiredConfigProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(resourceAdapterEClass, ResourceAdapter.class, "ResourceAdapter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getResourceAdapter_ResourceadapterClass(), theJavaeePackage.getFullyQualifiedClassType(), "resourceadapterClass", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getResourceAdapter_ConfigProperty(), this.getConfigProperty(), null, "configProperty", null, 0, -1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getResourceAdapter_OutboundResourceadapter(), this.getOutboundResourceAdapter(), null, "outboundResourceadapter", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getResourceAdapter_InboundResourceadapter(), this.getInboundResourceAdapter(), null, "inboundResourceadapter", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getResourceAdapter_Adminobject(), this.getAdminObject(), null, "adminobject", null, 0, -1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getResourceAdapter_SecurityPermission(), this.getSecurityPermission(), null, "securityPermission", null, 0, -1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getResourceAdapter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ResourceAdapter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(securityPermissionEClass, SecurityPermission.class, "SecurityPermission", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getSecurityPermission_Description(), theJavaeePackage.getDescription(), null, "description", null, 0, -1, SecurityPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSecurityPermission_SecurityPermissionSpec(), theXMLTypePackage.getString(), "securityPermissionSpec", null, 1, 1, SecurityPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSecurityPermission_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SecurityPermission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ // Initialize enums and add enum literals
+ initEEnum(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.class, "ConfigPropertyTypeType"); //$NON-NLS-1$
+ addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_BOOLEAN);
+ addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_STRING);
+ addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_INTEGER);
+ addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_DOUBLE);
+ addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_BYTE);
+ addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_SHORT);
+ addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_LONG);
+ addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_FLOAT);
+ addEEnumLiteral(configPropertyTypeTypeEEnum, ConfigPropertyTypeType.JAVA_LANG_CHARACTER);
+
+ initEEnum(credentialInterfaceTypeEEnum, CredentialInterfaceType.class, "CredentialInterfaceType"); //$NON-NLS-1$
+ addEEnumLiteral(credentialInterfaceTypeEEnum, CredentialInterfaceType.JAVAX_RESOURCE_SPI_SECURITY_PASSWORD_CREDENTIAL);
+ addEEnumLiteral(credentialInterfaceTypeEEnum, CredentialInterfaceType.ORG_IETF_JGSS_GSS_CREDENTIAL);
+ addEEnumLiteral(credentialInterfaceTypeEEnum, CredentialInterfaceType.JAVAX_RESOURCE_SPI_SECURITY_GENERIC_CREDENTIAL);
+
+ initEEnum(transactionSupportTypeEEnum, TransactionSupportType.class, "TransactionSupportType"); //$NON-NLS-1$
+ addEEnumLiteral(transactionSupportTypeEEnum, TransactionSupportType.NO_TRANSACTION);
+ addEEnumLiteral(transactionSupportTypeEEnum, TransactionSupportType.LOCAL_TRANSACTION);
+ addEEnumLiteral(transactionSupportTypeEEnum, TransactionSupportType.XA_TRANSACTION);
+
+ // Initialize data types
+ initEDataType(configPropertyNameTypeEDataType, String.class, "ConfigPropertyNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(configPropertyTypeTypeObjectEDataType, ConfigPropertyTypeType.class, "ConfigPropertyTypeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(credentialInterfaceTypeObjectEDataType, CredentialInterfaceType.class, "CredentialInterfaceTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(transactionSupportTypeObjectEDataType, TransactionSupportType.class, "TransactionSupportTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ // Create resource
+ createResource(eNS_URI);
+
+ // Create annotations
+ // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
+ createExtendedMetaDataAnnotations();
+ }finally{
+ if( hasLock )
+ J2EEInit.releaseInitializePackageContentsLock();
+ }
}
/**
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPackageImpl.java
index db522e1..1c6d38b 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPackageImpl.java
@@ -22,24 +22,9 @@
import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl;
-
-import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
-
-import org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationclientPackageImpl;
-
-import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
-
-import org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl;
-
+import org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin;
+import org.eclipse.jst.j2ee.internal.J2EEInit;
import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-import org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-import org.eclipse.jst.javaee.jca.internal.impl.JcaPackageImpl;
-import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
import org.eclipse.jst.javaee.jsp.JspConfig;
import org.eclipse.jst.javaee.jsp.JspFactory;
import org.eclipse.jst.javaee.jsp.JspPropertyGroup;
@@ -47,14 +32,6 @@
import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
-import org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl;
-
-import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-import org.eclipse.jst.javaee.webapp.internal.impl.WebappPackageImpl;
-import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
-import org.eclipse.jst.javaee.webfragment.internal.impl.WebfragmentPackageImpl;
-import org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage;
-
/**
* <!-- begin-user-doc -->
* An implementation of the model <b>Package</b>.
@@ -114,7 +91,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private static boolean isInited = false;
+ private volatile static boolean isInited = false;
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
@@ -140,37 +117,11 @@
XMLNamespacePackage.eINSTANCE.eClass();
XMLTypePackage.eINSTANCE.eClass();
- // Obtain or create and register interdependencies
- ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
- JavaeePackageImpl theJavaeePackage = (JavaeePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) instanceof JavaeePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) : JavaeePackage.eINSTANCE);
- ApplicationclientPackageImpl theApplicationclientPackage = (ApplicationclientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) instanceof ApplicationclientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) : ApplicationclientPackage.eINSTANCE);
- JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
- EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
- WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) : WebPackage.eINSTANCE);
- WebappPackageImpl theWebappPackage = (WebappPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) instanceof WebappPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) : WebappPackage.eINSTANCE);
- WebfragmentPackageImpl theWebfragmentPackage = (WebfragmentPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) instanceof WebfragmentPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) : WebfragmentPackage.eINSTANCE);
-
// Create package meta-data objects
theJspPackage.createPackageContents();
- theApplicationPackage.createPackageContents();
- theJavaeePackage.createPackageContents();
- theApplicationclientPackage.createPackageContents();
- theJcaPackage.createPackageContents();
- theEjbPackage.createPackageContents();
- theWebPackage.createPackageContents();
- theWebappPackage.createPackageContents();
- theWebfragmentPackage.createPackageContents();
// Initialize created meta-data
theJspPackage.initializePackageContents();
- theApplicationPackage.initializePackageContents();
- theJavaeePackage.initializePackageContents();
- theApplicationclientPackage.initializePackageContents();
- theJcaPackage.initializePackageContents();
- theEjbPackage.initializePackageContents();
- theWebPackage.initializePackageContents();
- theWebappPackage.initializePackageContents();
- theWebfragmentPackage.initializePackageContents();
// Mark meta-data to indicate it can't be changed
theJspPackage.freeze();
@@ -178,6 +129,8 @@
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(JspPackage.eNS_URI, theJspPackage);
+
+ J2EEInit.initEMFModels();
return theJspPackage;
}
@@ -506,46 +459,58 @@
// Set bounds for type parameters
- // Add supertypes to classes
-
- // Initialize classes and features; add operations and parameters
- initEClass(jspConfigEClass, JspConfig.class, "JspConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getJspConfig_TagLibs(), this.getTagLib(), null, "tagLibs", null, 0, -1, JspConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getJspConfig_JspPropertyGroups(), this.getJspPropertyGroup(), null, "jspPropertyGroups", null, 0, -1, JspConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getJspConfig_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, JspConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(jspPropertyGroupEClass, JspPropertyGroup.class, "JspPropertyGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getJspPropertyGroup_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getJspPropertyGroup_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getJspPropertyGroup_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getJspPropertyGroup_UrlPatterns(), theJavaeePackage.getUrlPatternType(), null, "urlPatterns", null, 1, -1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getJspPropertyGroup_ElIgnored(), theJavaeePackage.getTrueFalseType(), "elIgnored", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getJspPropertyGroup_PageEncoding(), theXMLTypePackage.getToken(), "pageEncoding", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getJspPropertyGroup_ScriptingInvalid(), theJavaeePackage.getTrueFalseType(), "scriptingInvalid", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getJspPropertyGroup_IsXml(), theJavaeePackage.getTrueFalseType(), "isXml", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getJspPropertyGroup_IncludePreludes(), theJavaeePackage.getPathType(), "includePreludes", null, 0, -1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getJspPropertyGroup_IncludeCodas(), theJavaeePackage.getPathType(), "includeCodas", null, 0, -1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getJspPropertyGroup_DeferredSyntaxAllowedAsLiteral(), theJavaeePackage.getTrueFalseType(), "deferredSyntaxAllowedAsLiteral", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getJspPropertyGroup_TrimDirectiveWhitespaces(), theJavaeePackage.getTrueFalseType(), "trimDirectiveWhitespaces", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getJspPropertyGroup_DefaultContentType(), theXMLTypePackage.getToken(), "defaultContentType", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getJspPropertyGroup_Buffer(), theXMLTypePackage.getToken(), "buffer", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getJspPropertyGroup_ErrorOnUndeclaredNamespace(), theJavaeePackage.getTrueFalseType(), "errorOnUndeclaredNamespace", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getJspPropertyGroup_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(tagLibEClass, TagLib.class, "TagLib", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getTagLib_TaglibUri(), theXMLTypePackage.getToken(), "taglibUri", null, 1, 1, TagLib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getTagLib_TaglibLocation(), theJavaeePackage.getPathType(), "taglibLocation", null, 1, 1, TagLib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getTagLib_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, TagLib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- // Initialize data types
- initEDataType(jspFileTypeEDataType, String.class, "JspFileType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- // Create resource
- createResource(eNS_URI);
-
- // Create annotations
- // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
- createExtendedMetaDataAnnotations();
+ boolean hasLock = false;
+ try {
+ hasLock = J2EEInit.aquireInitializePackageContentsLock();
+ } catch (InterruptedException e) {
+ J2EECorePlugin.logError(e);
+ }
+
+ try{
+ // Add supertypes to classes
+
+ // Initialize classes and features; add operations and parameters
+ initEClass(jspConfigEClass, JspConfig.class, "JspConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getJspConfig_TagLibs(), this.getTagLib(), null, "tagLibs", null, 0, -1, JspConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getJspConfig_JspPropertyGroups(), this.getJspPropertyGroup(), null, "jspPropertyGroups", null, 0, -1, JspConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getJspConfig_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, JspConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(jspPropertyGroupEClass, JspPropertyGroup.class, "JspPropertyGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getJspPropertyGroup_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getJspPropertyGroup_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getJspPropertyGroup_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getJspPropertyGroup_UrlPatterns(), theJavaeePackage.getUrlPatternType(), null, "urlPatterns", null, 1, -1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getJspPropertyGroup_ElIgnored(), theJavaeePackage.getTrueFalseType(), "elIgnored", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getJspPropertyGroup_PageEncoding(), theXMLTypePackage.getToken(), "pageEncoding", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getJspPropertyGroup_ScriptingInvalid(), theJavaeePackage.getTrueFalseType(), "scriptingInvalid", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getJspPropertyGroup_IsXml(), theJavaeePackage.getTrueFalseType(), "isXml", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getJspPropertyGroup_IncludePreludes(), theJavaeePackage.getPathType(), "includePreludes", null, 0, -1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getJspPropertyGroup_IncludeCodas(), theJavaeePackage.getPathType(), "includeCodas", null, 0, -1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getJspPropertyGroup_DeferredSyntaxAllowedAsLiteral(), theJavaeePackage.getTrueFalseType(), "deferredSyntaxAllowedAsLiteral", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getJspPropertyGroup_TrimDirectiveWhitespaces(), theJavaeePackage.getTrueFalseType(), "trimDirectiveWhitespaces", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getJspPropertyGroup_DefaultContentType(), theXMLTypePackage.getToken(), "defaultContentType", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getJspPropertyGroup_Buffer(), theXMLTypePackage.getToken(), "buffer", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getJspPropertyGroup_ErrorOnUndeclaredNamespace(), theJavaeePackage.getTrueFalseType(), "errorOnUndeclaredNamespace", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getJspPropertyGroup_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, JspPropertyGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(tagLibEClass, TagLib.class, "TagLib", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getTagLib_TaglibUri(), theXMLTypePackage.getToken(), "taglibUri", null, 1, 1, TagLib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getTagLib_TaglibLocation(), theJavaeePackage.getPathType(), "taglibLocation", null, 1, 1, TagLib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getTagLib_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, TagLib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ // Initialize data types
+ initEDataType(jspFileTypeEDataType, String.class, "JspFileType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ // Create resource
+ createResource(eNS_URI);
+
+ // Create annotations
+ // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
+ createExtendedMetaDataAnnotations();
+ }finally{
+ if( hasLock )
+ J2EEInit.releaseInitializePackageContentsLock();
+ }
}
/**
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java
index f43d9e7..c578e9d 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebAppImpl.java
@@ -181,7 +181,7 @@
* @generated
* @ordered
*/
- protected static final WebAppVersionType VERSION_EDEFAULT = WebAppVersionType._25_LITERAL;
+ protected static final WebAppVersionType VERSION_EDEFAULT = WebAppVersionType._30_LITERAL;
/**
* The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java
index 680faef..6f60cb9 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java
@@ -26,26 +26,11 @@
import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl;
-
-import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
-
-import org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationclientPackageImpl;
-
-import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
-
-import org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl;
+import org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin;
+import org.eclipse.jst.j2ee.internal.J2EEInit;
import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-import org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-import org.eclipse.jst.javaee.jca.internal.impl.JcaPackageImpl;
-import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
-import org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl;
-
import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
import org.eclipse.jst.javaee.web.AbsoluteOrderingType;
@@ -87,10 +72,6 @@
import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
import org.eclipse.jst.javaee.web.internal.util.WebValidator;
-import org.eclipse.jst.javaee.webapp.internal.impl.WebappPackageImpl;
-import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
-import org.eclipse.jst.javaee.webfragment.internal.impl.WebfragmentPackageImpl;
-import org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage;
/**
* <!-- begin-user-doc -->
@@ -473,7 +454,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private static boolean isInited = false;
+ private volatile static boolean isInited = false;
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
@@ -499,37 +480,11 @@
XMLNamespacePackage.eINSTANCE.eClass();
XMLTypePackage.eINSTANCE.eClass();
- // Obtain or create and register interdependencies
- ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
- JavaeePackageImpl theJavaeePackage = (JavaeePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) instanceof JavaeePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) : JavaeePackage.eINSTANCE);
- ApplicationclientPackageImpl theApplicationclientPackage = (ApplicationclientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) instanceof ApplicationclientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) : ApplicationclientPackage.eINSTANCE);
- JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
- EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
- JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
- WebappPackageImpl theWebappPackage = (WebappPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) instanceof WebappPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) : WebappPackage.eINSTANCE);
- WebfragmentPackageImpl theWebfragmentPackage = (WebfragmentPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) instanceof WebfragmentPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) : WebfragmentPackage.eINSTANCE);
-
// Create package meta-data objects
theWebPackage.createPackageContents();
- theApplicationPackage.createPackageContents();
- theJavaeePackage.createPackageContents();
- theApplicationclientPackage.createPackageContents();
- theJcaPackage.createPackageContents();
- theEjbPackage.createPackageContents();
- theJspPackage.createPackageContents();
- theWebappPackage.createPackageContents();
- theWebfragmentPackage.createPackageContents();
// Initialize created meta-data
theWebPackage.initializePackageContents();
- theApplicationPackage.initializePackageContents();
- theJavaeePackage.initializePackageContents();
- theApplicationclientPackage.initializePackageContents();
- theJcaPackage.initializePackageContents();
- theEjbPackage.initializePackageContents();
- theJspPackage.initializePackageContents();
- theWebappPackage.initializePackageContents();
- theWebfragmentPackage.initializePackageContents();
// Register package validator
EValidator.Registry.INSTANCE.put
@@ -547,6 +502,8 @@
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(WebPackage.eNS_URI, theWebPackage);
EPackage.Registry.INSTANCE.put(WebPackage.eNS_URI2, theWebPackage);
+
+ J2EEInit.initEMFModels();
return theWebPackage;
}
@@ -2914,293 +2871,305 @@
// Set bounds for type parameters
- // Add supertypes to classes
-
- // Initialize classes and features; add operations and parameters
- initEClass(absoluteOrderingTypeEClass, AbsoluteOrderingType.class, "AbsoluteOrderingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getAbsoluteOrderingType_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, AbsoluteOrderingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getAbsoluteOrderingType_Name(), theJavaeePackage.getJavaIdentifier(), "name", null, 0, -1, AbsoluteOrderingType.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getAbsoluteOrderingType_Others(), this.getOrderingOthersType(), null, "others", null, 0, -1, AbsoluteOrderingType.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(authConstraintEClass, AuthConstraint.class, "AuthConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getAuthConstraint_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, AuthConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getAuthConstraint_RoleNames(), theJavaeePackage.getRoleName(), "roleNames", null, 0, -1, AuthConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getAuthConstraint_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AuthConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(cookieCommentTypeEClass, CookieCommentType.class, "CookieCommentType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getCookieCommentType_Value(), this.getNonEmptyStringType(), "value", null, 0, 1, CookieCommentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(cookieConfigTypeEClass, CookieConfigType.class, "CookieConfigType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getCookieConfigType_Name(), this.getCookieNameType(), null, "name", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getCookieConfigType_Domain(), this.getCookieDomainType(), null, "domain", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getCookieConfigType_Path(), this.getCookiePathType(), null, "path", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getCookieConfigType_Comment(), this.getCookieCommentType(), null, "comment", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getCookieConfigType_HttpOnly(), theJavaeePackage.getTrueFalseType(), "httpOnly", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getCookieConfigType_Secure(), theJavaeePackage.getTrueFalseType(), "secure", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getCookieConfigType_MaxAge(), theXMLTypePackage.getInteger(), "maxAge", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getCookieConfigType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(cookieDomainTypeEClass, CookieDomainType.class, "CookieDomainType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getCookieDomainType_Value(), this.getNonEmptyStringType(), "value", null, 0, 1, CookieDomainType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(cookieNameTypeEClass, CookieNameType.class, "CookieNameType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getCookieNameType_Value(), this.getNonEmptyStringType(), "value", null, 0, 1, CookieNameType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(cookiePathTypeEClass, CookiePathType.class, "CookiePathType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getCookiePathType_Value(), this.getNonEmptyStringType(), "value", null, 0, 1, CookiePathType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(errorPageEClass, ErrorPage.class, "ErrorPage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getErrorPage_ErrorCode(), this.getErrorCodeType(), "errorCode", null, 0, 1, ErrorPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getErrorPage_ExceptionType(), theJavaeePackage.getFullyQualifiedClassType(), "exceptionType", null, 0, 1, ErrorPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getErrorPage_Location(), this.getWarPathType(), "location", null, 1, 1, ErrorPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getErrorPage_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ErrorPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(filterEClass, Filter.class, "Filter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getFilter_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFilter_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFilter_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFilter_FilterName(), this.getFilterNameType(), "filterName", null, 1, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFilter_FilterClass(), theJavaeePackage.getFullyQualifiedClassType(), "filterClass", null, 0, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFilter_AsyncSupported(), theJavaeePackage.getTrueFalseType(), "asyncSupported", null, 0, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFilter_InitParams(), theJavaeePackage.getParamValue(), null, "initParams", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFilter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(filterMappingEClass, FilterMapping.class, "FilterMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getFilterMapping_FilterName(), this.getFilterNameType(), "filterName", null, 1, 1, FilterMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFilterMapping_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, FilterMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFilterMapping_UrlPatterns(), theJavaeePackage.getUrlPatternType(), null, "urlPatterns", null, 0, -1, FilterMapping.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFilterMapping_ServletNames(), this.getServletNameType(), "servletNames", null, 0, -1, FilterMapping.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFilterMapping_Dispatchers(), this.getDispatcherType(), "dispatchers", null, 0, 5, FilterMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFilterMapping_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, FilterMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(formLoginConfigEClass, FormLoginConfig.class, "FormLoginConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getFormLoginConfig_FormLoginPage(), this.getWarPathType(), "formLoginPage", null, 1, 1, FormLoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFormLoginConfig_FormErrorPage(), this.getWarPathType(), "formErrorPage", null, 1, 1, FormLoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFormLoginConfig_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, FormLoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(localeEncodingMappingEClass, LocaleEncodingMapping.class, "LocaleEncodingMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getLocaleEncodingMapping_Locale(), this.getLocaleType(), "locale", null, 1, 1, LocaleEncodingMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getLocaleEncodingMapping_Encoding(), this.getEncodingType(), "encoding", null, 1, 1, LocaleEncodingMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getLocaleEncodingMapping_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, LocaleEncodingMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(localeEncodingMappingListEClass, LocaleEncodingMappingList.class, "LocaleEncodingMappingList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getLocaleEncodingMappingList_LocalEncodingMappings(), this.getLocaleEncodingMapping(), null, "localEncodingMappings", null, 1, -1, LocaleEncodingMappingList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getLocaleEncodingMappingList_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, LocaleEncodingMappingList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(loginConfigEClass, LoginConfig.class, "LoginConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getLoginConfig_AuthMethod(), this.getAuthMethodType(), "authMethod", null, 0, 1, LoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getLoginConfig_RealmName(), theXMLTypePackage.getToken(), "realmName", null, 0, 1, LoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getLoginConfig_FormLoginConfig(), this.getFormLoginConfig(), null, "formLoginConfig", null, 0, 1, LoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getLoginConfig_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, LoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(mimeMappingEClass, MimeMapping.class, "MimeMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getMimeMapping_Extension(), theXMLTypePackage.getToken(), "extension", null, 1, 1, MimeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMimeMapping_MimeType(), this.getMimeTypeType(), "mimeType", null, 1, 1, MimeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMimeMapping_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MimeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(multipartConfigTypeEClass, MultipartConfigType.class, "MultipartConfigType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getMultipartConfigType_Location(), theXMLTypePackage.getToken(), "location", null, 0, 1, MultipartConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMultipartConfigType_MaxFileSize(), theXMLTypePackage.getLong(), "maxFileSize", null, 0, 1, MultipartConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMultipartConfigType_MaxRequestSize(), theXMLTypePackage.getLong(), "maxRequestSize", null, 0, 1, MultipartConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getMultipartConfigType_FileSizeThreshold(), theXMLTypePackage.getInteger(), "fileSizeThreshold", null, 0, 1, MultipartConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(orderingOrderingTypeEClass, OrderingOrderingType.class, "OrderingOrderingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getOrderingOrderingType_Name(), theJavaeePackage.getJavaIdentifier(), "name", null, 0, -1, OrderingOrderingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getOrderingOrderingType_Others(), this.getOrderingOthersType(), null, "others", null, 0, 1, OrderingOrderingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(orderingOthersTypeEClass, OrderingOthersType.class, "OrderingOthersType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getOrderingOthersType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, OrderingOthersType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(orderingTypeEClass, OrderingType.class, "OrderingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getOrderingType_After(), this.getOrderingOrderingType(), null, "after", null, 0, 1, OrderingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getOrderingType_Before(), this.getOrderingOrderingType(), null, "before", null, 0, 1, OrderingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(securityConstraintEClass, SecurityConstraint.class, "SecurityConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getSecurityConstraint_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSecurityConstraint_WebResourceCollections(), this.getWebResourceCollection(), null, "webResourceCollections", null, 1, -1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSecurityConstraint_AuthConstraint(), this.getAuthConstraint(), null, "authConstraint", null, 0, 1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSecurityConstraint_UserDataConstraint(), this.getUserDataConstraint(), null, "userDataConstraint", null, 0, 1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSecurityConstraint_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(servletEClass, Servlet.class, "Servlet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getServlet_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getServlet_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getServlet_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServlet_ServletName(), this.getServletNameType(), "servletName", null, 1, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServlet_ServletClass(), theJavaeePackage.getFullyQualifiedClassType(), "servletClass", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServlet_JspFile(), theJspPackage.getJspFileType(), "jspFile", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getServlet_InitParams(), theJavaeePackage.getParamValue(), null, "initParams", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServlet_LoadOnStartup(), this.getLoadOnStartupType(), "loadOnStartup", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServlet_Enabled(), theJavaeePackage.getTrueFalseType(), "enabled", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServlet_AsyncSupported(), theJavaeePackage.getTrueFalseType(), "asyncSupported", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getServlet_RunAs(), theJavaeePackage.getRunAs(), null, "runAs", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getServlet_SecurityRoleRefs(), theJavaeePackage.getSecurityRoleRef(), null, "securityRoleRefs", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getServlet_MultipartConfig(), this.getMultipartConfigType(), null, "multipartConfig", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServlet_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(servletMappingEClass, ServletMapping.class, "ServletMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getServletMapping_ServletName(), this.getServletNameType(), "servletName", null, 1, 1, ServletMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getServletMapping_UrlPatterns(), theJavaeePackage.getUrlPatternType(), null, "urlPatterns", null, 1, -1, ServletMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getServletMapping_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ServletMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(sessionConfigEClass, SessionConfig.class, "SessionConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getSessionConfig_SessionTimeout(), theXMLTypePackage.getInteger(), "sessionTimeout", null, 0, 1, SessionConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getSessionConfig_CookieConfig(), this.getCookieConfigType(), null, "cookieConfig", null, 0, 1, SessionConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSessionConfig_TrackingMode(), this.getTrackingModeType(), "trackingMode", null, 0, 3, SessionConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSessionConfig_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SessionConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(userDataConstraintEClass, UserDataConstraint.class, "UserDataConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getUserDataConstraint_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, UserDataConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getUserDataConstraint_TransportGuarantee(), this.getTransportGuaranteeType(), "transportGuarantee", null, 1, 1, UserDataConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getUserDataConstraint_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, UserDataConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(webAppEClass, WebApp.class, "WebApp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getWebApp_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getWebApp_ModuleName(), theXMLTypePackage.getToken(), "moduleName", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_Distributables(), theJavaeePackage.getEmptyType(), null, "distributables", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_ContextParams(), theJavaeePackage.getParamValue(), null, "contextParams", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_Filters(), this.getFilter(), null, "filters", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_FilterMappings(), this.getFilterMapping(), null, "filterMappings", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_Listeners(), theJavaeePackage.getListener(), null, "listeners", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_Servlets(), this.getServlet(), null, "servlets", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_ServletMappings(), this.getServletMapping(), null, "servletMappings", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_SessionConfigs(), this.getSessionConfig(), null, "sessionConfigs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_MimeMappings(), this.getMimeMapping(), null, "mimeMappings", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_WelcomeFileLists(), this.getWelcomeFileList(), null, "welcomeFileLists", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_ErrorPages(), this.getErrorPage(), null, "errorPages", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_JspConfigs(), theJspPackage.getJspConfig(), null, "jspConfigs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_SecurityConstraints(), this.getSecurityConstraint(), null, "securityConstraints", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_LoginConfigs(), this.getLoginConfig(), null, "loginConfigs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_SecurityRoles(), theJavaeePackage.getSecurityRole(), null, "securityRoles", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_PersistenceContextRefs(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_MessageDestinations(), theJavaeePackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_LocalEncodingMappingsLists(), this.getLocaleEncodingMappingList(), null, "localEncodingMappingsLists", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebApp_AbsoluteOrdering(), this.getAbsoluteOrderingType(), null, "absoluteOrdering", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getWebApp_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getWebApp_MetadataComplete(), theXMLTypePackage.getBoolean(), "metadataComplete", null, 0, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getWebApp_Version(), this.getWebAppVersionType(), "version", null, 1, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(webAppDeploymentDescriptorEClass, WebAppDeploymentDescriptor.class, "WebAppDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getWebAppDeploymentDescriptor_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebAppDeploymentDescriptor_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebAppDeploymentDescriptor_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebAppDeploymentDescriptor_WebApp(), this.getWebApp(), null, "webApp", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(webFragmentEClass, WebFragment.class, "WebFragment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getWebFragment_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, WebFragment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getWebFragment_Name(), theJavaeePackage.getJavaIdentifier(), "name", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_Distributables(), theJavaeePackage.getEmptyType(), null, "distributables", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_ContextParams(), theJavaeePackage.getParamValue(), null, "contextParams", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_Filters(), this.getFilter(), null, "filters", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_FilterMappings(), this.getFilterMapping(), null, "filterMappings", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_Listeners(), theJavaeePackage.getListener(), null, "listeners", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_Servlets(), this.getServlet(), null, "servlets", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_ServletMappings(), this.getServletMapping(), null, "servletMappings", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_SessionConfigs(), this.getSessionConfig(), null, "sessionConfigs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_MimeMappings(), this.getMimeMapping(), null, "mimeMappings", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_WelcomeFileLists(), this.getWelcomeFileList(), null, "welcomeFileLists", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_ErrorPages(), this.getErrorPage(), null, "errorPages", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_JspConfigs(), theJspPackage.getJspConfig(), null, "jspConfigs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_SecurityConstraints(), this.getSecurityConstraint(), null, "securityConstraints", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_LoginConfigs(), this.getLoginConfig(), null, "loginConfigs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_SecurityRoles(), theJavaeePackage.getSecurityRole(), null, "securityRoles", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_PersistenceContextRefs(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_MessageDestinations(), theJavaeePackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_LocalEncodingMappingsLists(), this.getLocaleEncodingMappingList(), null, "localEncodingMappingsLists", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebFragment_Ordering(), this.getOrderingType(), null, "ordering", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getWebFragment_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, WebFragment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getWebFragment_MetadataComplete(), theXMLTypePackage.getBoolean(), "metadataComplete", null, 0, 1, WebFragment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getWebFragment_Version(), this.getWebAppVersionType(), "version", null, 1, 1, WebFragment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(webResourceCollectionEClass, WebResourceCollection.class, "WebResourceCollection", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getWebResourceCollection_WebResourceName(), theXMLTypePackage.getToken(), "webResourceName", null, 1, 1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebResourceCollection_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebResourceCollection_UrlPatterns(), theJavaeePackage.getUrlPatternType(), null, "urlPatterns", null, 1, -1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getWebResourceCollection_HttpMethods(), this.getHttpMethodType(), "httpMethods", null, 0, -1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getWebResourceCollection_HttpMethodOmission(), this.getHttpMethodType(), "httpMethodOmission", null, 0, -1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getWebResourceCollection_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(welcomeFileListEClass, WelcomeFileList.class, "WelcomeFileList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getWelcomeFileList_WelcomeFiles(), theXMLTypePackage.getString(), "welcomeFiles", null, 1, -1, WelcomeFileList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getWelcomeFileList_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, WelcomeFileList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- // Initialize enums and add enum literals
- 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.ASYNC_LITERAL);
- addEEnumLiteral(dispatcherTypeEEnum, DispatcherType.ERROR_LITERAL);
-
- initEEnum(nullCharTypeEEnum, NullCharType.class, "NullCharType"); //$NON-NLS-1$
- addEEnumLiteral(nullCharTypeEEnum, NullCharType.__LITERAL);
-
- initEEnum(trackingModeTypeEEnum, TrackingModeType.class, "TrackingModeType"); //$NON-NLS-1$
- addEEnumLiteral(trackingModeTypeEEnum, TrackingModeType.COOKIE);
- addEEnumLiteral(trackingModeTypeEEnum, TrackingModeType.URL);
- addEEnumLiteral(trackingModeTypeEEnum, TrackingModeType.SSL);
-
- initEEnum(transportGuaranteeTypeEEnum, TransportGuaranteeType.class, "TransportGuaranteeType"); //$NON-NLS-1$
- addEEnumLiteral(transportGuaranteeTypeEEnum, TransportGuaranteeType.NONE_LITERAL);
- addEEnumLiteral(transportGuaranteeTypeEEnum, TransportGuaranteeType.INTEGRAL_LITERAL);
- addEEnumLiteral(transportGuaranteeTypeEEnum, TransportGuaranteeType.CONFIDENTIAL_LITERAL);
-
- initEEnum(webAppVersionTypeEEnum, WebAppVersionType.class, "WebAppVersionType"); //$NON-NLS-1$
- addEEnumLiteral(webAppVersionTypeEEnum, WebAppVersionType._25_LITERAL);
- addEEnumLiteral(webAppVersionTypeEEnum, WebAppVersionType._30_LITERAL);
-
- // Initialize data types
- initEDataType(authMethodTypeEDataType, String.class, "AuthMethodType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(dispatcherTypeObjectEDataType, DispatcherType.class, "DispatcherTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(encodingTypeEDataType, String.class, "EncodingType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(errorCodeTypeEDataType, BigInteger.class, "ErrorCodeType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(filterNameTypeEDataType, String.class, "FilterNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(httpMethodTypeEDataType, String.class, "HttpMethodType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(loadOnStartupTypeEDataType, Object.class, "LoadOnStartupType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(localeTypeEDataType, String.class, "LocaleType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(mimeTypeTypeEDataType, String.class, "MimeTypeType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(nonEmptyStringTypeEDataType, String.class, "NonEmptyStringType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(nullCharTypeObjectEDataType, NullCharType.class, "NullCharTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(servletNameTypeEDataType, String.class, "ServletNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(trackingModeTypeObjectEDataType, TrackingModeType.class, "TrackingModeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(transportGuaranteeTypeObjectEDataType, TransportGuaranteeType.class, "TransportGuaranteeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(warPathTypeEDataType, String.class, "WarPathType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(webAppVersionTypeObjectEDataType, WebAppVersionType.class, "WebAppVersionTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- // Create resource
- createResource(eNS_URI);
-
- // Create annotations
- // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
- createExtendedMetaDataAnnotations();
+ boolean hasLock = false;
+ try {
+ hasLock = J2EEInit.aquireInitializePackageContentsLock();
+ } catch (InterruptedException e) {
+ J2EECorePlugin.logError(e);
+ }
+
+ try{
+ // Add supertypes to classes
+
+ // Initialize classes and features; add operations and parameters
+ initEClass(absoluteOrderingTypeEClass, AbsoluteOrderingType.class, "AbsoluteOrderingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getAbsoluteOrderingType_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, AbsoluteOrderingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getAbsoluteOrderingType_Name(), theJavaeePackage.getJavaIdentifier(), "name", null, 0, -1, AbsoluteOrderingType.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getAbsoluteOrderingType_Others(), this.getOrderingOthersType(), null, "others", null, 0, -1, AbsoluteOrderingType.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(authConstraintEClass, AuthConstraint.class, "AuthConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getAuthConstraint_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, AuthConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getAuthConstraint_RoleNames(), theJavaeePackage.getRoleName(), "roleNames", null, 0, -1, AuthConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getAuthConstraint_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, AuthConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(cookieCommentTypeEClass, CookieCommentType.class, "CookieCommentType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getCookieCommentType_Value(), this.getNonEmptyStringType(), "value", null, 0, 1, CookieCommentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(cookieConfigTypeEClass, CookieConfigType.class, "CookieConfigType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getCookieConfigType_Name(), this.getCookieNameType(), null, "name", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getCookieConfigType_Domain(), this.getCookieDomainType(), null, "domain", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getCookieConfigType_Path(), this.getCookiePathType(), null, "path", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getCookieConfigType_Comment(), this.getCookieCommentType(), null, "comment", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getCookieConfigType_HttpOnly(), theJavaeePackage.getTrueFalseType(), "httpOnly", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getCookieConfigType_Secure(), theJavaeePackage.getTrueFalseType(), "secure", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getCookieConfigType_MaxAge(), theXMLTypePackage.getInteger(), "maxAge", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getCookieConfigType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, CookieConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(cookieDomainTypeEClass, CookieDomainType.class, "CookieDomainType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getCookieDomainType_Value(), this.getNonEmptyStringType(), "value", null, 0, 1, CookieDomainType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(cookieNameTypeEClass, CookieNameType.class, "CookieNameType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getCookieNameType_Value(), this.getNonEmptyStringType(), "value", null, 0, 1, CookieNameType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(cookiePathTypeEClass, CookiePathType.class, "CookiePathType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getCookiePathType_Value(), this.getNonEmptyStringType(), "value", null, 0, 1, CookiePathType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(errorPageEClass, ErrorPage.class, "ErrorPage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getErrorPage_ErrorCode(), this.getErrorCodeType(), "errorCode", null, 0, 1, ErrorPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getErrorPage_ExceptionType(), theJavaeePackage.getFullyQualifiedClassType(), "exceptionType", null, 0, 1, ErrorPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getErrorPage_Location(), this.getWarPathType(), "location", null, 1, 1, ErrorPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getErrorPage_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ErrorPage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(filterEClass, Filter.class, "Filter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getFilter_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getFilter_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getFilter_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getFilter_FilterName(), this.getFilterNameType(), "filterName", null, 1, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getFilter_FilterClass(), theJavaeePackage.getFullyQualifiedClassType(), "filterClass", null, 0, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getFilter_AsyncSupported(), theJavaeePackage.getTrueFalseType(), "asyncSupported", null, 0, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getFilter_InitParams(), theJavaeePackage.getParamValue(), null, "initParams", null, 0, -1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getFilter_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Filter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(filterMappingEClass, FilterMapping.class, "FilterMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getFilterMapping_FilterName(), this.getFilterNameType(), "filterName", null, 1, 1, FilterMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getFilterMapping_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, FilterMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getFilterMapping_UrlPatterns(), theJavaeePackage.getUrlPatternType(), null, "urlPatterns", null, 0, -1, FilterMapping.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getFilterMapping_ServletNames(), this.getServletNameType(), "servletNames", null, 0, -1, FilterMapping.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getFilterMapping_Dispatchers(), this.getDispatcherType(), "dispatchers", null, 0, 5, FilterMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getFilterMapping_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, FilterMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(formLoginConfigEClass, FormLoginConfig.class, "FormLoginConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getFormLoginConfig_FormLoginPage(), this.getWarPathType(), "formLoginPage", null, 1, 1, FormLoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getFormLoginConfig_FormErrorPage(), this.getWarPathType(), "formErrorPage", null, 1, 1, FormLoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getFormLoginConfig_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, FormLoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(localeEncodingMappingEClass, LocaleEncodingMapping.class, "LocaleEncodingMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getLocaleEncodingMapping_Locale(), this.getLocaleType(), "locale", null, 1, 1, LocaleEncodingMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getLocaleEncodingMapping_Encoding(), this.getEncodingType(), "encoding", null, 1, 1, LocaleEncodingMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getLocaleEncodingMapping_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, LocaleEncodingMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(localeEncodingMappingListEClass, LocaleEncodingMappingList.class, "LocaleEncodingMappingList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getLocaleEncodingMappingList_LocalEncodingMappings(), this.getLocaleEncodingMapping(), null, "localEncodingMappings", null, 1, -1, LocaleEncodingMappingList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getLocaleEncodingMappingList_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, LocaleEncodingMappingList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(loginConfigEClass, LoginConfig.class, "LoginConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getLoginConfig_AuthMethod(), this.getAuthMethodType(), "authMethod", null, 0, 1, LoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getLoginConfig_RealmName(), theXMLTypePackage.getToken(), "realmName", null, 0, 1, LoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getLoginConfig_FormLoginConfig(), this.getFormLoginConfig(), null, "formLoginConfig", null, 0, 1, LoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getLoginConfig_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, LoginConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(mimeMappingEClass, MimeMapping.class, "MimeMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getMimeMapping_Extension(), theXMLTypePackage.getToken(), "extension", null, 1, 1, MimeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMimeMapping_MimeType(), this.getMimeTypeType(), "mimeType", null, 1, 1, MimeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMimeMapping_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, MimeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(multipartConfigTypeEClass, MultipartConfigType.class, "MultipartConfigType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getMultipartConfigType_Location(), theXMLTypePackage.getToken(), "location", null, 0, 1, MultipartConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMultipartConfigType_MaxFileSize(), theXMLTypePackage.getLong(), "maxFileSize", null, 0, 1, MultipartConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMultipartConfigType_MaxRequestSize(), theXMLTypePackage.getLong(), "maxRequestSize", null, 0, 1, MultipartConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getMultipartConfigType_FileSizeThreshold(), theXMLTypePackage.getInteger(), "fileSizeThreshold", null, 0, 1, MultipartConfigType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(orderingOrderingTypeEClass, OrderingOrderingType.class, "OrderingOrderingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getOrderingOrderingType_Name(), theJavaeePackage.getJavaIdentifier(), "name", null, 0, -1, OrderingOrderingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getOrderingOrderingType_Others(), this.getOrderingOthersType(), null, "others", null, 0, 1, OrderingOrderingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(orderingOthersTypeEClass, OrderingOthersType.class, "OrderingOthersType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getOrderingOthersType_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, OrderingOthersType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(orderingTypeEClass, OrderingType.class, "OrderingType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getOrderingType_After(), this.getOrderingOrderingType(), null, "after", null, 0, 1, OrderingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getOrderingType_Before(), this.getOrderingOrderingType(), null, "before", null, 0, 1, OrderingType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(securityConstraintEClass, SecurityConstraint.class, "SecurityConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getSecurityConstraint_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSecurityConstraint_WebResourceCollections(), this.getWebResourceCollection(), null, "webResourceCollections", null, 1, -1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSecurityConstraint_AuthConstraint(), this.getAuthConstraint(), null, "authConstraint", null, 0, 1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSecurityConstraint_UserDataConstraint(), this.getUserDataConstraint(), null, "userDataConstraint", null, 0, 1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSecurityConstraint_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SecurityConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(servletEClass, Servlet.class, "Servlet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getServlet_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getServlet_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getServlet_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServlet_ServletName(), this.getServletNameType(), "servletName", null, 1, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServlet_ServletClass(), theJavaeePackage.getFullyQualifiedClassType(), "servletClass", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServlet_JspFile(), theJspPackage.getJspFileType(), "jspFile", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getServlet_InitParams(), theJavaeePackage.getParamValue(), null, "initParams", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServlet_LoadOnStartup(), this.getLoadOnStartupType(), "loadOnStartup", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServlet_Enabled(), theJavaeePackage.getTrueFalseType(), "enabled", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServlet_AsyncSupported(), theJavaeePackage.getTrueFalseType(), "asyncSupported", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getServlet_RunAs(), theJavaeePackage.getRunAs(), null, "runAs", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getServlet_SecurityRoleRefs(), theJavaeePackage.getSecurityRoleRef(), null, "securityRoleRefs", null, 0, -1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getServlet_MultipartConfig(), this.getMultipartConfigType(), null, "multipartConfig", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServlet_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Servlet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(servletMappingEClass, ServletMapping.class, "ServletMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getServletMapping_ServletName(), this.getServletNameType(), "servletName", null, 1, 1, ServletMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getServletMapping_UrlPatterns(), theJavaeePackage.getUrlPatternType(), null, "urlPatterns", null, 1, -1, ServletMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getServletMapping_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, ServletMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(sessionConfigEClass, SessionConfig.class, "SessionConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getSessionConfig_SessionTimeout(), theXMLTypePackage.getInteger(), "sessionTimeout", null, 0, 1, SessionConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getSessionConfig_CookieConfig(), this.getCookieConfigType(), null, "cookieConfig", null, 0, 1, SessionConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSessionConfig_TrackingMode(), this.getTrackingModeType(), "trackingMode", null, 0, 3, SessionConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getSessionConfig_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, SessionConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(userDataConstraintEClass, UserDataConstraint.class, "UserDataConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getUserDataConstraint_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, UserDataConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getUserDataConstraint_TransportGuarantee(), this.getTransportGuaranteeType(), "transportGuarantee", null, 1, 1, UserDataConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getUserDataConstraint_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, UserDataConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(webAppEClass, WebApp.class, "WebApp", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getWebApp_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getWebApp_ModuleName(), theXMLTypePackage.getToken(), "moduleName", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_Distributables(), theJavaeePackage.getEmptyType(), null, "distributables", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_ContextParams(), theJavaeePackage.getParamValue(), null, "contextParams", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_Filters(), this.getFilter(), null, "filters", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_FilterMappings(), this.getFilterMapping(), null, "filterMappings", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_Listeners(), theJavaeePackage.getListener(), null, "listeners", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_Servlets(), this.getServlet(), null, "servlets", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_ServletMappings(), this.getServletMapping(), null, "servletMappings", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_SessionConfigs(), this.getSessionConfig(), null, "sessionConfigs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_MimeMappings(), this.getMimeMapping(), null, "mimeMappings", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_WelcomeFileLists(), this.getWelcomeFileList(), null, "welcomeFileLists", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_ErrorPages(), this.getErrorPage(), null, "errorPages", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_JspConfigs(), theJspPackage.getJspConfig(), null, "jspConfigs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_SecurityConstraints(), this.getSecurityConstraint(), null, "securityConstraints", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_LoginConfigs(), this.getLoginConfig(), null, "loginConfigs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_SecurityRoles(), theJavaeePackage.getSecurityRole(), null, "securityRoles", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_PersistenceContextRefs(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_MessageDestinations(), theJavaeePackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_LocalEncodingMappingsLists(), this.getLocaleEncodingMappingList(), null, "localEncodingMappingsLists", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebApp_AbsoluteOrdering(), this.getAbsoluteOrderingType(), null, "absoluteOrdering", null, 0, -1, WebApp.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getWebApp_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getWebApp_MetadataComplete(), theXMLTypePackage.getBoolean(), "metadataComplete", null, 0, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getWebApp_Version(), this.getWebAppVersionType(), "version", null, 1, 1, WebApp.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(webAppDeploymentDescriptorEClass, WebAppDeploymentDescriptor.class, "WebAppDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getWebAppDeploymentDescriptor_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebAppDeploymentDescriptor_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebAppDeploymentDescriptor_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebAppDeploymentDescriptor_WebApp(), this.getWebApp(), null, "webApp", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(webFragmentEClass, WebFragment.class, "WebFragment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getWebFragment_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, WebFragment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getWebFragment_Name(), theJavaeePackage.getJavaIdentifier(), "name", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_DisplayNames(), theJavaeePackage.getDisplayName(), null, "displayNames", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_Icons(), theJavaeePackage.getIcon(), null, "icons", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_Distributables(), theJavaeePackage.getEmptyType(), null, "distributables", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_ContextParams(), theJavaeePackage.getParamValue(), null, "contextParams", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_Filters(), this.getFilter(), null, "filters", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_FilterMappings(), this.getFilterMapping(), null, "filterMappings", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_Listeners(), theJavaeePackage.getListener(), null, "listeners", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_Servlets(), this.getServlet(), null, "servlets", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_ServletMappings(), this.getServletMapping(), null, "servletMappings", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_SessionConfigs(), this.getSessionConfig(), null, "sessionConfigs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_MimeMappings(), this.getMimeMapping(), null, "mimeMappings", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_WelcomeFileLists(), this.getWelcomeFileList(), null, "welcomeFileLists", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_ErrorPages(), this.getErrorPage(), null, "errorPages", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_JspConfigs(), theJspPackage.getJspConfig(), null, "jspConfigs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_SecurityConstraints(), this.getSecurityConstraint(), null, "securityConstraints", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_LoginConfigs(), this.getLoginConfig(), null, "loginConfigs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_SecurityRoles(), theJavaeePackage.getSecurityRole(), null, "securityRoles", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_EnvEntries(), theJavaeePackage.getEnvEntry(), null, "envEntries", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_EjbRefs(), theJavaeePackage.getEjbRef(), null, "ejbRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_EjbLocalRefs(), theJavaeePackage.getEjbLocalRef(), null, "ejbLocalRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_ServiceRefs(), theJavaeePackage.getServiceRef(), null, "serviceRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_ResourceRefs(), theJavaeePackage.getResourceRef(), null, "resourceRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_ResourceEnvRefs(), theJavaeePackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_MessageDestinationRefs(), theJavaeePackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_PersistenceContextRefs(), theJavaeePackage.getPersistenceContextRef(), null, "persistenceContextRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_PersistenceUnitRefs(), theJavaeePackage.getPersistenceUnitRef(), null, "persistenceUnitRefs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_PostConstructs(), theJavaeePackage.getLifecycleCallback(), null, "postConstructs", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_PreDestroys(), theJavaeePackage.getLifecycleCallback(), null, "preDestroys", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_DataSource(), theJavaeePackage.getDataSourceType(), null, "dataSource", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_MessageDestinations(), theJavaeePackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_LocalEncodingMappingsLists(), this.getLocaleEncodingMappingList(), null, "localEncodingMappingsLists", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebFragment_Ordering(), this.getOrderingType(), null, "ordering", null, 0, -1, WebFragment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getWebFragment_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, WebFragment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getWebFragment_MetadataComplete(), theXMLTypePackage.getBoolean(), "metadataComplete", null, 0, 1, WebFragment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getWebFragment_Version(), this.getWebAppVersionType(), "version", null, 1, 1, WebFragment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(webResourceCollectionEClass, WebResourceCollection.class, "WebResourceCollection", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getWebResourceCollection_WebResourceName(), theXMLTypePackage.getToken(), "webResourceName", null, 1, 1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebResourceCollection_Descriptions(), theJavaeePackage.getDescription(), null, "descriptions", null, 0, -1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebResourceCollection_UrlPatterns(), theJavaeePackage.getUrlPatternType(), null, "urlPatterns", null, 1, -1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getWebResourceCollection_HttpMethods(), this.getHttpMethodType(), "httpMethods", null, 0, -1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getWebResourceCollection_HttpMethodOmission(), this.getHttpMethodType(), "httpMethodOmission", null, 0, -1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getWebResourceCollection_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, WebResourceCollection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(welcomeFileListEClass, WelcomeFileList.class, "WelcomeFileList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getWelcomeFileList_WelcomeFiles(), theXMLTypePackage.getString(), "welcomeFiles", null, 1, -1, WelcomeFileList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getWelcomeFileList_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, WelcomeFileList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ // Initialize enums and add enum literals
+ 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.ASYNC_LITERAL);
+ addEEnumLiteral(dispatcherTypeEEnum, DispatcherType.ERROR_LITERAL);
+
+ initEEnum(nullCharTypeEEnum, NullCharType.class, "NullCharType"); //$NON-NLS-1$
+ addEEnumLiteral(nullCharTypeEEnum, NullCharType.__LITERAL);
+
+ initEEnum(trackingModeTypeEEnum, TrackingModeType.class, "TrackingModeType"); //$NON-NLS-1$
+ addEEnumLiteral(trackingModeTypeEEnum, TrackingModeType.COOKIE);
+ addEEnumLiteral(trackingModeTypeEEnum, TrackingModeType.URL);
+ addEEnumLiteral(trackingModeTypeEEnum, TrackingModeType.SSL);
+
+ initEEnum(transportGuaranteeTypeEEnum, TransportGuaranteeType.class, "TransportGuaranteeType"); //$NON-NLS-1$
+ addEEnumLiteral(transportGuaranteeTypeEEnum, TransportGuaranteeType.NONE_LITERAL);
+ addEEnumLiteral(transportGuaranteeTypeEEnum, TransportGuaranteeType.INTEGRAL_LITERAL);
+ addEEnumLiteral(transportGuaranteeTypeEEnum, TransportGuaranteeType.CONFIDENTIAL_LITERAL);
+
+ initEEnum(webAppVersionTypeEEnum, WebAppVersionType.class, "WebAppVersionType"); //$NON-NLS-1$
+ addEEnumLiteral(webAppVersionTypeEEnum, WebAppVersionType._25_LITERAL);
+ addEEnumLiteral(webAppVersionTypeEEnum, WebAppVersionType._30_LITERAL);
+
+ // Initialize data types
+ initEDataType(authMethodTypeEDataType, String.class, "AuthMethodType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(dispatcherTypeObjectEDataType, DispatcherType.class, "DispatcherTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(encodingTypeEDataType, String.class, "EncodingType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(errorCodeTypeEDataType, BigInteger.class, "ErrorCodeType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(filterNameTypeEDataType, String.class, "FilterNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(httpMethodTypeEDataType, String.class, "HttpMethodType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(loadOnStartupTypeEDataType, Object.class, "LoadOnStartupType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(localeTypeEDataType, String.class, "LocaleType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(mimeTypeTypeEDataType, String.class, "MimeTypeType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(nonEmptyStringTypeEDataType, String.class, "NonEmptyStringType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(nullCharTypeObjectEDataType, NullCharType.class, "NullCharTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(servletNameTypeEDataType, String.class, "ServletNameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(trackingModeTypeObjectEDataType, TrackingModeType.class, "TrackingModeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(transportGuaranteeTypeObjectEDataType, TransportGuaranteeType.class, "TransportGuaranteeTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(warPathTypeEDataType, String.class, "WarPathType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(webAppVersionTypeObjectEDataType, WebAppVersionType.class, "WebAppVersionTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ // Create resource
+ createResource(eNS_URI);
+
+ // Create annotations
+ // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
+ createExtendedMetaDataAnnotations();
+ }finally{
+ if( hasLock )
+ J2EEInit.releaseInitializePackageContentsLock();
+ }
}
/**
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webapp/internal/impl/WebappPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webapp/internal/impl/WebappPackageImpl.java
index 7427e53..c0f2336 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webapp/internal/impl/WebappPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webapp/internal/impl/WebappPackageImpl.java
@@ -19,31 +19,8 @@
import org.eclipse.emf.ecore.xml.namespace.XMLNamespacePackage;
-import org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl;
-
-import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
-
-import org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationclientPackageImpl;
-
-import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
-
-import org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-import org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-import org.eclipse.jst.javaee.jca.internal.impl.JcaPackageImpl;
-
-import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
-
-import org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl;
-
-import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
-
-import org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl;
+import org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin;
+import org.eclipse.jst.j2ee.internal.J2EEInit;
import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
@@ -52,10 +29,6 @@
import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
-import org.eclipse.jst.javaee.webfragment.internal.impl.WebfragmentPackageImpl;
-
-import org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage;
-
/**
* <!-- begin-user-doc -->
* An implementation of the model <b>Package</b>.
@@ -94,7 +67,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private static boolean isInited = false;
+ private volatile static boolean isInited = false;
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
@@ -119,37 +92,11 @@
// Initialize simple dependencies
XMLNamespacePackage.eINSTANCE.eClass();
- // Obtain or create and register interdependencies
- ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
- JavaeePackageImpl theJavaeePackage = (JavaeePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) instanceof JavaeePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) : JavaeePackage.eINSTANCE);
- ApplicationclientPackageImpl theApplicationclientPackage = (ApplicationclientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) instanceof ApplicationclientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) : ApplicationclientPackage.eINSTANCE);
- JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
- EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
- JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
- WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) : WebPackage.eINSTANCE);
- WebfragmentPackageImpl theWebfragmentPackage = (WebfragmentPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) instanceof WebfragmentPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) : WebfragmentPackage.eINSTANCE);
-
// Create package meta-data objects
theWebappPackage.createPackageContents();
- theApplicationPackage.createPackageContents();
- theJavaeePackage.createPackageContents();
- theApplicationclientPackage.createPackageContents();
- theJcaPackage.createPackageContents();
- theEjbPackage.createPackageContents();
- theJspPackage.createPackageContents();
- theWebPackage.createPackageContents();
- theWebfragmentPackage.createPackageContents();
// Initialize created meta-data
theWebappPackage.initializePackageContents();
- theApplicationPackage.initializePackageContents();
- theJavaeePackage.initializePackageContents();
- theApplicationclientPackage.initializePackageContents();
- theJcaPackage.initializePackageContents();
- theEjbPackage.initializePackageContents();
- theJspPackage.initializePackageContents();
- theWebPackage.initializePackageContents();
- theWebfragmentPackage.initializePackageContents();
// Mark meta-data to indicate it can't be changed
theWebappPackage.freeze();
@@ -157,6 +104,8 @@
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(WebappPackage.eNS_URI, theWebappPackage);
+
+ J2EEInit.initEMFModels();
return theWebappPackage;
}
@@ -270,21 +219,33 @@
// Set bounds for type parameters
- // Add supertypes to classes
-
- // Initialize classes and features; add operations and parameters
- initEClass(webAppDeploymentDescriptorEClass, WebAppDeploymentDescriptor.class, "WebAppDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getWebAppDeploymentDescriptor_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebAppDeploymentDescriptor_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebAppDeploymentDescriptor_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebAppDeploymentDescriptor_WebApp(), theWebPackage.getWebApp(), null, "webApp", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- // Create resource
- createResource(eNS_URI);
-
- // Create annotations
- // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
- createExtendedMetaDataAnnotations();
+ boolean hasLock = false;
+ try {
+ hasLock = J2EEInit.aquireInitializePackageContentsLock();
+ } catch (InterruptedException e) {
+ J2EECorePlugin.logError(e);
+ }
+
+ try{
+ // Add supertypes to classes
+
+ // Initialize classes and features; add operations and parameters
+ initEClass(webAppDeploymentDescriptorEClass, WebAppDeploymentDescriptor.class, "WebAppDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getWebAppDeploymentDescriptor_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebAppDeploymentDescriptor_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebAppDeploymentDescriptor_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebAppDeploymentDescriptor_WebApp(), theWebPackage.getWebApp(), null, "webApp", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ // Create resource
+ createResource(eNS_URI);
+
+ // Create annotations
+ // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
+ createExtendedMetaDataAnnotations();
+ }finally{
+ if( hasLock )
+ J2EEInit.releaseInitializePackageContentsLock();
+ }
}
/**
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/impl/WebfragmentPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/impl/WebfragmentPackageImpl.java
index 3b0f94c..54e448c 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/impl/WebfragmentPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/impl/WebfragmentPackageImpl.java
@@ -19,38 +19,10 @@
import org.eclipse.emf.ecore.xml.namespace.XMLNamespacePackage;
-import org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl;
-
-import org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage;
-
-import org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationclientPackageImpl;
-
-import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
-
-import org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl;
-
-import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
-
-import org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl;
-
-import org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage;
-
-import org.eclipse.jst.javaee.jca.internal.impl.JcaPackageImpl;
-
-import org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage;
-
-import org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl;
-
-import org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage;
-
-import org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl;
-
+import org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin;
+import org.eclipse.jst.j2ee.internal.J2EEInit;
import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
-import org.eclipse.jst.javaee.webapp.internal.impl.WebappPackageImpl;
-
-import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
-
import org.eclipse.jst.javaee.webfragment.WebAppDeploymentDescriptor;
import org.eclipse.jst.javaee.webfragment.WebfragmentFactory;
@@ -94,7 +66,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private static boolean isInited = false;
+ private volatile static boolean isInited = false;
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
@@ -119,37 +91,11 @@
// Initialize simple dependencies
XMLNamespacePackage.eINSTANCE.eClass();
- // Obtain or create and register interdependencies
- ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
- JavaeePackageImpl theJavaeePackage = (JavaeePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) instanceof JavaeePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) : JavaeePackage.eINSTANCE);
- ApplicationclientPackageImpl theApplicationclientPackage = (ApplicationclientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) instanceof ApplicationclientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) : ApplicationclientPackage.eINSTANCE);
- JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
- EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
- JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
- WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) : WebPackage.eINSTANCE);
- WebappPackageImpl theWebappPackage = (WebappPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) instanceof WebappPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) : WebappPackage.eINSTANCE);
-
// Create package meta-data objects
theWebfragmentPackage.createPackageContents();
- theApplicationPackage.createPackageContents();
- theJavaeePackage.createPackageContents();
- theApplicationclientPackage.createPackageContents();
- theJcaPackage.createPackageContents();
- theEjbPackage.createPackageContents();
- theJspPackage.createPackageContents();
- theWebPackage.createPackageContents();
- theWebappPackage.createPackageContents();
// Initialize created meta-data
theWebfragmentPackage.initializePackageContents();
- theApplicationPackage.initializePackageContents();
- theJavaeePackage.initializePackageContents();
- theApplicationclientPackage.initializePackageContents();
- theJcaPackage.initializePackageContents();
- theEjbPackage.initializePackageContents();
- theJspPackage.initializePackageContents();
- theWebPackage.initializePackageContents();
- theWebappPackage.initializePackageContents();
// Mark meta-data to indicate it can't be changed
theWebfragmentPackage.freeze();
@@ -157,6 +103,8 @@
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(WebfragmentPackage.eNS_URI, theWebfragmentPackage);
+
+ J2EEInit.initEMFModels();
return theWebfragmentPackage;
}
@@ -270,21 +218,33 @@
// Set bounds for type parameters
- // Add supertypes to classes
-
- // Initialize classes and features; add operations and parameters
- initEClass(webAppDeploymentDescriptorEClass, WebAppDeploymentDescriptor.class, "WebAppDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getWebAppDeploymentDescriptor_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebAppDeploymentDescriptor_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebAppDeploymentDescriptor_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getWebAppDeploymentDescriptor_WebFragment(), theWebPackage.getWebFragment(), null, "webFragment", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- // Create resource
- createResource(eNS_URI);
-
- // Create annotations
- // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
- createExtendedMetaDataAnnotations();
+ boolean hasLock = false;
+ try {
+ hasLock = J2EEInit.aquireInitializePackageContentsLock();
+ } catch (InterruptedException e) {
+ J2EECorePlugin.logError(e);
+ }
+
+ try{
+ // Add supertypes to classes
+
+ // Initialize classes and features; add operations and parameters
+ initEClass(webAppDeploymentDescriptorEClass, WebAppDeploymentDescriptor.class, "WebAppDeploymentDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getWebAppDeploymentDescriptor_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebAppDeploymentDescriptor_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebAppDeploymentDescriptor_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWebAppDeploymentDescriptor_WebFragment(), theWebPackage.getWebFragment(), null, "webFragment", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ // Create resource
+ createResource(eNS_URI);
+
+ // Create annotations
+ // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
+ createExtendedMetaDataAnnotations();
+ }finally{
+ if( hasLock )
+ J2EEInit.releaseInitializePackageContentsLock();
+ }
}
/**
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ApplicationPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ApplicationPackageImpl.java
index 57e1866..87bf881 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ApplicationPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/internal/impl/ApplicationPackageImpl.java
@@ -85,7 +85,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private static boolean isInited = false;
+ private volatile static boolean isInited = false;
/**
* @generated This field/method will be replaced during code generation.
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/impl/ClientPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/impl/ClientPackageImpl.java
index 54c6b3e..bd2e710 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/impl/ClientPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/internal/impl/ClientPackageImpl.java
@@ -55,7 +55,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private static boolean isInited = false;
+ private volatile static boolean isInited = false;
/**
* @generated This field/method will be replaced during code generation.
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/CommonPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/CommonPackageImpl.java
index 949332f..299a921 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/CommonPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/CommonPackageImpl.java
@@ -270,7 +270,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private static boolean isInited = false;
+ private volatile static boolean isInited = false;
/**
* @generated This field/method will be replaced during code generation.
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EjbPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EjbPackageImpl.java
index c25c3ab..ddd277f 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EjbPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EjbPackageImpl.java
@@ -294,7 +294,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private static boolean isInited = false;
+ private volatile static boolean isInited = false;
/**
* @generated This field/method will be replaced during code generation.
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
index ed1aeff..54c5cc8 100644
--- 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
@@ -56,7 +56,7 @@
import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.WebServicesClientResourceFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl;
+//import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl;
import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
import org.eclipse.jst.j2ee.webservice.wscommon.internal.impl.WscommonPackageImpl;
@@ -71,11 +71,18 @@
import org.eclipse.wst.common.internal.emf.utilities.Revisit;
import org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin;
import org.eclipse.jst.javaee.applicationclient.ApplicationclientFactory;
+import org.eclipse.jst.javaee.applicationclient.internal.impl.ApplicationclientPackageImpl;
import org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage;
import org.eclipse.jst.javaee.core.JavaeeFactory;
+import org.eclipse.jst.javaee.core.internal.impl.JavaeePackageImpl;
import org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage;
import org.eclipse.jst.javaee.web.WebFactory;
+import org.eclipse.jst.javaee.web.internal.impl.WebPackageImpl;
import org.eclipse.jst.javaee.web.internal.metadata.WebPackage;
+import org.eclipse.jst.javaee.webapp.internal.impl.WebappPackageImpl;
+import org.eclipse.jst.javaee.webapp.internal.metadata.WebappPackage;
+import org.eclipse.jst.javaee.webfragment.internal.impl.WebfragmentPackageImpl;
+import org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage;
/**
* Insert the type's description here.
@@ -333,9 +340,9 @@
// Obtain or create and register interdependencies
// Create package meta-data objects
// Initialize created meta-data
- Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof Webservice_clientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
- theWebservice_clientPackage.createPackageContents();
- theWebservice_clientPackage.initializePackageContents();
+// Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof Webservice_clientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
+// theWebservice_clientPackage.createPackageContents();
+// theWebservice_clientPackage.initializePackageContents();
CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof CommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
theCommonPackage.createPackageContents();
@@ -379,6 +386,54 @@
}
});
j2eeEmfInitThread.start();
+
+
+ // put the following initialization on its own thread.
+ Thread javaeeEmfInitThread = new Thread(new Runnable(){
+ public void run()
+ {
+ // Obtain or create and register interdependencies
+ // Create package meta-data objects
+ // Initialize created meta-data
+
+ JavaeePackageImpl theJavaeePackage = (JavaeePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) instanceof JavaeePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JavaeePackage.eNS_URI) : JavaeePackage.eINSTANCE);
+ theJavaeePackage.createPackageContents();
+ theJavaeePackage.initializePackageContents();
+
+ org.eclipse.jst.javaee.jca.internal.impl.JcaPackageImpl theJcaPackage = (org.eclipse.jst.javaee.jca.internal.impl.JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage.eNS_URI) instanceof org.eclipse.jst.javaee.jca.internal.impl.JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage.eNS_URI) : org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage.eINSTANCE);
+ theJcaPackage.createPackageContents();
+ theJcaPackage.initializePackageContents();
+
+ org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl theJspPackage = (org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage.eNS_URI) instanceof org.eclipse.jst.javaee.jsp.internal.impl.JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage.eNS_URI) : org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage.eINSTANCE);
+ theJspPackage.createPackageContents();
+ theJspPackage.initializePackageContents();
+
+ ApplicationclientPackageImpl theApplicationclientPackage = (ApplicationclientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) instanceof ApplicationclientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationclientPackage.eNS_URI) : ApplicationclientPackage.eINSTANCE);
+ theApplicationclientPackage.createPackageContents();
+ theApplicationclientPackage.initializePackageContents();
+
+ org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl theApplicationPackage = (org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage.eNS_URI) instanceof org.eclipse.jst.javaee.application.internal.impl.ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage.eNS_URI) : org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage.eINSTANCE);
+ theApplicationPackage.createPackageContents();
+ theApplicationPackage.initializePackageContents();
+
+ org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl theEjbPackage = (org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage.eNS_URI) instanceof org.eclipse.jst.javaee.ejb.internal.impl.EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage.eNS_URI) : org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage.eINSTANCE);
+ theEjbPackage.createPackageContents();
+ theEjbPackage.initializePackageContents();
+
+ WebPackageImpl theWebPackage = (WebPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) instanceof WebPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebPackage.eNS_URI) : WebPackage.eINSTANCE);
+ theWebPackage.createPackageContents();
+ theWebPackage.initializePackageContents();
+
+ WebappPackageImpl theWebappPackage = (WebappPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) instanceof WebappPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebappPackage.eNS_URI) : WebappPackage.eINSTANCE);
+ theWebappPackage.createPackageContents();
+ theWebappPackage.initializePackageContents();
+
+ WebfragmentPackageImpl theWebfragmentPackage = (WebfragmentPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) instanceof WebfragmentPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebfragmentPackage.eNS_URI) : WebfragmentPackage.eINSTANCE);
+ theWebfragmentPackage.createPackageContents();
+ theWebfragmentPackage.initializePackageContents();
+ }
+ });
+ javaeeEmfInitThread.start();
}
}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/JcaPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/JcaPackageImpl.java
index 257c8a7..233490e 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/JcaPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/internal/impl/JcaPackageImpl.java
@@ -166,7 +166,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private static boolean isInited = false;
+ private volatile static boolean isInited = false;
/**
* @generated This field/method will be replaced during code generation.
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/JspPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/JspPackageImpl.java
index d4f8a77..2f8665c 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/JspPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/JspPackageImpl.java
@@ -79,7 +79,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private static boolean isInited = false;
+ private volatile static boolean isInited = false;
/**
* Creates, registers, and initializes the <b>Package</b> for this
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/TaglibPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/TaglibPackageImpl.java
index c7dd2f4..eee0ba6 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/TaglibPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/internal/impl/TaglibPackageImpl.java
@@ -128,7 +128,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private static boolean isInited = false;
+ private volatile static boolean isInited = false;
/**
* @generated This field/method will be replaced during code generation.
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebapplicationPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebapplicationPackageImpl.java
index 2278815..c8ae065 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebapplicationPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/internal/impl/WebapplicationPackageImpl.java
@@ -311,7 +311,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private static boolean isInited = false;
+ private volatile static boolean isInited = false;
/**
* @generated This field/method will be replaced during code generation.
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/Webservice_clientPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/Webservice_clientPackageImpl.java
index 1ea2025..23c0c8f 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/Webservice_clientPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/Webservice_clientPackageImpl.java
@@ -95,7 +95,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private static boolean isInited = false;
+ private volatile static boolean isInited = false;
/**
* Creates, registers, and initializes the <b>Package</b> for this
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/WscommonPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/WscommonPackageImpl.java
index a567169..e27f1d5 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/WscommonPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/WscommonPackageImpl.java
@@ -104,7 +104,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private static boolean isInited = false;
+ private volatile static boolean isInited = false;
/**
* Creates, registers, and initializes the <b>Package</b> for this
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddPackageImpl.java
index 3552513..236b114 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddPackageImpl.java
@@ -178,7 +178,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private static boolean isInited = false;
+ private volatile static boolean isInited = false;
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
diff --git a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF
index 9858b7e..bf85ef4 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.jst.j2ee.ui; singleton:=true
-Bundle-Version: 1.1.403.qualifier
+Bundle-Version: 1.1.406.qualifier
Bundle-Activator: org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/ModulesItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/ModulesItemProvider.java
index d8d3438..ec8f20a 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/ModulesItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/ModulesItemProvider.java
@@ -16,6 +16,7 @@
import java.util.List;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.Path;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
import org.eclipse.jst.j2ee.application.Application;
@@ -257,21 +258,24 @@
Module module = (Module) modules.get(i);
String moduleURI = module.getUri();
boolean foundBinary = false;
- for (int j = 0; j < refs.length && !foundBinary; j++) {
- IVirtualComponent component = refs[j].getReferencedComponent();
- if (component.isBinary()) {
- if (refs[j].getArchiveName().equals(moduleURI)) {
- foundBinary = true;
- JavaEEBinaryComponentHelper helper = null;
- try {
- helper = new JavaEEBinaryComponentHelper(component);
- Object binaryModule = helper.getPrimaryRootObject();
- if (binaryModule != null) {
- binaryModules.add(binaryModule);
- }
- } finally {
- if(helper != null){
- helper.dispose();
+ if(moduleURI != null) {
+ String moduleName = new Path(moduleURI).lastSegment();
+ for (int j = 0; j < refs.length && !foundBinary; j++) {
+ IVirtualComponent component = refs[j].getReferencedComponent();
+ if (component.isBinary()) {
+ if (refs[j].getArchiveName().equals(moduleName)) {
+ foundBinary = true;
+ JavaEEBinaryComponentHelper helper = null;
+ try {
+ helper = new JavaEEBinaryComponentHelper(component);
+ Object binaryModule = helper.getPrimaryRootObject();
+ if (binaryModule != null) {
+ binaryModules.add(binaryModule);
+ }
+ } finally {
+ if(helper != null){
+ helper.dispose();
+ }
}
}
}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/IJavaEEDeploymentAssemblySectionBuilder.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/IJavaEEDeploymentAssemblySectionBuilder.java
new file mode 100644
index 0000000..0374c29
--- /dev/null
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/IJavaEEDeploymentAssemblySectionBuilder.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.jst.j2ee.internal.ui;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.wst.common.componentcore.ui.propertypage.AddModuleDependenciesPropertiesPage.ComponentResourceProxy;
+
+public interface IJavaEEDeploymentAssemblySectionBuilder {
+
+ /**
+ * Builds the section
+ * @param parent - The composite to which this section will be added
+ */
+ public void buildSection(Composite parent);
+
+ public void loadContents();
+
+ public boolean saveContents();
+
+ public void directiveAdded(Object element);
+
+ public void directiveRemoved(Object element);
+
+ public IStatus validate(IStatus currentStatus);
+
+ public void componentResourceModified(ComponentResourceProxy originalResource, ComponentResourceProxy modifiedResource);
+
+
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDependenciesPropertyPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDependenciesPropertyPage.java
index 80b20d5..eda8a6b 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDependenciesPropertyPage.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDependenciesPropertyPage.java
@@ -1,5 +1,5 @@
/******************************************************************************
- * Copyright (c) 2009 Red Hat and Others
+ * Copyright (c) 2009, 2011 Red Hat and Others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,6 +9,7 @@
* Rob Stryker - initial implementation and ongoing maintenance
* Chuck Bridgham - additional support
* Konstantin Komissarchik - misc. UI cleanup
+ * Roberto Sanchez - Add Advanced section
******************************************************************************/
package org.eclipse.jst.j2ee.internal.ui;
@@ -37,6 +38,9 @@
import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.wst.common.componentcore.internal.IModuleHandler;
import org.eclipse.wst.common.componentcore.internal.impl.TaskModel;
@@ -52,10 +56,13 @@
public class J2EEModuleDependenciesPropertyPage extends
AddModuleDependenciesPropertiesPage {
+
+ private IJavaEEDeploymentAssemblySectionBuilder advancedHelper;
public J2EEModuleDependenciesPropertyPage(IProject project,
ModuleAssemblyRootPage page) {
super(project, page);
+ advancedHelper = getAdvancedSectionBuilder();
}
public class ClasspathEntryProxy {
@@ -73,6 +80,15 @@
super.initialize();
resetClasspathEntries();
}
+
+ @Override
+ protected void createTableComposite(Composite parent) {
+ Composite composite = new Composite(parent, SWT.NONE);
+ GridData gData = new GridData(GridData.FILL_BOTH);
+ composite.setLayoutData(gData);
+ fillTableComposite(composite);
+ addAdvancedComposite(composite);
+ }
private void resetClasspathEntries() {
originalClasspathEntries.clear();
@@ -86,6 +102,8 @@
@Override
public void performDefaults() {
resetClasspathEntries();
+ if (advancedHelper != null)
+ advancedHelper.loadContents();
super.performDefaults();
}
@@ -95,6 +113,9 @@
public static List <IClasspathEntry> readRawEntries(IVirtualComponent component){
List <IClasspathEntry> entries = new ArrayList<IClasspathEntry>();
+ if (!component.getProject().isAccessible()){
+ return entries;
+ }
IJavaProjectLite javaProjectLite = JavaCoreLite.create(component.getProject());
try {
Map<IClasspathEntry, IClasspathAttribute> rawComponentClasspathDependencies = ClasspathDependencyUtil.getRawComponentClasspathDependencies(javaProjectLite, DependencyAttributeType.CLASSPATH_COMPONENT_DEPENDENCY);
@@ -124,6 +145,8 @@
} else {
super.remove(selectedItem);
}
+ if (advancedHelper != null)
+ advancedHelper.directiveRemoved(selectedItem);
}
@Override
@@ -184,15 +207,24 @@
public Object getValue(Object element, String property) {
if(element instanceof ClasspathEntryProxy){
IClasspathEntry entry = ((ClasspathEntryProxy)element).entry;
- return ClasspathDependencyUtil.getRuntimePath(entry).toString();
+ IPath runtimePath = ClasspathDependencyUtil.getRuntimePath(entry);
+ if(runtimePath.isRoot())
+ return runtimePath.toString();
+ return runtimePath.makeRelative().toString();
}
return super.getValue(element, property);
}
@Override
public void modify(Object element, String property, Object value) {
- if (property.equals(DEPLOY_PATH_PROPERTY)) {
+ ComponentResourceProxy originalResource = null;
+ ComponentResourceProxy modifiedResource = null;
+ if (property.equals(DEPLOY_PATH_PROPERTY)) {
TreeItem item = (TreeItem) element;
+ if( item.getData() instanceof ComponentResourceProxy) {
+ modifiedResource = (ComponentResourceProxy)item.getData();
+ originalResource = new ComponentResourceProxy(modifiedResource.source, modifiedResource.runtimePath);
+ }
if(item.getData() instanceof ClasspathEntryProxy){
TreeItem[] components = availableComponentsViewer.getTree().getItems();
int tableIndex = -1;
@@ -203,15 +235,21 @@
}
}
ClasspathEntryProxy proxy = (ClasspathEntryProxy)item.getData();
- IPath runtimePath = new Path((String)value);
+ IPath runtimePath = new Path(((String)value).trim()).makeRelative();
+ if(runtimePath.isEmpty())
+ runtimePath = runtimePath.makeAbsolute();
+ if(tableIndex >= 0)
+ components[tableIndex].setText(AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN, runtimePath.toString());
+ if(!ClasspathDependencyUtil.isMappedIntoContainer(runtimePath.toString()))
+ runtimePath = runtimePath.makeAbsolute();
IClasspathEntry newEntry = ClasspathDependencyUtil.modifyDependencyPath(proxy.entry, runtimePath);
proxy.entry = newEntry;
resourceMappingsChanged = true;
- if(tableIndex >= 0)
- components[tableIndex].setText(AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN, (String)value);
}
}
super.modify(element, property, value);
+ if (originalResource != null && advancedHelper != null)
+ advancedHelper.componentResourceModified(originalResource, modifiedResource);
}
};
}
@@ -296,16 +334,46 @@
{
super.handleAddDirective(wizard);
}
+ if (advancedHelper != null)
+ advancedHelper.directiveAdded(wizard.getTaskModel());
}
@Override
protected void verify() {
+ propPage.refreshProblemsView();
+ }
+
+ @Override
+ public IStatus validate() {
ArrayList<ComponentResourceProxy> allMappings = new ArrayList<ComponentResourceProxy>();
allMappings.addAll(resourceMappings);
allMappings.addAll(hiddenMappings);
-
IStatus status = J2EEModuleDeploymentAssemblyVerifierHelper.verify(rootComponent, runtime, currentReferences, allMappings,resourceMappingsChanged, currentClasspathEntries);
- setErrorMessage(status);
+ if (advancedHelper != null)
+ status = advancedHelper.validate(status);
+ return status;
+ }
+
+ protected void addAdvancedComposite(Composite parent) {
+ if (advancedHelper != null) {
+ advancedHelper.buildSection(parent);
+ advancedHelper.loadContents();
+ }
+ }
+
+ @Override
+ public boolean performOk() {
+ boolean result = super.performOk();
+ if (advancedHelper != null)
+ result = result & advancedHelper.saveContents();
+ return result;
+ }
+
+ protected IJavaEEDeploymentAssemblySectionBuilder getAdvancedSectionBuilder(){
+ if (advancedHelper == null){
+ advancedHelper = new JavaEEDeploymentAssemblyAdvancedSectionBuilder(rootComponent, this);
+ }
+ return advancedHelper;
}
//
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDeploymentAssemblyVerifierHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDeploymentAssemblyVerifierHelper.java
index 2e078db..c8b1468 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDeploymentAssemblyVerifierHelper.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDeploymentAssemblyVerifierHelper.java
@@ -58,7 +58,11 @@
verifier = (IDeploymentAssemblyVerifier) ((IConfigurationElement) verifiers.get(i)).createExecutableExtension(VerifierRegistryReader.VERIFIER_CLASS);
J2EEModuleDeploymentAssemblyVerifierData data = new J2EEModuleDeploymentAssemblyVerifierData(component, runtime,currentReferences,resourceMappings,resourceMappingsChanged,currentClasspathEntries );
IStatus verifyStatus = verifier.verify(data);
- masterStatus.add(verifyStatus);
+ if(verifyStatus != null && verifyStatus.isMultiStatus()) {
+ masterStatus.addAll(verifyStatus);
+ } else {
+ masterStatus.add(verifyStatus);
+ }
} catch (Exception e) {
ModuleCoreUIPlugin.log(e);
continue;
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/JavaEEComponentDependencyContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/JavaEEComponentDependencyContentProvider.java
index 30ec5e6..dd50b94 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/JavaEEComponentDependencyContentProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/JavaEEComponentDependencyContentProvider.java
@@ -67,7 +67,10 @@
} else if (columnIndex == AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN) {
IClasspathAttribute attribute = ClasspathDependencyUtil.checkForComponentDependencyAttribute(classpathEntry, DependencyAttributeType.CLASSPATH_COMPONENT_DEPENDENCY);
if (attribute != null) {
- return new Path(attribute.getValue()).toString();
+ IPath runtimePath = new Path(attribute.getValue());
+ if(runtimePath.isRoot())
+ return runtimePath.toString();
+ return runtimePath.makeRelative().toString();
}
return null;
}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/JavaEEDeploymentAssemblyAdvancedSectionBuilder.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/JavaEEDeploymentAssemblyAdvancedSectionBuilder.java
new file mode 100644
index 0000000..e1026e7
--- /dev/null
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/JavaEEDeploymentAssemblyAdvancedSectionBuilder.java
@@ -0,0 +1,440 @@
+/*******************************************************************************
+ * Copyright (c) 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.jst.j2ee.internal.ui;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
+import org.eclipse.jst.j2ee.internal.J2EEConstants;
+import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
+import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
+import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.forms.events.ExpansionAdapter;
+import org.eclipse.ui.forms.events.ExpansionEvent;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.wst.common.componentcore.internal.ComponentResource;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
+import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
+import org.eclipse.wst.common.componentcore.internal.impl.TaskModel;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
+import org.eclipse.wst.common.componentcore.ui.internal.propertypage.ResourceMappingFilterExtensionRegistry;
+import org.eclipse.wst.common.componentcore.ui.propertypage.AddModuleDependenciesPropertiesPage;
+import org.eclipse.wst.common.componentcore.ui.propertypage.AddModuleDependenciesPropertiesPage.ComponentResourceProxy;
+import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants;
+
+/**
+ * This is a helper class to build and handle the logic of the "Advanced" section
+ * of the Deployment Assembly page that is common to all the Java EE modules (EAR
+ * project, Web project, etc.)
+ *
+ */
+
+public class JavaEEDeploymentAssemblyAdvancedSectionBuilder implements IJavaEEDeploymentAssemblySectionBuilder, SelectionListener {
+
+ private Label defaulDDFolderLabel;
+ private Combo rootSourceMappings;
+
+ private IVirtualComponent rootComponent;
+ private AddModuleDependenciesPropertiesPage page;
+ private String currentSelectedDDFolder = null;
+ private List<String> resourceMappingsList = new ArrayList<String>();
+ boolean shouldDisplaySection;
+
+ String folderToLook;
+ String fileToLook;
+ String projectType;
+
+
+ public JavaEEDeploymentAssemblyAdvancedSectionBuilder(IVirtualComponent component, AddModuleDependenciesPropertiesPage page){
+ rootComponent = component;
+ this.page = page;
+ shouldDisplaySection = !JavaEEProjectUtilities.isUtilityProject(rootComponent.getProject());
+ IVirtualFolder rootFolder = rootComponent.getRootFolder();
+ IPath defaultDDFolder = J2EEModuleVirtualComponent.getDefaultDeploymentDescriptorFolder(rootFolder);
+ shouldDisplaySection &= (defaultDDFolder == null);
+ projectType = JavaEEProjectUtilities.getJ2EEProjectType(component.getProject());
+ if (projectType.equals(IJ2EEFacetConstants.APPLICATION_CLIENT)) {
+ folderToLook = J2EEConstants.META_INF;
+ fileToLook = J2EEConstants.APP_CLIENT_DD_URI;
+ }
+ else if (projectType.equals(IJ2EEFacetConstants.JCA)) {
+ folderToLook = J2EEConstants.META_INF;
+ fileToLook = J2EEConstants.RAR_DD_URI;
+ }
+ else if (projectType.equals(IJ2EEFacetConstants.EJB)){
+ folderToLook = J2EEConstants.META_INF;
+ fileToLook = J2EEConstants.EJBJAR_DD_URI;
+ }
+ else if (projectType.equals(IJ2EEFacetConstants.DYNAMIC_WEB)) {
+ folderToLook = J2EEConstants.WEB_INF;
+ fileToLook = J2EEConstants.WEBAPP_DD_URI;
+ }
+ else if (projectType.equals(IJ2EEFacetConstants.ENTERPRISE_APPLICATION)) {
+ folderToLook = J2EEConstants.META_INF;
+ fileToLook = J2EEConstants.APPLICATION_DD_URI;
+ }
+ else if (projectType.equals(IJ2EEFacetConstants.WEBFRAGMENT)) {
+ folderToLook = J2EEConstants.META_INF;
+ fileToLook = J2EEConstants.WEBFRAGMENT_DD_URI;
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jst.j2ee.internal.ui.IJavaEEDeploymentAssemblySectionBuilder#buildSection(org.eclipse.swt.widgets.Composite)
+ */
+ public void buildSection(Composite parent){
+ if (shouldDisplaySection()) {
+ Composite advancedSectionComposite = createAdvancedSection(parent);
+ addDefaultDeploymentDescriptorFolderFields(advancedSectionComposite);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jst.j2ee.internal.ui.IJavaEEDeploymentAssemblySectionBuilder#loadContents()
+ */
+ public void loadContents(){
+ if (shouldDisplaySection()){
+ loadDefaultDeploymentDescriptorFolderContents();
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jst.j2ee.internal.ui.IJavaEEDeploymentAssemblySectionBuilder#saveContents()
+ */
+ public boolean saveContents(){
+ boolean success = true;
+ if (shouldDisplaySection()){
+ success = saveDefaultDeploymentDescriptorFolderContents();
+ loadContents();
+ }
+ return success;
+ }
+
+
+ private void loadDefaultDeploymentDescriptorFolderContents(){
+ resourceMappingsList.clear();
+ // First, retrieve all the mappings to root. Assume there are no duplicated mappings.
+ IPath[] allRootMappings = findAllRootMappings();
+ // Now, see if any of that is tagged as default root mapping
+ IVirtualFolder rootFolder = rootComponent.getRootFolder();
+ IPath defaultDDFolder = J2EEModuleVirtualComponent.getDefaultDeploymentDescriptorFolder(rootFolder);
+
+ currentSelectedDDFolder = defaultDDFolder == null?null:defaultDDFolder.toString();
+
+ for (IPath mapping:allRootMappings){
+ resourceMappingsList.add(mapping.toString());
+ }
+
+ updateSourceMappingsCombo(currentSelectedDDFolder, resourceMappingsList);
+ }
+
+
+ private List<String> filterMappings(List <String> mappings){
+ Set<String> mappingWithDD = new HashSet<String>();
+ Set<String> mappingWithFolder = new HashSet<String>();
+
+ IProject project = this.rootComponent.getProject();
+ for (String mapping :mappings){
+ if (fileToLook != null && !fileToLook.equals("")){ //$NON-NLS-1$
+ IFile ddFile = project.getFile(new Path(mapping).addTrailingSeparator() + fileToLook);
+ if (ddFile != null && ddFile.exists()){
+ mappingWithDD.add(mapping);
+ }
+ }
+ if (folderToLook != null && !folderToLook.equals("")){ //$NON-NLS-1$
+ IFolder ddFolder = project.getFolder(new Path(mapping).addTrailingSeparator() + folderToLook);
+ if (ddFolder != null && ddFolder.exists()){
+ mappingWithFolder.add(mapping);
+ }
+ }
+ }
+ if (!mappingWithDD.isEmpty()){
+ // return only the mappings that contain a DD file.
+ return new ArrayList<String>(mappingWithDD);
+ }
+ return new ArrayList<String>(mappingWithFolder);
+ }
+
+ private void updateSourceMappingsCombo(String selectedDDFolder, List<String> resourceMappings) {
+
+ List<String> filteredMappings = filterMappings(resourceMappings);
+
+ ArrayList<String> tmpList = new ArrayList<String>(filteredMappings);
+ if (selectedDDFolder == null){
+ tmpList.add(0, Messages.J2EEModuleDependenciesPropertyPage_ADVANCED_NODEFAULTDDFOLDER);
+ }
+ rootSourceMappings.setItems(tmpList.toArray(new String[]{}));
+ if (selectedDDFolder == null){
+ //No tagged source folder, so select "None"
+ rootSourceMappings.select(tmpList.indexOf(Messages.J2EEModuleDependenciesPropertyPage_ADVANCED_NODEFAULTDDFOLDER));
+ }
+ else {
+ rootSourceMappings.select(tmpList.indexOf(selectedDDFolder.toString()));
+ }
+ }
+
+ private boolean saveDefaultDeploymentDescriptorFolderContents(){
+ if (currentSelectedDDFolder != null){
+ IVirtualFolder rootFolder = rootComponent.getRootFolder();
+ J2EEModuleVirtualComponent.setDefaultDeploymentDescriptorFolder(rootFolder, new Path(currentSelectedDDFolder), null);
+ }
+ return true;
+ }
+
+ private IPath[] findAllRootMappings(){
+
+ StructureEdit structureEdit = null;
+ try {
+ structureEdit = StructureEdit.getStructureEditForRead(rootComponent.getProject());
+ WorkbenchComponent component = structureEdit.getComponent();
+ Object[] arr = component.getResources().toArray();
+ Set <IPath> result = new LinkedHashSet<IPath>();
+ for( int i = 0; i < arr.length; i++ ){
+ ComponentResource resource = (ComponentResource)arr[i];
+ if (resource.getRuntimePath().equals(IVirtualComponent.ROOT) && !ResourceMappingFilterExtensionRegistry.shouldFilter(resource.getSourcePath())){
+ result.add(((ComponentResource)arr[i]).getSourcePath());
+ }
+ }
+ return result.toArray(new IPath[]{});
+ } catch (NullPointerException e) {
+ J2EEUIPlugin.logError(e);
+ } finally {
+ if(structureEdit != null)
+ structureEdit.dispose();
+ }
+ return new IPath[]{};
+ }
+
+ protected boolean shouldDisplaySection(){
+ return shouldDisplaySection;
+ }
+
+ /*
+ * Creates the Advanced section. Returns the composite to which all the other
+ * widgets should be added.
+ */
+ private Composite createAdvancedSection(Composite parent){
+
+ // Build the expandable composite
+ ExpandableComposite excomposite = new ExpandableComposite(parent, SWT.NONE, ExpandableComposite.TWISTIE
+ | ExpandableComposite.CLIENT_INDENT | ExpandableComposite.COMPACT);
+ excomposite.setText(Messages.J2EEModuleDependenciesPropertyPage_ADVANCED);
+ excomposite.setExpanded(false);
+ excomposite.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
+ excomposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, 1, 1));
+ excomposite.addExpansionListener(new ExpansionAdapter() {
+ @Override
+ public void expansionStateChanged(ExpansionEvent e) {
+ expandedStateChanged((ExpandableComposite) e.getSource());
+ }
+ });
+
+ // Build the composite has the contents of the expandable widget
+ Composite innerComposite = new Composite(excomposite, SWT.NONE);
+ excomposite.setClient(innerComposite);
+ GridLayout gl = new GridLayout(2, false);
+ gl.marginHeight = 0;
+ gl.marginWidth = 0;
+ innerComposite.setLayout(gl);
+ return innerComposite;
+ }
+
+ private void addDefaultDeploymentDescriptorFolderFields(Composite parent) {
+ defaulDDFolderLabel = new Label(parent, SWT.NONE);
+ defaulDDFolderLabel.setText(Messages.J2EEModuleDependenciesPropertyPage_ADVANCED_DDFOLDER);
+ rootSourceMappings = new Combo(parent, SWT.READ_ONLY);
+ rootSourceMappings.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ rootSourceMappings.addSelectionListener(this);
+ }
+
+
+ private final void expandedStateChanged(ExpandableComposite expandable) {
+ // Get the scrolled composite of the deployment assembly page, and the child
+ // composite of this scrolled composite that contains the expandable composite
+ Composite[] composites = getCompositesToResize(expandable);
+ ScrolledComposite parentScrolledComposite = (ScrolledComposite)composites[0];
+ Composite childComposite = composites[1];
+ if (parentScrolledComposite != null && childComposite != null) {
+ parentScrolledComposite.layout(true, true);
+ // Resize the scrolled composite so the scroll bars are shown if necessary
+ parentScrolledComposite.setMinSize(childComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT, true));
+
+ }
+ }
+
+ /*
+ * Returns an array of composites used to resize the deployment assembly page
+ * when the advanced section is expanded.
+ * The first element is the scrolled composite (instance of ScrolledComposite) of the
+ * deployment assembly page
+ * The second element is the composite with the contents of the deployment assembly page
+ */
+ private Composite[] getCompositesToResize(Control control) {
+ Control parent = control.getParent();
+ Control previousParent = null;
+ Composite[] result = new Composite[2];
+ while (!(parent instanceof ScrolledComposite) && parent != null) {
+ previousParent = parent;
+ parent = parent.getParent();
+ }
+ if (parent instanceof ScrolledComposite) {
+ result[0] = (ScrolledComposite)parent;
+ }
+ if (previousParent instanceof Composite) {
+ result[1] = (Composite)previousParent;
+ }
+ return result;
+ }
+
+ public void directiveAdded(Object element) {
+ if (shouldDisplaySection()){
+ if (!(element instanceof TaskModel))
+ return;
+ TaskModel model = (TaskModel)element;
+ final Object folderMapping = model.getObject(IReferenceWizardConstants.FOLDER_MAPPING);
+ if( folderMapping != null && folderMapping instanceof ComponentResourceProxy){
+ ComponentResourceProxy proxy = (ComponentResourceProxy)folderMapping;
+ //if ((proxy.runtimePath.equals(IVirtualComponent.ROOT) && !resourceMappingsList.contains(proxy.source.toString()))){
+ if ((proxy.runtimePath.equals(IVirtualComponent.ROOT))){
+ resourceMappingsList.add(proxy.source.toString());
+ updateSourceMappingsCombo(currentSelectedDDFolder, resourceMappingsList);
+ }
+ }
+ }
+ }
+
+ public void directiveRemoved(Object element) {
+ if (shouldDisplaySection()){
+ if( element instanceof ComponentResourceProxy){
+ ComponentResourceProxy proxy = (ComponentResourceProxy)element;
+ if (proxy.runtimePath.equals(IVirtualComponent.ROOT)){
+ String proxySource = proxy.source.toString();
+ if (resourceMappingsList.contains(proxySource)){
+ resourceMappingsList.remove(proxySource);
+ if (proxySource.equals(currentSelectedDDFolder)){
+ currentSelectedDDFolder = null;
+ }
+ updateSourceMappingsCombo(currentSelectedDDFolder, resourceMappingsList);
+ }
+ }
+ }
+ }
+ }
+
+ public void widgetDefaultSelected(SelectionEvent event) {
+ // Intentionally left blank
+
+ }
+
+ public void widgetSelected(SelectionEvent event) {
+ if (event.getSource() == rootSourceMappings){
+ String tmp = rootSourceMappings.getText();
+ if (tmp != null){
+ if (tmp.equals(Messages.J2EEModuleDependenciesPropertyPage_ADVANCED_NODEFAULTDDFOLDER) && currentSelectedDDFolder == null){
+ // Do nothing, because the value did not change.
+ return;
+ }
+ if (tmp.equals(Messages.J2EEModuleDependenciesPropertyPage_ADVANCED_NODEFAULTDDFOLDER)){
+ // This means the user selected None, but there was already a value selected (this should not happen)
+ J2EEUIPlugin.logWarning("Unexpected condition when validating deployment descriptor folder"); //$NON-NLS-1$
+ return;
+ }
+ // We now the user selected something different from None, so remove this item so it cannot be selected again
+ if (rootSourceMappings.indexOf(Messages.J2EEModuleDependenciesPropertyPage_ADVANCED_NODEFAULTDDFOLDER) != -1)
+ rootSourceMappings.remove(Messages.J2EEModuleDependenciesPropertyPage_ADVANCED_NODEFAULTDDFOLDER);
+ // Only refresh if changing from None to a folder
+ boolean shouldRefresh = (currentSelectedDDFolder == null);
+ if (!tmp.equals(currentSelectedDDFolder)){
+ currentSelectedDDFolder = tmp;
+ if (shouldRefresh)
+ page.refresh();
+ }
+ }
+ }
+
+ }
+
+ public IStatus validate(IStatus currentStatus) {
+ IStatus status = currentStatus!=null?currentStatus:Status.OK_STATUS;
+ if (shouldDisplaySection()){
+ if (currentSelectedDDFolder == null && resourceMappingsList.size()>1){
+ // Only show the warning if none of the root mappings is selected and there are more than 1 root mapping
+ int severity = Status.WARNING;
+ status = appendStatusMessage(status, Messages.J2EEModuleDependenciesPropertyPage_ADVANCED_NODEFAULTDDFOLDERWARNING, severity);
+ }
+ }
+ return status;
+ }
+ private IStatus appendStatusMessage(IStatus existingStatus, String message, int severity) {
+ MultiStatus multiStatus;
+ IStatus newStatus = new Status(severity, J2EEUIPlugin.PLUGIN_ID, message);
+ int newSeverity = severity;
+ if(existingStatus.getSeverity() > severity)
+ newSeverity = existingStatus.getSeverity();
+ if(existingStatus instanceof MultiStatus){
+ multiStatus = (MultiStatus)existingStatus;
+ multiStatus.merge(newStatus);
+ } else {
+ if(!existingStatus.isMultiStatus() && existingStatus.isOK()) {
+ return newStatus;
+ }
+ IStatus [] children = new IStatus [] {existingStatus, newStatus};
+ multiStatus = new MultiStatus(J2EEUIPlugin.PLUGIN_ID, newSeverity, children, null, null);
+ }
+ return multiStatus;
+ }
+
+ public void componentResourceModified(ComponentResourceProxy originalResource, ComponentResourceProxy modifiedResource) {
+ if (shouldDisplaySection()){
+ // We are interested only in two cases:
+ // 1. When the deploy path changes from / to any other thing...
+ if (originalResource.runtimePath.isRoot() && !modifiedResource.runtimePath.isRoot()){
+ resourceMappingsList.remove(originalResource.source.toString());
+ if (originalResource.source.toString().equals(currentSelectedDDFolder)){
+ currentSelectedDDFolder = null;
+ }
+ updateSourceMappingsCombo(currentSelectedDDFolder, resourceMappingsList);
+ page.refresh();
+ }
+ // 2. When the deploy path changes from any thing to /
+ else if (!originalResource.runtimePath.isRoot() && modifiedResource.runtimePath.isRoot()){
+ resourceMappingsList.add(originalResource.source.toString());
+ updateSourceMappingsCombo(currentSelectedDDFolder, resourceMappingsList);
+ page.refresh();
+ }
+ }
+ }
+}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/Messages.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/Messages.java
index 649a90c..9e1b485 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/Messages.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/Messages.java
@@ -17,6 +17,10 @@
public static String J2EEModuleDependenciesPropertyPage_4;
public static String J2EEModuleDependenciesPropertyPage_5;
public static String J2EEModuleDependenciesPropertyPage_6;
+ public static String J2EEModuleDependenciesPropertyPage_ADVANCED;
+ public static String J2EEModuleDependenciesPropertyPage_ADVANCED_DDFOLDER;
+ public static String J2EEModuleDependenciesPropertyPage_ADVANCED_NODEFAULTDDFOLDER;
+ public static String J2EEModuleDependenciesPropertyPage_ADVANCED_NODEFAULTDDFOLDERWARNING;
static {
// initialize resource bundle
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/messages.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/messages.properties
index 8890bd3..87c77fd 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/messages.properties
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/messages.properties
@@ -2,8 +2,8 @@
J2EEDependencyPageProvider_1=EJB Deployment Assembly
J2EEDependencyPageProvider_2=Application Client Deployment Assembly
J2EEDependencyPageProvider_3=Connector Deployment Assembly
-J2EEDependencyPageProvider_4=Deployment Assembly
-J2EEDependencyPageProvider_5=Manifest Entries
+J2EEDependencyPageProvider_4=Deplo&yment Assembly
+J2EEDependencyPageProvider_5=&Manifest Entries
J2EEModuleDependenciesPropertyPage_0=Add EJB Module Folder...
J2EEModuleDependenciesPropertyPage_1=Add App Client Module Folder...
J2EEModuleDependenciesPropertyPage_2=Add Connector Module Folder...
@@ -11,4 +11,8 @@
J2EEModuleDependenciesPropertyPage_4=Assemble packaging structure for this Application Client project
J2EEModuleDependenciesPropertyPage_5=Assemble packaging structure for this Connector project
J2EEModuleDependenciesPropertyPage_6=Derived References
+J2EEModuleDependenciesPropertyPage_ADVANCED=Advanced
+J2EEModuleDependenciesPropertyPage_ADVANCED_DDFOLDER=Folder for deplo&yment descriptor:
+J2EEModuleDependenciesPropertyPage_ADVANCED_NODEFAULTDDFOLDER=(None)
+J2EEModuleDependenciesPropertyPage_ADVANCED_NODEFAULTDDFOLDERWARNING=A deployment descriptor folder should be selected. See the Advanced section.
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/EarModuleDependenciesPropertyPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/EarModuleDependenciesPropertyPage.java
index 2817a44..f08563f 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/EarModuleDependenciesPropertyPage.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/EarModuleDependenciesPropertyPage.java
@@ -1,5 +1,5 @@
/******************************************************************************
- * Copyright (c) 2009 Red Hat, IBM
+ * Copyright (c) 2009, 2011 Red Hat, IBM
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
* Contributors:
* Rob Stryker - initial implementation and ongoing maintenance
* Chuck Bridgham - additional support
+ * Roberto Sanchez - Add Advanced section
******************************************************************************/
package org.eclipse.jst.j2ee.internal.ui.preferences;
@@ -17,9 +18,14 @@
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.fieldassist.ControlDecoration;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
import org.eclipse.jst.j2ee.application.internal.operations.AddReferenceToEnterpriseApplicationDataModelProvider;
import org.eclipse.jst.j2ee.application.internal.operations.RemoveReferenceFromEnterpriseApplicationDataModelProvider;
import org.eclipse.jst.j2ee.internal.J2EEConstants;
@@ -29,8 +35,10 @@
import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.ui.JavaEEComponentDependencyContentProvider;
+import org.eclipse.jst.j2ee.internal.ui.IJavaEEDeploymentAssemblySectionBuilder;
import org.eclipse.jst.j2ee.internal.ui.J2EEModuleDependenciesPropertyPage.ClasspathEntryProxy;
+import org.eclipse.jst.j2ee.internal.ui.JavaEEComponentDependencyContentProvider;
+import org.eclipse.jst.j2ee.internal.ui.JavaEEDeploymentAssemblyAdvancedSectionBuilder;
import org.eclipse.jst.j2ee.model.IEARModelProvider;
import org.eclipse.jst.j2ee.model.ModelProviderManager;
import org.eclipse.jst.j2ee.project.EarUtilities;
@@ -38,6 +46,7 @@
import org.eclipse.jst.javaee.application.Application;
import org.eclipse.jst.jee.project.facet.EarCreateDeploymentFilesDataModelProvider;
import org.eclipse.jst.jee.project.facet.ICreateDeploymentFilesDataModelProperties;
+import org.eclipse.jst.jee.util.internal.JavaEEQuickPeek;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -47,14 +56,17 @@
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.wst.common.componentcore.internal.IModuleHandler;
import org.eclipse.wst.common.componentcore.internal.impl.TaskModel;
+import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
import org.eclipse.wst.common.componentcore.ui.internal.propertypage.ComponentDependencyContentProvider;
import org.eclipse.wst.common.componentcore.ui.internal.propertypage.DependencyPageExtensionManager;
import org.eclipse.wst.common.componentcore.ui.internal.propertypage.DependencyPageExtensionManager.ReferenceExtension;
+import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.TaskWizard;
import org.eclipse.wst.common.componentcore.ui.propertypage.AddModuleDependenciesPropertiesPage;
import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants;
import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants.ProjectConverterOperationProvider;
@@ -68,9 +80,15 @@
AddModuleDependenciesPropertiesPage {
private String libDir = null;
private Text libDirText;
+ private ControlDecoration libDirTextErrorDecoration = null;
+ private static String earDefaultLirDir = new Path(J2EEConstants.EAR_DEFAULT_LIB_DIR).makeRelative().toString();
+ boolean previousLibDirIsValid = true;
+ private IJavaEEDeploymentAssemblySectionBuilder advancedHelper;
+
public EarModuleDependenciesPropertyPage(IProject project,
ModuleAssemblyRootPage page) {
super(project, page);
+ advancedHelper = getAdvancedSectionBuilder();
}
@Override
@@ -81,6 +99,7 @@
fillTableComposite(composite);
if(JavaEEProjectUtilities.isJEEComponent(rootComponent, JavaEEProjectUtilities.DD_VERSION) && JavaEEProjectUtilities.isJEEComponent(rootComponent, JavaEEProjectUtilities.FACET_VERSION))
addLibDirComposite(composite);
+ addAdvancedComposite(composite);
}
private String loadLibDirString() {
@@ -102,17 +121,66 @@
l.setText(Messages.EarModuleDependenciesPropertyPage_LIBDIR);
libDirText = new Text(c, SWT.BORDER);
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- libDirText.setLayoutData(gd);
+ gd.horizontalIndent = FieldDecorationRegistry.getDefault().getMaximumDecorationWidth();
libDirText.setText(libDir);
+ libDirText.setLayoutData(gd);
+ libDirTextErrorDecoration = new ControlDecoration(libDirText, SWT.TOP | SWT.LEAD);
+ libDirTextErrorDecoration.hide();
libDirText.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
libDirTextModified();
} });
+ new Label(parent, SWT.NONE); //Place holder to fill the second column
}
}
protected void libDirTextModified() {
+ boolean refresh = mustRefreshLibDirValidationMessages(libDir, libDirText.getText());
libDir = libDirText.getText();
+ if(refresh)
+ propPage.refreshProblemsView();
+ }
+
+ protected boolean mustRefreshLibDirValidationMessages(String oldLibDir, String newLibDir) {
+ boolean newIsValid = isValidLibDir(newLibDir);
+ boolean newIsEmpty = (newLibDir != null && newLibDir.trim().length() == 0);
+ // Both are valid; no need to refresh
+ if(previousLibDirIsValid && newIsValid && !newIsEmpty)
+ return false;
+ boolean oldIsValid = isValidLibDir(oldLibDir);
+ boolean oldIsEmpty = (oldLibDir != null && oldLibDir.trim().length() == 0);
+ // Both are invalid and no change in reason for being invalid; no need to refresh
+ if(!previousLibDirIsValid && oldIsValid == newIsValid && oldIsEmpty == newIsEmpty)
+ return false;
+ return true;
+ }
+
+ protected void validatelibDirText() {
+ if(libDirTextErrorDecoration != null) {
+ if(!isValidLibDir(libDir)) {
+ libDirTextErrorDecoration.setImage(FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_ERROR).getImage());
+ libDirTextErrorDecoration.setDescriptionText(Messages.EarModuleDependenciesPropertyPage_ERROR_INVALID_LIBDIR);
+ libDirTextErrorDecoration.show();
+ previousLibDirIsValid = false;
+ }else if(libDir != null && libDir.trim().length() == 0){
+ libDirTextErrorDecoration.setImage(FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_WARNING).getImage());
+ libDirTextErrorDecoration.setDescriptionText(Messages.EarModuleDependenciesPropertyPage_WARNING_EMPTY_LIB_DIR);
+ libDirTextErrorDecoration.show();
+ previousLibDirIsValid = false;
+ } else if(!previousLibDirIsValid){
+ previousLibDirIsValid = true;
+ libDirTextErrorDecoration.setImage(null);
+ libDirTextErrorDecoration.setDescriptionText(null);
+ libDirTextErrorDecoration.hide();
+ }
+ }
+ }
+
+ private boolean isValidLibDir(String libraryDirectory) {
+ if(libraryDirectory != null && libraryDirectory.trim().length() > 0 && new Path(libraryDirectory.trim()).isAbsolute()) {
+ return false;
+ }
+ return true;
}
protected IDataModelOperation generateEARDDOperation() {
@@ -162,7 +230,7 @@
@Override
protected void filterReferenceTypes( final List<ReferenceExtension> extensions )
{
- // Replace the default one with our own custom one, in class CustomWebProjectReferenceWizardFragment
+ // Replace the default one with our own custom one, in class CustomEARProjectReferenceWizardFragment
for( int i = 0, n = extensions.size(); i < n; i++ )
{
@@ -196,11 +264,13 @@
boolean result = super.performOk();
if(JavaEEProjectUtilities.isJEEComponent(rootComponent, JavaEEProjectUtilities.DD_VERSION) && JavaEEProjectUtilities.isJEEComponent(rootComponent, JavaEEProjectUtilities.FACET_VERSION) && libDir != null)
updateLibDir();
+ if (advancedHelper != null)
+ result = result & advancedHelper.saveContents();
return result;
}
private void updateLibDir() {
- if (!libDir.equals(J2EEConstants.EAR_DEFAULT_LIB_DIR)) {
+ if (!libDir.equals(earDefaultLirDir)) {
IVirtualFile vFile = rootComponent.getRootFolder().getFile(new Path(J2EEConstants.APPLICATION_DD_URI));
if (!vFile.exists()) {
if (!MessageDialog.openQuestion(null,
@@ -214,7 +284,7 @@
final IEARModelProvider earModel = (IEARModelProvider)ModelProviderManager.getModelProvider(project);
Application app = (Application)earModel.getModelObject();
String oldLibDir = app.getLibraryDirectory();
- if (libDir.equals(J2EEConstants.EAR_DEFAULT_LIB_DIR)) {
+ if (libDir.equals(earDefaultLirDir)) {
if(oldLibDir != null) {
earModel.modify(new Runnable() {
public void run() {
@@ -264,4 +334,124 @@
return super.canRemove(selectedObject) && !(selectedObject instanceof JavaEEComponentDependencyContentProvider.ConsumedClasspathEntryProxy);
}
+ @Override
+ protected void remove(Object selectedItem) {
+ super.remove(selectedItem);
+ advancedHelper.directiveRemoved(selectedItem);
+ }
+
+ @Override
+ public IStatus validate() {
+ IStatus status = super.validate();
+ validatelibDirText();
+ if(libDirTextErrorDecoration != null && libDirTextErrorDecoration.getImage() != null) {
+ int severity = Status.ERROR;
+ if(libDirTextErrorDecoration.getImage().equals(FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_WARNING).getImage()))
+ severity = Status.WARNING;
+ status = appendStatusMessage(status, libDirTextErrorDecoration.getDescriptionText(), severity);
+ }
+ status = advancedHelper.validate(status);
+ return status;
+ }
+
+ @Override
+ public void performDefaults() {
+ libDir = loadLibDirString();
+ if(libDir != null)
+ libDirText.setText(libDir);
+ if (advancedHelper != null)
+ advancedHelper.loadContents();
+ super.performDefaults();
+ }
+
+ private IStatus appendStatusMessage(IStatus existingStatus, String message, int severity) {
+ MultiStatus multiStatus;
+ IStatus newStatus = new Status(severity, J2EEUIPlugin.PLUGIN_ID, message);
+ int newSeverity = severity;
+ if(existingStatus.getSeverity() > severity)
+ newSeverity = existingStatus.getSeverity();
+ if(existingStatus instanceof MultiStatus){
+ multiStatus = (MultiStatus)existingStatus;
+ multiStatus.merge(newStatus);
+ } else {
+ if(!existingStatus.isMultiStatus() && existingStatus.isOK()) {
+ return newStatus;
+ }
+ IStatus [] children = new IStatus [] {existingStatus, newStatus};
+ multiStatus = new MultiStatus(J2EEUIPlugin.PLUGIN_ID, newSeverity, children, null, null);
+ }
+ return multiStatus;
+ }
+
+ @Override
+ protected void handleAddDirective( final TaskWizard wizard )
+ {
+ final Object folderMapping = wizard.getTaskModel().getObject(IReferenceWizardConstants.FOLDER_MAPPING);
+
+ if( folderMapping != null && folderMapping instanceof ComponentResourceProxy || libDir == null)
+ {
+ super.handleAddDirective(wizard);
+ }
+ else
+ {
+ Object reference = wizard.getTaskModel().getObject(IReferenceWizardConstants.FINAL_REFERENCE);
+
+ if( reference != null )
+ {
+ IVirtualReference[] referenceArray = reference instanceof IVirtualReference ?
+ new IVirtualReference[] { (IVirtualReference)reference } :
+ (IVirtualReference[])reference;
+ for(int i = 0; i < referenceArray.length; i++) {
+ IVirtualComponent component = referenceArray[i].getReferencedComponent();
+ if(component instanceof VirtualArchiveComponent) {
+ JavaEEQuickPeek qp = JavaEEBinaryComponentHelper.getJavaEEQuickPeek(component);
+ switch (qp.getType()) {
+ case JavaEEQuickPeek.EJB_TYPE:
+ case JavaEEQuickPeek.WEB_TYPE:
+ case JavaEEQuickPeek.APPLICATION_CLIENT_TYPE:
+ case JavaEEQuickPeek.CONNECTOR_TYPE:
+ referenceArray[i].setRuntimePath(new Path("/")); //$NON-NLS-1$
+ }
+ }
+ currentReferences.add(referenceArray[i]);
+ }
+ }
+ }
+ advancedHelper.directiveAdded(wizard.getTaskModel());
+ }
+
+ protected void addAdvancedComposite(Composite parent) {
+ if (advancedHelper != null) {
+ advancedHelper.buildSection(parent);
+ advancedHelper.loadContents();
+ }
+ }
+
+ protected IJavaEEDeploymentAssemblySectionBuilder getAdvancedSectionBuilder(){
+ if (advancedHelper == null){
+ advancedHelper = new JavaEEDeploymentAssemblyAdvancedSectionBuilder(rootComponent, this);
+ }
+ return advancedHelper;
+ }
+
+ @Override
+ protected RuntimePathCellModifier getRuntimePathCellModifier() {
+ return new AddModuleDependenciesPropertiesPage.RuntimePathCellModifier(){
+ @Override
+ public void modify(Object element, String property, Object value) {
+ ComponentResourceProxy originalResource = null;
+ ComponentResourceProxy modifiedResource = null;
+ if (property.equals(DEPLOY_PATH_PROPERTY)) {
+ TreeItem item = (TreeItem) element;
+ if( item.getData() instanceof ComponentResourceProxy) {
+ modifiedResource = (ComponentResourceProxy)item.getData();
+ originalResource = new ComponentResourceProxy(modifiedResource.source, modifiedResource.runtimePath);
+ }
+ }
+ super.modify(element, property, value);
+ if (originalResource != null && advancedHelper != null)
+ advancedHelper.componentResourceModified(originalResource, modifiedResource);
+ }
+ };
+ }
}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/Messages.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/Messages.java
index 3feab37..2118439 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/Messages.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/Messages.java
@@ -9,6 +9,8 @@
public static String EarModuleDependenciesPropertyPage_2;
public static String EarModuleDependenciesPropertyPage_3;
public static String EarModuleDependenciesPropertyPage_LIBDIR;
+ public static String EarModuleDependenciesPropertyPage_ERROR_INVALID_LIBDIR;
+ public static String EarModuleDependenciesPropertyPage_WARNING_EMPTY_LIB_DIR;
public static String EarModuleDependencyPageProvider_0;
public static String WebDependencyPropertyPage_0;
public static String WebDependencyPropertyPage_1;
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/messages.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/messages.properties
index 1ec9c38..c839fb5 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/messages.properties
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/messages.properties
@@ -3,6 +3,8 @@
EarModuleDependenciesPropertyPage_2=Edit Ear Module Reference...
EarModuleDependenciesPropertyPage_3=Define packaging structure for this Java EE Application project.
EarModuleDependenciesPropertyPage_LIBDIR=EAR &library directory:
+EarModuleDependenciesPropertyPage_ERROR_INVALID_LIBDIR=Library directory value cannot begin with a slash character. Specify as relative path to the root of the project.
+EarModuleDependenciesPropertyPage_WARNING_EMPTY_LIB_DIR=An empty library directory field indicates that no library directory will be used when creating the class paths! Set the value to 'lib' to use the default library directory.
EarModuleDependencyPageProvider_0=Ear Module Assembly
WebDependencyPropertyPage_0=Add Web Library Reference...
WebDependencyPropertyPage_1=Define packaging structure for this Java EE Web Application project.
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentFacetCreationWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentFacetCreationWizardPage.java
index af0b673..ddea293 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentFacetCreationWizardPage.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentFacetCreationWizardPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
+ * Copyright (c) 2003, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -20,18 +20,26 @@
import java.util.Arrays;
import java.util.List;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
+import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetProjectCreationDataModelProperties;
import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
import org.eclipse.jst.j2ee.ui.project.facet.EarSelectionPanel;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetCreationWizardPage;
public abstract class J2EEComponentFacetCreationWizardPage extends DataModelFacetCreationWizardPage {
@@ -101,18 +109,129 @@
@Override
public void restoreDefaultSettings() {
+ //get the values from the selected EAR to restore.
+ IProject selectedEARProject = getSelectedEAR();
+ if (selectedEARProject != null){
+ restoreEARName(selectedEARProject);
+ restoreEARRuntime(selectedEARProject);
+ } else{
+ restoreStoredLabelEARName();
+ }
super.restoreDefaultSettings();
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- String lastEARName = settings.get(STORE_LABEL);
- if (lastEARName != null){
- FacetDataModelMap map = (FacetDataModelMap)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- String facetID = getModuleFacetID();
- IDataModel j2eeModel = map.getFacetDataModel(facetID);
- j2eeModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.LAST_EAR_NAME, lastEARName);
- }
+ }
+
+ /* Restore the EAR Name from the user selected EAR if there is any
+ * @param earName
+ */
+ private void restoreEARName(IProject earProject){
+ String earName = earProject.getName();
+ if (earName != null){
+ setEarName(earName, false);
+ }
+ }
+
+ /* Restore the EAR Name from the last created EAR Project
+ */
+ private void restoreStoredLabelEARName(){
+ IDialogSettings settings = getDialogSettings();
+ String earName = settings.get(STORE_LABEL);
+ if (earName != null){
+ setEarName(earName, true); //last ear created, old behavior
+ }
+ }
+
+ /* Sets the EAR Name to the the J2ee model and model
+ * @param String EAR Project Name
+ * @param boolean specifying if only the LAST_EAR_NAME property should be updated.
+ */
+ private void setEarName(String earName, boolean lastEAROnly) {
+ if (earName != null){
+ FacetDataModelMap map = (FacetDataModelMap)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
+ String facetID = getModuleFacetID();
+ IDataModel j2eeModel = map.getFacetDataModel(facetID);
+ j2eeModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.LAST_EAR_NAME, earName);
+ if (!lastEAROnly)
+ j2eeModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME, earName);
+
}
}
+
+ /* Sets the Runtime to the J2EE model and common model
+ * @param IProject
+ */
+ public void restoreEARRuntime(IProject proj) {
+ FacetDataModelMap map = (FacetDataModelMap)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
+ String facetID = getModuleFacetID();
+ IDataModel j2eeModel = map.getFacetDataModel(facetID);
+ IRuntime currentRuntime = getTargetRuntime(proj);
+ if (currentRuntime != null){
+ j2eeModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.RUNTIME_TARGET_ID, currentRuntime);
+ model.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, currentRuntime);
+ }
+
+ }
+
+ /* Gets the Runtime from the user selected EAR if there is any
+ * @param IRuntime
+ */
+ public static IRuntime getTargetRuntime(IProject project) {
+ IFacetedProject fProject = null;
+ try {
+ fProject = ProjectFacetsManager.create(project);
+ } catch (CoreException ex) {
+ J2EEUIPlugin.logError(ex);
+ }
+ if(fProject != null)
+ return fProject.getRuntime() ;
+ return null;
+ }
+
+ /*
+ * Gets the EAR Name selected on the view (ActivePart).
+ * @return IProject or null if there is nothing selected.
+ */
+ private IProject getSelectedEAR(){
+ IProject retVal = null;
+ ISelection selection = getSelectionFromWorkbenchWindow();
+ if (selection instanceof IStructuredSelection) {
+ IProject selProject = getEARProjectFromSelection((IStructuredSelection)selection);
+ if (selProject != null){
+ if (JavaEEProjectUtilities.isEARProject(selProject)) {
+ retVal = selProject;
+ }
+ }
+ }
+ return retVal;
+ }
+
+ /*
+ * Gets the Selection from Workbench Window.
+ * @return ISelection
+ */
+ private ISelection getSelectionFromWorkbenchWindow() {
+ IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ ISelection selection = window.getSelectionService().getSelection();
+ return selection;
+ }
+
+
+ /*
+ * Extract the first element selected and checks for an EAR Project
+ * @param IStructuredSelection selection
+ * @return IProject EAR or null if there is Not selected EAR project.
+ */
+ private IProject getEARProjectFromSelection(IStructuredSelection selection) {
+ if (selection != null){
+ if (!selection.isEmpty()){
+ Object firstSelectedElement = selection.getFirstElement();
+ if (firstSelectedElement instanceof IProject) {
+ return (IProject)firstSelectedElement;
+
+ }
+ }
+ }
+ return null;
+ }
@Override
protected IDialogSettings getDialogSettings() {
@@ -127,6 +246,7 @@
arrayList.addAll( list );
arrayList.add( IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME );
arrayList.add( IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR );
+ arrayList.add( IJ2EEFacetProjectCreationDataModelProperties.FACET_RUNTIME);
return (String[])arrayList.toArray( new String[0] );
}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEImportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEImportPage.java
index 61f7a51..f21049d 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEImportPage.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEImportPage.java
@@ -159,7 +159,7 @@
// setup browse button
Button browseButton = new Button(parent, SWT.PUSH);
browseButton.setText(defBrowseButtonLabel);
- browseButton.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
+ browseButton.setLayoutData((new GridData(GridData.HORIZONTAL_ALIGN_END)));
browseButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportPageNew.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportPageNew.java
index 0e6b96e..3253110 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportPageNew.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportPageNew.java
@@ -160,7 +160,7 @@
linkedPathCheckbox.setText(" "); //$NON-NLS-1$
final Text linkedPathText = new Text(checkboxGroup, SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
linkedPathText.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_5")); //$NON-NLS-1$
- linkedPathText.setEnabled(getDataModel().isPropertyEnabled(IJ2EEUtilityJarListImportDataModelProperties.CREATE_LINKED_PATH_VARIABLE));
+ linkedPathText.setEnabled(true);
getDataModel().addListener(new IDataModelListener() {
public void propertyChanged(DataModelEvent event) {
diff --git a/plugins/org.eclipse.jst.j2ee.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.ui/plugin.xml
index 322f8e6..434a90c 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/plugin.xml
+++ b/plugins/org.eclipse.jst.j2ee.ui/plugin.xml
@@ -839,4 +839,18 @@
</referenceFragment>
</extension>
+ <extension point="org.eclipse.wst.common.modulecore.ui.deploymentAssemblyVerifier">
+ <verifier
+ class="org.eclipse.wst.common.componentcore.ui.internal.propertypage.verifier.DefaultDeploymentAssemblyVerifier">
+ <runtime runtime_server_id="org.eclipse.wst.common.modulecore.ui.deploymentAssemblyVerifier.anyruntime"/>
+ <component component_type="jst.ear"/>
+ <component component_type="jst.ejb"/>
+ <component component_type="jst.web"/>
+ <component component_type="jst.webfragment"/>
+ <component component_type="jst.connector"/>
+ <component component_type="jst.appclient"/>
+ <component component_type="jst.utility"/>
+ </verifier>
+ </extension>
+
</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ui.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ui.properties
index 0a79c34..7e16333 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ui.properties
+++ b/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ui.properties
@@ -168,7 +168,7 @@
J2EEUtilityJarImportPage_UI_2=Available utility JARs directory
J2EEUtilityJarImportPage_UI_3=&External JAR directory:
J2EEUtilityJarImportPage_UI_4=Linked path variable
-J2EEUtilityJarImportPage_UI_5=&Make these imported files team-shareable by creating or re-using a linked path variable (LPV). Select an existing LPV or type a new name to create one to the directory above. Other teammates should define this value through Window > Preferences | Workbench > Linked Resources. This option is only available for linked imports.
+J2EEUtilityJarImportPage_UI_5=Make these imported files team-shareable by creating or re-using a linked path variable (LPV). Select an existing LPV or type a new name to create one to the directory above. Other teammates should define this value through Window > Preferences | Workbench > Linked Resources. This option is only available for linked imports.
J2EEUtilityJarImportPage_UI_6=Over&write existing resources (projects and archives)
J2EEUtilityJarImportPage_UI_7=Select Utility Jar:
J2EEUtilityJarImportPage.0=Use Existing Linked Path Variable
diff --git a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
index 2ab0a0f..a0750e0 100644
--- a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Web Plug-in
Bundle-SymbolicName: org.eclipse.jst.j2ee.web; singleton:=true
-Bundle-Version: 1.1.403.qualifier
+Bundle-Version: 1.1.405.qualifier
Bundle-Activator: org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
@@ -20,7 +20,7 @@
org.eclipse.jst.j2ee.web.datamodel.properties,
org.eclipse.jst.j2ee.web.project.facet,
org.eclipse.jst.j2ee.web.validation
-Require-Bundle: org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
+Require-Bundle: org.eclipse.jst.j2ee;bundle-version="[1.1.406,1.2.0)",
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
@@ -39,7 +39,7 @@
org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jst.common.annotations.controller;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.wst.common.modulecore;bundle-version="[1.2.7,2.0.0)",
org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.java
index e7a9d3e..1646bc1 100644
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.java
+++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.java
@@ -99,7 +99,10 @@
if (webType == null) {
return null;
} else if (webType.isJspType()) {
- resource = ((IProject) resource).getFile(((JSPType) webType).getJspFile());
+ if (component != null) {
+ IPath jspFilePath = new Path(((JSPType) webType).getJspFile());
+ resource = component.getRootFolder().getUnderlyingFolder().getFile(jspFilePath);
+ }
} else if (webType.isServletType()) {
return new WebResource(getModule(resource.getProject(), component), new Path("servlet/" + ((ServletType) webType).getClassName())); //$NON-NLS-1$
}
@@ -136,7 +139,7 @@
return new WebResource(getModule(resource.getProject(), component), new Path("servlet/" + className)); //$NON-NLS-1$
}
- if (className == null) {
+ if (className == null && component != null) {
WebArtifactEdit webEdit = null;
try {
webEdit = WebArtifactEdit.getWebArtifactEditForRead(component);
@@ -146,8 +149,9 @@
WebType type = servlet.getWebType();
if (type.isJspType()) {
JSPType jsp = (JSPType)type;
- String jspPath = resource.getProjectRelativePath().removeFirstSegments(1).toString();
- if (jsp.getJspFile().equals(jspPath)) {
+ IPath rootPath = component.getRootFolder().getProjectRelativePath();
+ IPath jspPath = resource.getProjectRelativePath().removeFirstSegments(rootPath.segmentCount());
+ if (jsp.getJspFile().equals(jspPath.makeAbsolute().toString())) {
List mappings = servlet.getMappings();
String mapping = null;
if (mappings != null && !mappings.isEmpty()) {
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddFilterOperation.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddFilterOperation.java
index 54f99cb..331dae4 100644
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddFilterOperation.java
+++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddFilterOperation.java
@@ -159,8 +159,8 @@
WebApp webApp = (WebApp) modelObject;
webApp.getFilters().add(filter);
return filter;
- } else if (modelObject instanceof org.eclipse.jst.javaee.web.WebApp) {
- org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) modelObject;
+ } else if (modelObject instanceof org.eclipse.jst.javaee.web.IWebCommon) {
+ org.eclipse.jst.javaee.web.IWebCommon webApp = (org.eclipse.jst.javaee.web.IWebCommon) modelObject;
org.eclipse.jst.javaee.web.Filter filter = WebFactory.eINSTANCE.createFilter();
DisplayName displayNameObj = JavaeeFactory.eINSTANCE.createDisplayName();
displayNameObj.setValue(displayName);
@@ -229,7 +229,7 @@
filter.getInitParams().add(ip);
}
}
- } else if (modelObject instanceof org.eclipse.jst.javaee.web.WebApp) {
+ } else if (modelObject instanceof org.eclipse.jst.javaee.web.IWebCommon) {
org.eclipse.jst.javaee.web.Filter filter = (org.eclipse.jst.javaee.web.Filter) filterObj;
for (int iP = 0; iP < initParamList.size(); iP++) {
@@ -307,8 +307,8 @@
// Add the filter mapping to the web application modelled list
webApp.getFilterMappings().add(mapping);
}
- } else if (modelObject instanceof org.eclipse.jst.javaee.web.WebApp) {
- org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) modelObject;
+ } else if (modelObject instanceof org.eclipse.jst.javaee.web.IWebCommon) {
+ org.eclipse.jst.javaee.web.IWebCommon webApp = (org.eclipse.jst.javaee.web.IWebCommon) modelObject;
org.eclipse.jst.javaee.web.Filter filter = (org.eclipse.jst.javaee.web.Filter) filterObj;
// Create the filter mapping instance from the web factory
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddListenerOperation.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddListenerOperation.java
index 54fec93..98afadf 100644
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddListenerOperation.java
+++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddListenerOperation.java
@@ -105,13 +105,13 @@
WebApp webApp = (WebApp) modelObject;
webApp.getListeners().add(listener);
return listener;
- } else if (modelObject instanceof org.eclipse.jst.javaee.web.WebApp ){
+ } else if (modelObject instanceof org.eclipse.jst.javaee.web.IWebCommon ){
// Create the listener instance and set up the parameters from data model
org.eclipse.jst.javaee.core.Listener listener = JavaeeFactory.eINSTANCE.createListener();
listener.setListenerClass(qualifiedClassName);
// Add the listener to the web application model
- org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) modelObject;
+ org.eclipse.jst.javaee.web.IWebCommon webApp = (org.eclipse.jst.javaee.web.IWebCommon) modelObject;
webApp.getListeners().add(listener);
return listener;
}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewListenerClassDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewListenerClassDataModelProvider.java
index 587928c..e509fd0 100644
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewListenerClassDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewListenerClassDataModelProvider.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.jst.j2ee.internal.web.operations;
+
import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.INTERFACES;
import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_ACTIVATION_LISTENER;
import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_ATTRIBUTE_LISTENER;
@@ -19,6 +20,7 @@
import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_CONTEXT_LISTENER;
import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_LISTENER;
import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_REQUEST_LISTENER;
+import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS;
import java.util.List;
@@ -102,10 +104,11 @@
*/
@Override
public IStatus validate(String propertyName) {
- if (propertyName.equals(INTERFACES)) {
- return validateListeners();
- }
-
+ if (propertyName.equals(INTERFACES)){
+ if (!getBooleanProperty(USE_EXISTING_CLASS)) {
+ return validateListeners();
+ }
+ }
// Otherwise defer to super to validate the property
return super.validate(propertyName);
}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainer.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainer.java
index 4c45cd7..e499cfd 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainer.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainer.java
@@ -19,7 +19,11 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jdt.core.IClasspathContainer;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
@@ -27,8 +31,10 @@
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jst.common.internal.modulecore.ClasspathContainerVirtualComponent;
import org.eclipse.jst.common.jdt.internal.classpath.FlexibleProjectContainer;
+import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.common.componentcore.internal.builder.IDependencyGraph;
import org.eclipse.wst.common.componentcore.internal.resources.VirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
@@ -42,6 +48,8 @@
extends FlexibleProjectContainer
{
+ private WebAppLibrariesStore.RestoreState restoreState;
+
private static final IPath[] paths
= new IPath[] { new Path( "WEB-INF/lib" ), //$NON-NLS-1$
new Path( "WEB-INF/classes" ) }; //$NON-NLS-1$
@@ -56,6 +64,25 @@
final IJavaProject jproject )
{
super( path, jproject, getProject( path, jproject), paths, types );
+ boolean needToVerify = false;
+ if(null != restoreState){
+ synchronized (restoreState) {
+ needToVerify = restoreState.needToVerify;
+ restoreState.needToVerify = false;
+ }
+ }
+ if(needToVerify){
+ Job verifyJob = new Job(Resources.verify){
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ WebAppLibrariesContainer.this.refresh(false);
+ return Status.OK_STATUS;
+ }
+ };
+ verifyJob.setSystem(true);
+ verifyJob.setRule(ResourcesPlugin.getWorkspace().getRoot());
+ verifyJob.schedule();
+ }
}
public String getDescription()
@@ -83,8 +110,46 @@
}
@Override
+ public boolean isOutOfDate() {
+ if(IDependencyGraph.INSTANCE.isStale()){
+ //avoid deadlock https://bugs.eclipse.org/bugs/show_bug.cgi?id=334050
+ //if the data is stale, return true and attempt to update again in the near future
+ J2EEComponentClasspathUpdater.getInstance().queueUpdate(owner.getProject());
+ return true;
+ }
+
+ final List currentEntries = computeClasspathEntries(false);
+ boolean outOfDate = ! this.entries.equals( currentEntries );
+ if(outOfDate){
+ WebAppLibrariesStore.flush(project.getName());
+ }
+ return outOfDate;
+ }
+
+ @Override
+ public void refresh(boolean forceUpdate){
+ if(IDependencyGraph.INSTANCE.isStale()){
+ //avoid deadlock https://bugs.eclipse.org/bugs/show_bug.cgi?id=334050
+ //if the data is stale abort and attempt to update again in the near future
+ J2EEComponentClasspathUpdater.getInstance().queueUpdate(owner.getProject());
+ return;
+ }
+
+ if(forceUpdate || isOutOfDate()){
+ refresh();
+ }
+ }
+
+ @Override
public void refresh()
{
+ if(IDependencyGraph.INSTANCE.isStale()){
+ //avoid deadlock https://bugs.eclipse.org/bugs/show_bug.cgi?id=335645
+ //if the data is stale abort and attempt to update again in the near future
+ J2EEComponentClasspathUpdater.getInstance().queueUpdate(owner.getProject());
+ return;
+ }
+
( new WebAppLibrariesContainer( this.path, this.owner ) ).install();
}
@@ -116,6 +181,17 @@
@Override
protected List computeClasspathEntries() {
+ return computeClasspathEntries(true);
+ }
+
+ protected List computeClasspathEntries(boolean useRestoreState) {
+ if(useRestoreState){
+ restoreState = WebAppLibrariesStore.getRestoreState(project.getName());
+ if(restoreState != null){
+ return restoreState.paths;
+ }
+ }
+
List <IPath>entries = super.computeClasspathEntries();
if(consumedReferences != null){
for(IVirtualReference ref:consumedReferences){
@@ -136,6 +212,7 @@
}
}
}
+ WebAppLibrariesStore.saveState(project.getName(), entries);
return entries;
}
@@ -157,6 +234,7 @@
{
public static String label;
public static String labelWithProject;
+ public static String verify;
static
{
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainer.properties b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainer.properties
index cbdcc18..5768a0e 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainer.properties
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainer.properties
@@ -9,4 +9,5 @@
# IBM Corporation - initial API and implementation
###############################################################################
label = Web App Libraries
-labelWithProject = Web App Libraries [{0}]
\ No newline at end of file
+labelWithProject = Web App Libraries [{0}]
+verify = Verify Web App Libraries
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesStore.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesStore.java
new file mode 100644
index 0000000..316f919
--- /dev/null
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesStore.java
@@ -0,0 +1,245 @@
+package org.eclipse.jst.j2ee.internal.web.classpath;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.ISafeRunnable;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.SafeRunner;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
+
+public class WebAppLibrariesStore {
+
+ private static final String WEB_LIBRARIES_CACHE = "webLibrariesCache.index"; //$NON-NLS-1$
+ private static Map<String, RestoreState> restoreStateMap;
+ private static Map<String, RestoreState> saveStateMap = new HashMap<String, RestoreState>();
+
+ static class RestoreState implements Serializable {
+ private static final long serialVersionUID = 5565856269776724522L;
+ transient boolean needToVerify;
+ List<String> pathStrings;
+ transient List<IPath> paths;
+
+ private void writeObject(java.io.ObjectOutputStream out) throws IOException {
+ pathStrings = new ArrayList<String>(paths.size());
+ for (IPath p : paths) {
+ pathStrings.add(p.toString());
+ }
+ out.defaultWriteObject();
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
+ in.defaultReadObject();
+ needToVerify = true;
+ paths = new ArrayList<IPath>(pathStrings.size());
+ for (String s : pathStrings) {
+ paths.add(new Path(s));
+ }
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ } else if (o == null) {
+ return false;
+ } else if (o instanceof RestoreState) {
+ RestoreState other = (RestoreState) o;
+ if (paths == null) {
+ return other.paths == null;
+ }
+ return paths.equals(other.paths);
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ if (paths == null) {
+ return 11;
+ }
+ return paths.hashCode();
+ }
+ }
+
+ static {
+ IPath stateLocation = WebPlugin.getDefault().getStateLocation();
+ java.io.File file = stateLocation.append(WEB_LIBRARIES_CACHE).toFile();
+ try{
+ if (file.exists()) {
+ FileInputStream fIn = null;
+ boolean deleteCache = true;
+ try {
+ fIn = new FileInputStream(file);
+ BufferedInputStream bIn = new BufferedInputStream(fIn);
+ ObjectInputStream oIn = new ObjectInputStream(bIn);
+ restoreStateMap = (HashMap<String, RestoreState>) oIn.readObject();
+ oIn.close();
+
+ //it is unfortunate this is necessary, but without iterating over the map
+ //and explicitly testing each value, class cast exceptions may occur later
+ //best to check them all now and recover
+ Iterator<Entry<String, RestoreState>> iterator = restoreStateMap.entrySet().iterator();
+ while(iterator.hasNext()){
+ Entry<String, RestoreState> next = iterator.next();
+ String s = next.getKey();
+ RestoreState rs = next.getValue();
+ if(s == null || rs == null){
+ //may throw ClassCastException
+ }
+ }
+ deleteCache = false;
+ } catch (FileNotFoundException e) {
+ WebPlugin.logError(e);
+ } catch (IOException e) {
+ WebPlugin.logError(e);
+ } catch (ClassNotFoundException e) {
+ WebPlugin.logError(e);
+ } catch (ClassCastException e) {
+ WebPlugin.logError(e);
+ } finally {
+ if (fIn != null) {
+ try {
+ fIn.close();
+ } catch (IOException e) {
+ WebPlugin.logError(e);
+ }
+ }
+ if (deleteCache) {
+ restoreStateMap = new HashMap<String, RestoreState>();
+ file.delete();
+ }
+ }
+ }
+ } catch (Throwable e){
+ try{
+ WebPlugin.logError(e);
+ file.delete();
+ } catch (Exception e2){
+ //eat it
+ }
+ restoreStateMap = new HashMap<String, RestoreState>();
+ } finally {
+ if(restoreStateMap == null) {
+ restoreStateMap = new HashMap<String, RestoreState>();
+ }
+ }
+
+ }
+
+ public static RestoreState getRestoreState(String projectName) {
+ RestoreState restoreState = null;
+ synchronized (restoreStateMap) {
+ restoreState = restoreStateMap.get(projectName);
+ }
+ if (restoreState != null) {
+ synchronized (saveStateMap) {
+ saveStateMap.put(projectName, restoreState);
+ }
+ }
+ return restoreState;
+ }
+
+ static void flush(String projectName) {
+ synchronized (restoreStateMap) {
+ restoreStateMap.remove(projectName);
+ }
+ synchronized (saveStateMap) {
+ saveStateMap.remove(projectName);
+ }
+ }
+
+ private static class PersistJob extends Job {
+
+ public PersistJob() {
+ super("Persist Web App Libraries State"); //$NON-NLS-1$
+ setSystem(true);
+ setRule(null);
+ }
+
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ SafeRunner.run(new ISafeRunnable() {
+ public void run() throws Exception {
+ persist();
+ }
+
+ public void handleException(Throwable exception) {
+ WebPlugin.logError(exception);
+ }
+ });
+ return Status.OK_STATUS;
+ }
+ }
+
+ private static int persistDelay = 60000; // 1 minute
+ private static PersistJob persistJob = new PersistJob();
+
+ static void saveState(String projectName, List<IPath> paths) {
+ RestoreState toSave = new RestoreState();
+ toSave.paths = paths;
+
+ boolean scheduleJob = false;
+
+ synchronized (saveStateMap) {
+ RestoreState previous = saveStateMap.get(projectName);
+ if (null == previous || !previous.equals(toSave)) {
+ saveStateMap.put(projectName, toSave);
+ scheduleJob = true;
+ }
+ }
+ if (scheduleJob) {
+ synchronized (restoreStateMap) {
+ // if it changed, do not load it from the cache again
+ restoreStateMap.remove(projectName);
+ }
+ persistJob.schedule(persistDelay);
+ }
+ }
+
+ private static void persist() {
+ synchronized (saveStateMap) {
+ IPath stateLocation = WebPlugin.getDefault().getStateLocation();
+ java.io.File file = stateLocation.append(WEB_LIBRARIES_CACHE).toFile();
+ FileOutputStream fOut = null;
+ try {
+ fOut = new FileOutputStream(file);
+ BufferedOutputStream bOut = new BufferedOutputStream(fOut);
+ ObjectOutputStream oOut = new ObjectOutputStream(bOut);
+ oOut.writeObject(saveStateMap);
+ oOut.close();
+ } catch (FileNotFoundException e) {
+ WebPlugin.logError(e);
+ } catch (IOException e) {
+ WebPlugin.logError(e);
+ } finally {
+ if (fOut != null) {
+ try {
+ fOut.close();
+ } catch (IOException e) {
+ WebPlugin.logError(e);
+ }
+ }
+ }
+ }
+ }
+
+}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java
index 2b32330..b696c7b 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java
@@ -13,10 +13,13 @@
import java.util.List;
import java.util.Set;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.jst.common.project.facet.core.JavaFacetInstallConfig.ChangeEvent;
+import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
import org.eclipse.jst.j2ee.internal.J2EEConstants;
import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
@@ -26,6 +29,10 @@
import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
import org.eclipse.jst.j2ee.internal.project.ProjectSupportResourceHandler;
import org.eclipse.jst.j2ee.project.facet.J2EEModuleFacetInstallDataModelProvider;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.ModuleCoreNature;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
@@ -56,6 +63,24 @@
@Override
public Object getDefaultProperty(String propertyName) {
if (propertyName.equals(CONFIG_FOLDER)) {
+ if (model.isPropertySet(FACET_PROJECT_NAME))
+ {
+ String projectName = model.getStringProperty(FACET_PROJECT_NAME);
+ IProject project = (projectName.length() > 0) ? ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) : null;
+
+ if (project != null && project.exists()) {
+ if (ModuleCoreNature.isFlexibleProject(project))
+ {
+ IVirtualComponent c = ComponentCore.createComponent(project, true);
+ IVirtualFolder ejbroot = c.getRootFolder();
+ IPath configFolderPath = J2EEModuleVirtualComponent.getDefaultDeploymentDescriptorFolder(ejbroot);
+ if (configFolderPath != null && project.getFolder(configFolderPath).exists())
+ {
+ return configFolderPath.toString();
+ }
+ }
+ }
+ }
return J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.WEB_CONTENT_FOLDER);
} else if (propertyName.equals(SOURCE_FOLDER)) {
return J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.DYN_WEB_SRC_FOLDER);
@@ -88,6 +113,9 @@
model.notifyPropertyChange(CONTEXT_ROOT, IDataModel.ENABLE_CHG);
} else if (FACET_PROJECT_NAME.equals(propertyName)) {
model.notifyPropertyChange(CONTEXT_ROOT, IDataModel.VALID_VALUES_CHG);
+ if (!model.isPropertySet(CONFIG_FOLDER)) {
+ model.notifyPropertyChange(CONFIG_FOLDER, IDataModel.DEFAULT_CHG);
+ }
} else if (propertyName.equals(CONFIG_FOLDER)) {
return true;
} else if (propertyName.equals(SOURCE_FOLDER))
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java
index f241213..0a57b65 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java
@@ -1,5 +1,5 @@
/******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
+ * Copyright (c) 2005, 2011 BEA Systems, Inc. and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
*
* Contributors:
* Konstantin Komissarchik - initial API and implementation
+ * Roberto Sanchez (IBM) - Set default deployment descriptor folder
******************************************************************************/
package org.eclipse.jst.j2ee.web.project.facet;
@@ -33,6 +34,7 @@
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jst.common.project.facet.WtpUtils;
import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
+import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
import org.eclipse.jst.j2ee.internal.J2EEConstants;
import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainer;
@@ -102,8 +104,11 @@
setOutputFolder(model, c);
final IVirtualFolder webroot = c.getRootFolder();
- if (webroot.getProjectRelativePath().equals(new Path("/"))) //$NON-NLS-1$
- webroot.createLink(new Path("/" + model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER)), 0, null); //$NON-NLS-1$
+ if (webroot.getProjectRelativePath().equals(new Path("/"))){ //$NON-NLS-1$
+ Path configFolderPath = new Path(model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER));
+ webroot.createLink(configFolderPath, 0, null);
+ J2EEModuleVirtualComponent.setDefaultDeploymentDescriptorFolder(webroot, configFolderPath, null);
+ }
if( fv == WebFacetUtils.WEB_30 )
{
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetInstallDelegate.java
index b4d3e7a..f80f02f 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetInstallDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetInstallDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
+ * Copyright (c) 2010, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,6 +29,7 @@
import org.eclipse.jem.util.emf.workbench.WorkbenchByteArrayOutputStream;
import org.eclipse.jst.common.project.facet.WtpUtils;
import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
+import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
import org.eclipse.jst.j2ee.internal.J2EEConstants;
import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
import org.eclipse.jst.j2ee.internal.project.ManifestFileCreationAction;
@@ -55,6 +56,7 @@
final IVirtualFolder jsrc = c.getRootFolder();
final IJavaProject jproj = JavaCore.create(project);
final IClasspathEntry[] cp = jproj.getRawClasspath();
+ IPath firstPath = null;
for (int i = 0; i < cp.length; i++) {
final IClasspathEntry cpe = cp[i];
@@ -64,8 +66,12 @@
path = new Path("/"); //$NON-NLS-1$
}
jsrc.createLink(path, 0, null);
+ if (firstPath == null){
+ firstPath = path;
+ }
}
}
+ J2EEModuleVirtualComponent.setDefaultDeploymentDescriptorFolder(jsrc, firstPath, null);
final IVirtualFolder root = c.getRootFolder();
IContainer container = null;
if (root.getProjectRelativePath().segmentCount() == 0) {
diff --git a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
index b363cc1..0df7b72 100644
--- a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.jst.j2ee; singleton:=true
-Bundle-Version: 1.1.403.qualifier
+Bundle-Version: 1.1.406.qualifier
Bundle-Activator: org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
@@ -71,7 +71,7 @@
org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.2.1,2.0.0)";visibility:=reexport,
+ org.eclipse.wst.common.modulecore;bundle-version="[1.2.7,2.0.0)";visibility:=reexport,
org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
org.eclipse.jst.common.annotations.controller;bundle-version="[1.1.0,1.2.0)",
org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDataModelProvider.java
index 6193a4a..999b6b5 100644
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDataModelProvider.java
@@ -12,13 +12,21 @@
import java.util.Set;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.ModuleCoreNature;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
public class AppClientFacetInstallDataModelProvider extends J2EEModuleFacetInstallDataModelProvider implements IAppClientFacetInstallDataModelProperties {
@@ -41,7 +49,27 @@
else if (propertyName.equals(CREATE_DEFAULT_MAIN_CLASS))
return Boolean.TRUE;
else if (propertyName.equals(CONFIG_FOLDER))
+ {
+ if (model.isPropertySet(FACET_PROJECT_NAME))
+ {
+ String projectName = model.getStringProperty(FACET_PROJECT_NAME);
+ IProject project = (projectName.length() > 0) ? ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) : null;
+
+ if (project != null && project.exists()) {
+ if (ModuleCoreNature.isFlexibleProject(project))
+ {
+ IVirtualComponent c = ComponentCore.createComponent(project, true);
+ IVirtualFolder ejbroot = c.getRootFolder();
+ IPath configFolderPath = J2EEModuleVirtualComponent.getDefaultDeploymentDescriptorFolder(ejbroot);
+ if (configFolderPath != null && project.getFolder(configFolderPath).exists())
+ {
+ return configFolderPath.toString();
+ }
+ }
+ }
+ }
return J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.APP_CLIENT_CONTENT_FOLDER);
+ }
else if (propertyName.equals(MODULE_URI)) {
String projectName = model.getStringProperty(FACET_PROJECT_NAME).replace(' ','_');
return projectName + IJ2EEModuleConstants.JAR_EXT;
@@ -72,7 +100,13 @@
this.javaFacetInstallConfig.setSourceFolder( sourceFolder );
}
}
-
+ else if (FACET_PROJECT_NAME.equals(propertyName))
+ {
+ if (!model.isPropertySet(CONFIG_FOLDER)) {
+ model.notifyPropertyChange(CONFIG_FOLDER, IDataModel.DEFAULT_CHG);
+ }
+ }
+
return super.propertySet(propertyName, propertyValue);
}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java
index 6d48e6f..46ab1bf 100644
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -31,6 +31,7 @@
import org.eclipse.jst.common.project.facet.WtpUtils;
import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
+import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
import org.eclipse.jst.j2ee.internal.J2EEConstants;
import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainer;
@@ -106,7 +107,9 @@
IFolder sourceFolder = null;
String configFolder = null;
configFolder = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER);
- root.createLink(new Path("/" + configFolder), 0, null); //$NON-NLS-1$
+ Path configFolderPath = new Path(configFolder);
+ root.createLink(configFolderPath, 0, null);
+ J2EEModuleVirtualComponent.setDefaultDeploymentDescriptorFolder(root, configFolderPath, null);
String configFolderName = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER);
IPath configFolderpath = pjpath.append(configFolderName);
sourceFolder = ws.getRoot().getFolder(configFolderpath);
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEArchiveUtilities.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEArchiveUtilities.java
index cbe4950..9b79c05 100644
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEArchiveUtilities.java
+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEArchiveUtilities.java
@@ -39,6 +39,7 @@
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
import org.eclipse.jst.j2ee.project.EarUtilities;
import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
+import org.eclipse.jst.j2ee.project.WebUtilities;
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
import org.eclipse.jst.jee.archive.ArchiveModelLoadException;
import org.eclipse.jst.jee.archive.ArchiveOpenFailureException;
@@ -248,6 +249,7 @@
archiveOptions.setOption(JavaEEArchiveUtilities.DISCRIMINATE_JAVA_EE, Boolean.TRUE);
}
IArchive parentEARArchive = null;
+ boolean foundParentArchive = false;
try {
if (JavaEEProjectUtilities.usesJavaEEComponent(virtualComponent)
&& ((J2EEModuleVirtualArchiveComponent) virtualComponent).isLinkedToEAR()) {
@@ -263,6 +265,7 @@
if(earComponent != null) {
parentEARArchive = openArchive(earComponent);
if(parentEARArchive != null) {
+ foundParentArchive = true;
archiveOptions.setOption(ArchiveOptions.PARENT_ARCHIVE, parentEARArchive);
IFacetedProject facetedProject = ProjectFacetsManager.create(earProject);
if (facetedProject != null) {
@@ -278,6 +281,12 @@
org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.logError(e);
}
}
+ if(!foundParentArchive && JavaEEProjectUtilities.usesJavaEEComponent(virtualComponent)){
+ IProject webProject = virtualComponent.getProject();
+ if(webProject != null && WebUtilities.isDynamicWebProject(webProject)){
+ archiveOptions.setOption(DISCRIMINATE_MAIN_CLASS, false);
+ }
+ }
return openArchive(archiveOptions);
} finally {
if (parentEARArchive != null){
@@ -362,6 +371,10 @@
}
private IArchive refineForJavaEE(final IArchive simpleArchive) {
+ boolean isNestedWithinEar5OrAbove = false;
+ String earLibDirectory = null;
+ String defaultEARLibDir = new Path(J2EEConstants.EAR_DEFAULT_LIB_DIR).makeRelative().toString();
+
//Check to see if this archive is actually being opened as a nested archive from within an EAR
//if it is then the EAR's DD needs to be checked to see exactly what type of archive this is.
if (simpleArchive.getArchiveOptions().hasOption(ArchiveOptions.PARENT_ARCHIVE)) {
@@ -383,7 +396,10 @@
int definedType = J2EEVersionConstants.UNKNOWN;
if(archivePath != null) {
if (qp.getVersion() == JavaEEQuickPeek.JEE_5_0_ID || qp.getVersion() == JavaEEQuickPeek.JEE_6_0_ID) {
+ isNestedWithinEar5OrAbove = true;
org.eclipse.jst.javaee.application.Application app = (org.eclipse.jst.javaee.application.Application) ddObj;
+ // If lib directory is not specified in deployment descriptor, use the default
+ earLibDirectory = app.getLibraryDirectory() == null? defaultEARLibDir : app.getLibraryDirectory();
org.eclipse.jst.javaee.application.Module module = app.getFirstModule(archivePath.toString());
//if the archive isn't found, do a smart search for it
if(module == null){
@@ -415,6 +431,9 @@
module = app.getFirstModule(stringPath);
}
}
+ if(module == null) {
+ module = getModuleFromURI(app, archivePath.toString());
+ }
if (null != module) {
if (module.isEjbModule()) {
definedType = J2EEVersionConstants.EJB_TYPE;
@@ -509,7 +528,12 @@
org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.logError(e);
}
}
- }
+ else {
+ //Parent EAR does not have deployment descriptor, so it is not legacy
+ isNestedWithinEar5OrAbove = true;
+ earLibDirectory = defaultEARLibDir;
+ }
+ }
}
IPath archivePath = simpleArchive.getPath();
if (archivePath == null) {
@@ -542,8 +566,11 @@
wrapArchive(simpleArchive, new Path(J2EEConstants.WEBAPP_DD_URI));
return simpleArchive;
} else if (lastSegment.endsWith(IJ2EEModuleConstants.JAR_EXT)) {
+ String libPath = null == archivePath ? null : archivePath.removeLastSegments(1).toPortableString();
+ // Do not look for main class in manifest.mf if jar is on lib directory of EAR 5 or above
+ boolean skipDiscriminateMainClass = isNestedWithinEar5OrAbove && earLibDirectory!= null && earLibDirectory.equals(libPath);
Object discriminateMainClass = simpleArchive.getArchiveOptions().getOption(DISCRIMINATE_MAIN_CLASS);
- if (null == discriminateMainClass || ((Boolean) discriminateMainClass).booleanValue()) {
+ if (!skipDiscriminateMainClass && (null == discriminateMainClass || ((Boolean) discriminateMainClass).booleanValue())) {
IPath manifestPath = new Path(J2EEConstants.MANIFEST_URI);
if (simpleArchive.containsArchiveResource(manifestPath)) {
InputStream in = null;
@@ -589,6 +616,21 @@
return simpleArchive;
}
+
+ private org.eclipse.jst.j2ee.application.Module getModuleFromURI(org.eclipse.jst.j2ee.application.Application app, String uri) {
+ if(uri == null)
+ return null;
+ String archiveName = (new Path(uri)).lastSegment();
+ List<org.eclipse.jst.j2ee.application.internal.impl.ModuleImpl> modules = app.getModules();
+ for (org.eclipse.jst.j2ee.application.internal.impl.ModuleImpl curModule : modules ){
+ if(curModule != null && curModule.getUri() != null) {
+ if(new Path(curModule.getUri()).lastSegment().equals(archiveName)) {
+ return curModule;
+ }
+ }
+ }
+ return null;
+ }
/**
* This method checks for the existence of deployment descriptors to
@@ -625,13 +667,15 @@
int WAR_INDEX = 2;
int EJB_INDEX = 3;
int APP_CLIENT_INDEX = 4;
+ int WEB_FRAGMENT_INDEX = 5;
- DeploymentDescriptorCheck[] deploymentDescriptorsToCheck = new DeploymentDescriptorCheck[5];
+ DeploymentDescriptorCheck[] deploymentDescriptorsToCheck = new DeploymentDescriptorCheck[6];
deploymentDescriptorsToCheck[EAR_INDEX] = new DeploymentDescriptorCheck(J2EEConstants.APPLICATION_DD_URI, J2EEVersionConstants.APPLICATION_TYPE);
deploymentDescriptorsToCheck[RAR_INDEX] = new DeploymentDescriptorCheck(J2EEConstants.RAR_DD_URI, J2EEVersionConstants.CONNECTOR_TYPE);
deploymentDescriptorsToCheck[WAR_INDEX] = new DeploymentDescriptorCheck(J2EEConstants.WEBAPP_DD_URI, J2EEVersionConstants.WEB_TYPE);
deploymentDescriptorsToCheck[EJB_INDEX] = new DeploymentDescriptorCheck(J2EEConstants.EJBJAR_DD_URI, J2EEVersionConstants.EJB_TYPE);
deploymentDescriptorsToCheck[APP_CLIENT_INDEX] = new DeploymentDescriptorCheck(J2EEConstants.APP_CLIENT_DD_URI, J2EEVersionConstants.APPLICATION_CLIENT_TYPE);
+ deploymentDescriptorsToCheck[WEB_FRAGMENT_INDEX] = new DeploymentDescriptorCheck(J2EEConstants.WEBFRAGMENT_DD_URI, J2EEVersionConstants.WEBFRAGMENT_TYPE);
if (lastSegment != null) {
if (lastSegment.endsWith(IJ2EEModuleConstants.EAR_EXT)) {
@@ -658,6 +702,10 @@
if (wrappedForDD != null) {
return wrappedForDD;
}
+ wrappedForDD = deploymentDescriptorsToCheck[WEB_FRAGMENT_INDEX].wrapForDD(simpleArchive);
+ if (wrappedForDD != null) {
+ return wrappedForDD;
+ }
}
}
@@ -915,19 +963,20 @@
private boolean isInLibDir(IVirtualComponent earComp, IVirtualComponent component, String libDir){
- if (libDir != null) {
+ if (libDir != null && libDir.length() > 0) {
IVirtualReference earRef = earComp.getReference(component.getName());
+ IPath libDirPath = new Path(libDir).makeRelative();
if(earRef != null){
- if(libDir.equals(earRef.getRuntimePath().toString())){
+ if(libDirPath.equals(earRef.getRuntimePath().makeRelative())){
return true;
}
IPath fullPath = earRef.getRuntimePath().append(earRef.getArchiveName());
- if(fullPath.removeLastSegments(1).toString().equals(libDir)){
+ if(fullPath.removeLastSegments(1).makeRelative().equals(libDirPath)){
return true;
}
}
}
return false;
}
-
+
}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentImportOperation.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentImportOperation.java
index 300c784..e3422fe 100644
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentImportOperation.java
+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentImportOperation.java
@@ -147,10 +147,11 @@
}
IVirtualComponent component = (IVirtualComponent) importModel.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT);
String uri = nestedArchive.getPath().toString();
+ String absoluteUri = nestedArchive.getPath().makeAbsolute().toString();
String archiveName = nestedArchive.getPath().lastSegment().toString();
String deployPath = nestedArchive.getPath().removeLastSegments(1).makeAbsolute().toString();
- if(ddSpecifiedURIs.contains(uri)){
+ if(ddSpecifiedURIs.contains(uri) || ddSpecifiedURIs.contains(absoluteUri)){
componentToAddAsModules.add(component);
componentToURIMapAsModules.put(component, archiveName);
moduleDeployPathMap.put(component, deployPath);
diff --git a/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/classpathdep/ClasspathDependencyExtension.java b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/classpathdep/ClasspathDependencyExtension.java
new file mode 100644
index 0000000..4c46cae
--- /dev/null
+++ b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/classpathdep/ClasspathDependencyExtension.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jst.j2ee.classpathdep;
+
+
+/**
+ *
+ * This abstract class is used by extenders of the ClasspathDependencyExtension extension
+ *
+ */
+public abstract class ClasspathDependencyExtension implements IClasspathDependencyExtension
+{
+ // Left empty
+}
diff --git a/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/classpathdep/ClasspathDependencyUtil.java b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/classpathdep/ClasspathDependencyUtil.java
index f66813d..255a180 100644
--- a/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/classpathdep/ClasspathDependencyUtil.java
+++ b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/classpathdep/ClasspathDependencyUtil.java
@@ -17,7 +17,6 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -28,6 +27,7 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.emf.common.util.URI;
import org.eclipse.jdt.core.IClasspathAttribute;
+import org.eclipse.jdt.core.IClasspathContainer;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IPackageFragmentRoot;
@@ -316,6 +316,7 @@
// get the raw entries
final Map<IClasspathEntry, IClasspathAttribute> referencedRawEntries = getRawComponentClasspathDependencies(javaProjectLite, DependencyAttributeType.CLASSPATH_COMPONENT_DEPENDENCY, isLegacyJ2EE);
final Map<IClasspathEntry, IClasspathAttribute> validRawEntries = new HashMap<IClasspathEntry, IClasspathAttribute>();
+ final Map <IClasspathEntry, IClasspathAttribute> validRawClassPathContainerEntries = new HashMap <IClasspathEntry, IClasspathAttribute>();
// filter out non-valid referenced raw entries
final Iterator<IClasspathEntry> i = referencedRawEntries.keySet().iterator();
@@ -323,12 +324,19 @@
final IClasspathEntry entry = i.next();
final IClasspathAttribute attrib = referencedRawEntries.get(entry);
if (isValid(entry, attrib, isWebApp, javaProjectLite.getProject(), data)) {
- validRawEntries.put(entry, attrib);
+ if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER)
+ {
+ //Put in a separate map the classpath container entries, since they will be handled differently
+ validRawClassPathContainerEntries.put(entry, attrib);
+ }
+ else {
+ validRawEntries.put(entry, attrib);
+ }
}
}
// if we have no valid raw entries, return empty map
- if (validRawEntries.isEmpty()) {
+ if (validRawEntries.isEmpty() && validRawClassPathContainerEntries.isEmpty()) {
return Collections.emptyMap();
}
@@ -351,7 +359,9 @@
pathToResolvedEntry.put(entries[j].getPath(), entries[j]);
}
- final Map <IClasspathEntry, IClasspathAttribute> referencedEntries = new LinkedHashMap <IClasspathEntry, IClasspathAttribute>();
+ //Gather all resolved entries from the package roots and the classpath containers
+ final Map <IClasspathEntry, IClasspathAttribute> resolvedEntries = new LinkedHashMap <IClasspathEntry, IClasspathAttribute>();
+
// grab all IPackageFragmentRoots
@@ -360,6 +370,7 @@
// entry has the publish/export attribute)
//TODO this call to javaProject needs to be removed. Need to figure out what exactly this is attempting to do.
final IPackageFragmentRoot[] roots = javaProject.getPackageFragmentRoots();
+
for (IPackageFragmentRoot root : roots) {
final IClasspathEntry rawEntry = root.getRawClasspathEntry();
@@ -371,6 +382,27 @@
final IPath pkgFragPath = root.getPath();
final IClasspathEntry resolvedEntry = pathToResolvedEntry.get(pkgFragPath);
+ resolvedEntries.put(resolvedEntry, attrib);
+ }
+
+ // Add entries coming from classpath containers to the list of resolved entries
+ for (Map.Entry <IClasspathEntry, IClasspathAttribute> entry : validRawClassPathContainerEntries.entrySet()) {
+ IClasspathContainer classpathContainer = JavaCore.getClasspathContainer(entry.getKey().getPath(), javaProject);
+ if(classpathContainer != null)
+ {
+ IClasspathEntry[] classpathContainerEntries = classpathContainer.getClasspathEntries();
+ for (int j = 0; j < classpathContainerEntries.length; j++) {
+ resolvedEntries.put(classpathContainerEntries[j], entry.getValue());
+ }
+ }
+ }
+
+ //Setup the final result
+ final Map <IClasspathEntry, IClasspathAttribute> referencedEntries = new LinkedHashMap <IClasspathEntry, IClasspathAttribute>();
+ for (Map.Entry <IClasspathEntry, IClasspathAttribute> mapEntry : resolvedEntries.entrySet()) {
+ final IClasspathEntry resolvedEntry = mapEntry.getKey();
+ IClasspathAttribute attrib = mapEntry.getValue();
+
final IClasspathAttribute resolvedAttrib = checkForComponentDependencyAttribute(resolvedEntry, DependencyAttributeType.DEPENDENCY_OR_NONDEPENDENCY, isLegacyJ2EE);
// attribute for the resolved entry must either be unspecified or it must be the
// dependency attribute for it to be included
@@ -558,40 +590,44 @@
//not a WAR
//if part of EE5 or greature ear, map into the EAR's lib folder
IProject [] earProjects = EarUtilities.getReferencingEARProjects(virtualComponent.getProject());
- if(earProjects.length > 0){
+ if (earProjects.length > 0) {
IVirtualComponent earComponent = ComponentCore.createComponent(earProjects[0]);
- if(earComponent != null){
- String libDir = EarUtilities.getEARLibDir(earComponent);
- if(libDir != null){
- IVirtualReference [] refs = earComponent.getReferences();
- for(IVirtualReference ref : refs){
- if(virtualComponent.equals(ref.getReferencedComponent())){
- //find the specific reference to this component to locate its
- //relative path in the EAR to calculate the relative path from
- //it to the EAR's lib folder.
- IPath libDirPath = new Path(libDir).makeRelative();
- IPath runtimePath = ref.getRuntimePath().makeRelative();
- if(runtimePath.equals(libDirPath)){
- return RUNTIME_MAPPING_INTO_CONTAINER_PATH;
- }
-
- int segmentCount = runtimePath.segmentCount();
- IPath defaultRuntimePath = RUNTIME_MAPPING_INTO_CONTAINER_PATH;
- for(int i=0; i<segmentCount; i++){
- defaultRuntimePath = defaultRuntimePath.append(RUNTIME_MAPPING_INTO_CONTAINER_PATH);
- }
- defaultRuntimePath = defaultRuntimePath.append(libDir);
- return defaultRuntimePath;
- }
- }
- }
+ if (earComponent != null) {
+ return calculateDefaultRuntimePath(earComponent, virtualComponent);
}
}
-
return getDefaultRuntimePath(false, false);
}
+ public static IPath calculateDefaultRuntimePath(IVirtualComponent parentComponent, IVirtualComponent targetComponent) {
+ IVirtualReference targetRef = parentComponent.getReference(targetComponent.getName());
+ String libDir = EarUtilities.getEARLibDir(parentComponent);
+ if (libDir != null && libDir.length() > 0) {
+ IPath libDirPath = new Path(libDir);
+
+ // If project is at root level, go up a level and add lib dir path absolute path
+ if(targetRef == null || targetRef.getRuntimePath().equals("/")) //$NON-NLS-1$
+ return new Path(RUNTIME_MAPPING_INTO_CONTAINER).append(libDirPath.makeAbsolute());
+ IPath childProjectRuntimePath = targetRef.getRuntimePath();
+
+ String[] childProjectFolders = childProjectRuntimePath.segments();
+ String[] libFolders = libDirPath.segments();
+ int commonFolderCount = 0;
+ for(int i = 0; i < childProjectFolders.length; i++) {
+ if(i >= libFolders.length || !childProjectFolders[i].equals(libFolders[i]))
+ break;
+ commonFolderCount++;
+ }
+ String resultString = RUNTIME_MAPPING_INTO_CONTAINER;
+ for(int i = 0; i < childProjectFolders.length - commonFolderCount; i++) {
+ resultString += RUNTIME_MAPPING_INTO_CONTAINER;
+ }
+ return new Path(resultString).append(libDirPath.removeFirstSegments(commonFolderCount));
+ }
+ return getDefaultRuntimePath(false, false);
+ }
+
/**
* Retrieves the archive name for the specified classpath entry
* @param entry The entry.
diff --git a/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/classpathdep/IClasspathDependencyExtension.java b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/classpathdep/IClasspathDependencyExtension.java
new file mode 100644
index 0000000..8f8506a
--- /dev/null
+++ b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/classpathdep/IClasspathDependencyExtension.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jst.j2ee.classpathdep;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jdt.core.IClasspathEntry;
+
+/**
+ *
+ * This interface is used by extenders of the ClasspathDependencyExtension extension
+ *
+ */
+public interface IClasspathDependencyExtension
+{
+ /**
+ * An extender can indicate if it handles the exporting for a particular entry in a project.
+ *
+ * @param project the project containing the classpath entry
+ * @param entry the classpath entry
+ * @return returns true if this project will handle the exporting of the classpath entry.
+ */
+ public boolean projectHandlesExport( IProject project, IClasspathEntry entry );
+
+ /**
+ *
+ * @param project
+ * @param entry
+ * @return returns the value that the classpath attribute "org.eclipse.jst.component.dependency" should
+ * contain.
+ */
+ public String getClasspathdependencyAttribute( IProject project, IClasspathEntry entry );
+}
diff --git a/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/classpathdep/UpdateClasspathAttributeUtil.java b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/classpathdep/UpdateClasspathAttributeUtil.java
index f5692fc..d1af151 100644
--- a/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/classpathdep/UpdateClasspathAttributeUtil.java
+++ b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/classpathdep/UpdateClasspathAttributeUtil.java
@@ -79,7 +79,7 @@
return createDependencyAttribute(runtimePath.toString());
}
- private static IClasspathAttribute createDependencyAttribute(final String runtimePath) throws CoreException {
+ public static IClasspathAttribute createDependencyAttribute(final String runtimePath) throws CoreException {
return JavaCore.newClasspathAttribute(IClasspathDependencyConstants.CLASSPATH_COMPONENT_DEPENDENCY, runtimePath);
}
diff --git a/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/ClasspathDependencyEnablement.java b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/ClasspathDependencyEnablement.java
index f827ed9..981a02a 100644
--- a/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/ClasspathDependencyEnablement.java
+++ b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/ClasspathDependencyEnablement.java
@@ -13,19 +13,31 @@
import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
+/**
+ * @deprecated Do not use. The ALLOW_CLASSPATH_DEP preference has been deprecated and its ability to disable dynamic manifest updates will soon be removed.
+ */
public class ClasspathDependencyEnablement {
/**
* This flag is used to control the enablement of the Classpath Dependency
* functionality. The default value is true which enables this functionality.
* Setting this value to false will disable the functionality.
+ * @deprecated Do not use. The ALLOW_CLASSPATH_DEP preference has been deprecated and its ability to disable dynamic manifest updates will soon be removed.
*/
private static boolean allowClasspathComponentDependency = J2EEPlugin.getDefault().getPluginPreferences().getBoolean(J2EEPreferences.Keys.ALLOW_CLASSPATH_DEP);
+ /**
+ * @param allow
+ * @deprecated Do not use. The ALLOW_CLASSPATH_DEP preference has been deprecated and its ability to disable dynamic manifest updates will soon be removed.
+ */
public static void setAllowClasspathComponentDependency(boolean allow){
allowClasspathComponentDependency = allow;
}
+ /**
+ * @return
+ * @deprecated Do not use. The ALLOW_CLASSPATH_DEP preference has been deprecated and its ability to disable dynamic manifest updates will soon be removed.
+ */
public static boolean isAllowClasspathComponentDependency(){
return allowClasspathComponentDependency;
}
diff --git a/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/ClasspathDependencyExtensionManager.java b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/ClasspathDependencyExtensionManager.java
new file mode 100644
index 0000000..e6e2f20
--- /dev/null
+++ b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/ClasspathDependencyExtensionManager.java
@@ -0,0 +1,206 @@
+/*******************************************************************************
+ * Copyright (c) 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jst.j2ee.internal.classpathdep;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.expressions.EvaluationContext;
+import org.eclipse.core.expressions.EvaluationResult;
+import org.eclipse.core.expressions.Expression;
+import org.eclipse.core.expressions.ExpressionConverter;
+import org.eclipse.core.expressions.ExpressionTagNames;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyExtension;
+
+public class ClasspathDependencyExtensionManager
+{
+ private static ClasspathDependencyExtensionManager instance;
+ private List<ElementEntry> entries;
+
+ private ClasspathDependencyExtensionManager()
+ {
+ entries = new ArrayList<ElementEntry>();
+ }
+
+ public static ClasspathDependencyExtensionManager instance()
+ {
+ if( instance == null )
+ {
+ instance = new ClasspathDependencyExtensionManager();
+ instance.load();
+ }
+
+ return instance;
+ }
+
+ /**
+ *
+ * @param project the project
+ * @param entry the entry
+ * @return returns true if one extender indicates that it can handle this entry
+ */
+ public boolean doesProjectHandleExport( IProject project, IClasspathEntry entry )
+ {
+ boolean result = false;
+
+ // If one extender returns true we will return true for this call.
+ for( ElementEntry listEntry : entries )
+ {
+ if( listEntry.isEnabled( project ) )
+ {
+ IClasspathDependencyExtension extension = listEntry.getExtensionClass();
+
+ if( extension != null )
+ {
+ if( extension.projectHandlesExport( project, entry ) )
+ {
+ // We found an extension that says that it will handle the export for this entry.
+ result = true;
+ break;
+ }
+ }
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ *
+ * @param project the project
+ * @param entry the entry
+ * @return returns the dependency value from an extender.
+ */
+ public String getDependencyValue( IProject project, IClasspathEntry entry )
+ {
+ String result = null;
+
+ // If one extender returns true we will return true for this call.
+ for( ElementEntry listEntry : entries )
+ {
+ if( listEntry.isEnabled( project ) )
+ {
+ IClasspathDependencyExtension extension = listEntry.getExtensionClass();
+
+ if( extension != null )
+ {
+ result = extension.getClasspathdependencyAttribute( project, entry );
+
+ if( result != null )
+ {
+ // We found an extension that has a value for this attribute.
+ break;
+ }
+ }
+ }
+ }
+
+ return result;
+ }
+
+ private void load()
+ {
+ IExtensionRegistry registry = Platform.getExtensionRegistry();
+ IConfigurationElement[] elements = registry.getConfigurationElementsFor( "org.eclipse.jst.j2ee.ClasspathDependencyExtension" ); //$NON-NLS-1$
+
+ for( IConfigurationElement element : elements )
+ {
+ if( element.getName().equals( "classpathdependency" )) //$NON-NLS-1$
+ {
+ IConfigurationElement[] childElements = element.getChildren();
+ ElementEntry elementEntry = new ElementEntry();
+
+ elementEntry.element = element;
+
+ for( IConfigurationElement childElement : childElements )
+ {
+ String elementName = childElement.getName();
+
+ if( elementName.equals( ExpressionTagNames.ENABLEMENT ) )
+ {
+ try
+ {
+ elementEntry.enablementExpression = ExpressionConverter.getDefault().perform( childElement );
+ }
+ catch( CoreException exc )
+ {
+ // Do nothing. Element entry will get a null entered for the enblement expression.
+ }
+ }
+ }
+
+ entries.add( elementEntry );
+ }
+ }
+ }
+
+ private class ElementEntry
+ {
+ public Expression enablementExpression;
+ public IConfigurationElement element;
+
+ private IClasspathDependencyExtension extension;
+
+ public IClasspathDependencyExtension getExtensionClass()
+ {
+ if( element == null ) return null;
+
+ if( extension == null )
+ {
+ try
+ {
+ extension = (IClasspathDependencyExtension)element.createExecutableExtension( "class" ); //$NON-NLS-1$
+ }
+ catch( CoreException exc )
+ {
+ return null;
+ }
+ }
+
+ return extension;
+ }
+
+ public boolean isEnabled( IProject project )
+ {
+ if( enablementExpression == null ) return true;
+
+ boolean result = false;
+ IEvaluationContext context = new EvaluationContext( null, project );
+
+ context.setAllowPluginActivation( true );
+
+ try
+ {
+ EvaluationResult expResult = enablementExpression.evaluate( context );
+
+ // If any expression returns TRUE or NOT_LOADED we will return true as
+ // the result.
+ if( expResult != EvaluationResult.FALSE )
+ {
+ result = true;
+ }
+ }
+ catch( CoreException exc )
+ {
+ result = false;
+ }
+
+ return result;
+ }
+ }
+}
diff --git a/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/ClasspathDependencyValidator.java b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/ClasspathDependencyValidator.java
index ac4ee4b..991eaec 100644
--- a/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/ClasspathDependencyValidator.java
+++ b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/ClasspathDependencyValidator.java
@@ -21,6 +21,7 @@
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
@@ -39,6 +40,7 @@
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.ModuleCoreNature;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
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;
@@ -92,6 +94,8 @@
final List potentialRawEntries = ClasspathDependencyUtil.getPotentialComponentClasspathDependencies(javaProjectLite, isLegacyJ2EE);
final ClasspathDependencyValidatorData data = new ClasspathDependencyValidatorData(proj);
+ ClasspathDependencyExtensionManager extensionManger = ClasspathDependencyExtensionManager.instance();
+
// validate the raw referenced container entries
Iterator i = referencedRawEntries.keySet().iterator();
boolean hasRootMapping = false;
@@ -110,7 +114,7 @@
}
reportMessages(msgs);
// if not a web app, warn if associated cp entry is not exported
- if (!isWebApp && !entry.isExported()) {
+ if (!isWebApp && !entry.isExported() && !extensionManger.doesProjectHandleExport(proj, entry)) {
_reporter.addMessage(this, new Message("classpathdependencyvalidator", //$NON-NLS-1$
IMessage.NORMAL_SEVERITY, NonWebNonExported, new String[]{cpEntryPath}, proj));
}
@@ -259,15 +263,25 @@
final int kind = entry.getEntryKind();
final boolean isFile = !ClasspathDependencyUtil.isClassFolderEntry(entry);
+
if (kind == IClasspathEntry.CPE_PROJECT) {
-
// Project cp entry
- results.add(new Message("classpathdependencyvalidator", //$NON-NLS-1$
- IMessage.HIGH_SEVERITY, ProjectClasspathEntry, new String[]{entry.getPath().toString()}, project));
-
- return (IMessage[]) results.toArray(new IMessage[results.size()]);
+ // Allow faceted projects only, and not plain java projects
+ boolean isFacetedProject = false;
+ IProject referencedProject = ResourcesPlugin.getWorkspace().getRoot().getProject(entry.getPath().toString());
+ try {
+ isFacetedProject = FacetedProjectFramework.isFacetedProject(referencedProject);
+ }
+ catch (CoreException ce){
+ //Ignore. Thrown when project metadata cannot be read. In that case we will treat the project as non faceted
+ }
+ if (!isFacetedProject){
+ results.add(new Message("classpathdependencyvalidator", //$NON-NLS-1$
+ IMessage.HIGH_SEVERITY, ProjectClasspathEntry, new String[]{entry.getPath().toString()}, project));
+ return (IMessage[]) results.toArray(new IMessage[results.size()]);
+ }
} else if (kind == IClasspathEntry.CPE_SOURCE) {
-
+
// Source cp entry
results.add(new Message("classpathdependencyvalidator", //$NON-NLS-1$
diff --git a/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/DuplicateClasspathComponentURIValidatorEnablement.java b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/DuplicateClasspathComponentURIValidatorEnablement.java
new file mode 100644
index 0000000..4020fac
--- /dev/null
+++ b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/DuplicateClasspathComponentURIValidatorEnablement.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jst.j2ee.internal.classpathdep;
+
+import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
+import org.eclipse.jst.j2ee.internal.plugin.JavaEEPreferencesInitializer;
+
+
+public class DuplicateClasspathComponentURIValidatorEnablement {
+
+ /**
+ * This flag is used to control the enablement of the legacy Duplicate Classpath Component URI validation.
+ * The default value is true which enables this validation.
+ * Setting this value to false will disable this validation.
+ */
+ private static boolean validateDuplicateClasspathComponentURI;
+ private static boolean hasBeenSet = false;
+
+ public static void setValidateDuplicateClasspathComponentURI(boolean validate){
+ validateDuplicateClasspathComponentURI = validate;
+ hasBeenSet = true;
+ }
+
+ public static boolean shouldValidateDuplicateClasspathComponentURI(){
+ if(!hasBeenSet) {
+ if(!ClasspathDependencyEnablement.isAllowClasspathComponentDependency()) {
+ validateDuplicateClasspathComponentURI = false;
+ } else {
+ validateDuplicateClasspathComponentURI = J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(JavaEEPreferencesInitializer.Keys.VALIDATE_DUPLICATE_CLASSPATH_COMPONENT_URI);
+ }
+ hasBeenSet = true;
+ }
+ return validateDuplicateClasspathComponentURI;
+ }
+
+}
diff --git a/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/UpdateClasspathAttributesOperation.java b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/UpdateClasspathAttributesOperation.java
index 9f755f3..4b9ab87 100644
--- a/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/UpdateClasspathAttributesOperation.java
+++ b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/UpdateClasspathAttributesOperation.java
@@ -33,7 +33,8 @@
import org.eclipse.jst.j2ee.classpathdep.UpdateClasspathAttributeUtil;
import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
@@ -130,13 +131,14 @@
}
private void alterDependencyAttributes(final IJavaProject javaProject, final Map entries, final boolean add, final boolean modifyComponentDep) throws CoreException {
- final boolean isWebApp = JavaEEProjectUtilities.isDynamicWebProject(javaProject.getProject());
final boolean isLegacyJ2EE = J2EEProjectUtilities.isLegacyJ2EEProject(javaProject.getProject());
final IJavaProjectLite javaProjectLite = JavaCoreLite.create(javaProject);
// initialize to the set of raw entries with the attrib
final Map entriesWithAttrib = ClasspathDependencyUtil.getRawComponentClasspathDependencies(javaProjectLite, modifyComponentDep ? DependencyAttributeType.CLASSPATH_COMPONENT_DEPENDENCY : DependencyAttributeType.CLASSPATH_COMPONENT_NONDEPENDENCY, isLegacyJ2EE);
+ ClasspathDependencyExtensionManager extensionManager = ClasspathDependencyExtensionManager.instance();
+
Iterator i = entries.keySet().iterator();
while (i.hasNext()) {
final IClasspathEntry entry = (IClasspathEntry) i.next();
@@ -145,13 +147,29 @@
IPath runtimePath = (IPath) entries.get(entry);
if (runtimePath == null) {
// compute the default runtime path
- runtimePath = ClasspathDependencyUtil.getDefaultRuntimePath(isWebApp, ClasspathDependencyUtil.isClassFolderEntry(entry));
+ IVirtualComponent virtualComponent = ComponentCore.createComponent(javaProject.getProject());
+ runtimePath = ClasspathDependencyUtil.getDefaultRuntimePath(virtualComponent, entry);
}
+
IClasspathAttribute attrib = null;
- if (modifyComponentDep) {
- attrib = UpdateClasspathAttributeUtil.createDependencyAttribute(runtimePath);
- } else {
- attrib = UpdateClasspathAttributeUtil.createNonDependencyAttribute();
+
+ if (modifyComponentDep)
+ {
+ // Check to see if an extender has a value for this classpath entry.
+ String extenderValue = extensionManager.getDependencyValue( javaProject.getProject(), entry );
+
+ if( extenderValue == null )
+ {
+ attrib = UpdateClasspathAttributeUtil.createDependencyAttribute(runtimePath);
+ }
+ else
+ {
+ attrib = UpdateClasspathAttributeUtil.createDependencyAttribute( extenderValue );
+ }
+ }
+ else
+ {
+ attrib = UpdateClasspathAttributeUtil.createNonDependencyAttribute();
}
entriesWithAttrib.put(entry, attrib);
}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java
index f73c858..803e874 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java
@@ -11,6 +11,8 @@
package org.eclipse.jst.j2ee.internal.common.classpath;
import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -20,9 +22,14 @@
import java.util.Set;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jdt.core.IAccessRule;
import org.eclipse.jdt.core.IClasspathAttribute;
import org.eclipse.jdt.core.IClasspathContainer;
@@ -42,6 +49,7 @@
import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.internal.StructureEdit;
+import org.eclipse.wst.common.componentcore.internal.builder.IDependencyGraph;
import org.eclipse.wst.common.componentcore.internal.flat.IFlatFolder;
import org.eclipse.wst.common.componentcore.internal.flat.IFlatResource;
import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
@@ -76,18 +84,85 @@
private IJavaProject javaProject;
private IJavaProjectLite javaProjectLite;
private IClasspathEntry[] entries = new IClasspathEntry[0];
- private boolean exportEntries = true; //the default behavior is to always export these dependencies
private static Map<Integer, Integer> keys = new Hashtable<Integer, Integer>();
private static int MAX_RETRIES = 10;
private static Map<Integer, Integer>retries = new Hashtable<Integer, Integer>();
- private class LastUpdate {
+ static class LastUpdate implements Serializable{
+ private static final long serialVersionUID = 362498820763181265L;
+ private boolean exportEntries = true; //the default behavior is to always export these dependencies
private int baseRefCount = 0; // count of references returned directly from a component
+ private int baseLibRefCount = 0; // count of references resolved by EAR 5 lib directory
private int refCount = 0;
private boolean[] isBinary = new boolean[refCount];
- private IPath[] paths = new IPath[refCount];
+ transient private IPath[] paths = new IPath[refCount];
+ transient boolean needToVerify = true;
+ //only used for serialization
+ private String [] pathStrings = null;
+
+ @Override
+ public boolean equals(Object o) {
+ if(this == o){
+ return true;
+ } else if(o == null){
+ return false;
+ } else if (o instanceof LastUpdate){
+ LastUpdate other = (LastUpdate)o;
+ if(this.exportEntries != other.exportEntries){
+ return false;
+ } else if(this.baseRefCount != other.baseRefCount){
+ return false;
+ } else if(this.baseLibRefCount != other.baseLibRefCount){
+ return false;
+ } else if(this.refCount != other.refCount){
+ return false;
+ } else if(this.isBinary.length != other.isBinary.length){
+ return false;
+ } else if(this.paths.length != other.paths.length){
+ return false;
+ }
+ for(int i=0; i<isBinary.length; i++){
+ if(this.isBinary[i] != other.isBinary[i]){
+ return false;
+ }
+ }
+ for(int i=0; i<paths.length; i++){
+ if(this.paths[i] == null && other.paths[i] != null){
+ return false;
+ } else if(!this.paths[i].equals(other.paths[i])){
+ return false;
+ }
+ }
+ return true;
+ } else {
+ return false;
+ }
+ }
+ @Override
+ public int hashCode() {
+ return 3 * baseRefCount + 5 * baseLibRefCount + 7 * refCount + 11 * isBinary.length;
+ }
- private int baseLibRefCount = 0; // count of references resolved by EAR 5 lib directory
+ private void writeObject(java.io.ObjectOutputStream out) throws IOException {
+ pathStrings = new String[refCount];
+ for(int i=0;i<paths.length; i++){
+ if(paths[i] != null){
+ pathStrings[i] = paths[i].toString();
+ }
+ }
+ out.defaultWriteObject();
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException{
+ in.defaultReadObject();
+ needToVerify = true;
+ paths = new IPath[refCount];
+ for(int i=0;i<pathStrings.length; i++){
+ if(pathStrings[i] != null){
+ paths[i] = new Path(pathStrings[i]);
+ }
+ }
+ }
private boolean areSame(IVirtualComponent comp, int i){
if (comp.isBinary() != isBinary[i]) {
@@ -112,7 +187,7 @@
this.javaProject = javaProject;
this.javaProjectLite = JavaCoreLite.create(javaProject);
}
-
+
private boolean requiresUpdate() {
IVirtualComponent component = ComponentCore.createComponent(javaProjectLite.getProject());
if (component == null) {
@@ -166,7 +241,23 @@
return true;
}
- private void update() {
+ private void update(LastUpdate restoreState) {
+ if(restoreState != null){ // performance; restore state from last session
+ lastUpdate = restoreState;
+ List <IClasspathEntry>entriesList = new ArrayList<IClasspathEntry>();
+ for(int i=0; i<lastUpdate.paths.length; i++){
+ if(lastUpdate.paths[i] != null){
+ IClasspathEntry newEntry = createEntry(restoreState, i);
+ entriesList.add(newEntry);
+ }
+ }
+ entries = new IClasspathEntry[entriesList.size()];
+ for (int i = 0; i < entries.length; i++) {
+ entries[i] = entriesList.get(i);
+ }
+ return;
+ }
+
IVirtualComponent component = ComponentCore.createComponent(javaProjectLite.getProject());
if (component == null) {
return;
@@ -217,7 +308,7 @@
}
}
- //iterate with i index because this list can be modified during iteration
+ //iterate with i index because this list may be augmented during iteration
for(int i=0; i< refsList.size(); i++){
IVirtualComponent comp = refsList.get(i).getReferencedComponent();
if(comp.isBinary()){
@@ -249,7 +340,7 @@
IClasspathEntry entry = rawEntries[i];
if(entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER){
if(entry.getPath().equals(CONTAINER_PATH)){
- exportEntries = entry.isExported();
+ lastUpdate.exportEntries = entry.isExported();
break;
}
}
@@ -266,7 +357,7 @@
if (!shouldAdd) {
continue;
}
- if (comp.isBinary()) {
+ if (lastUpdate.isBinary[i]) {
if( comp instanceof VirtualArchiveComponent ) {
VirtualArchiveComponent archiveComp = (VirtualArchiveComponent) comp;
if (archiveComp.getArchiveType().equals(VirtualArchiveComponent.CLASSPATHARCHIVETYPE)) {
@@ -275,24 +366,13 @@
}
}
lastUpdate.paths[i] = (IPath)comp.getAdapter(IPath.class);
- ClasspathDecorations dec = decorationsManager.getDecorations( getPath().toString(), lastUpdate.paths[i].toString() );
-
- IPath srcpath = null;
- IPath srcrootpath = null;
- IClasspathAttribute[] attrs = {};
- IAccessRule[] access = {};
-
- if( dec != null ) {
- srcpath = dec.getSourceAttachmentPath();
- srcrootpath = dec.getSourceAttachmentRootPath();
- attrs = dec.getExtraAttributes();
- }
- IClasspathEntry newEntry = JavaCoreLite.newLibraryEntry( lastUpdate.paths[i], srcpath, srcrootpath, access, attrs, exportEntries );
- entriesList.add(newEntry);
+ IClasspathEntry newEntry = createEntry(lastUpdate, i);
+ entriesList.add(newEntry);
} else {
IProject project = comp.getProject();
lastUpdate.paths[i] = project.getFullPath();
- entriesList.add(JavaCoreLite.newProjectEntry(lastUpdate.paths[i], exportEntries));
+ IClasspathEntry newEntry = createEntry(lastUpdate, i);
+ entriesList.add(newEntry);
}
}
} finally {
@@ -300,9 +380,31 @@
for (int i = 0; i < entries.length; i++) {
entries[i] = entriesList.get(i);
}
+ J2EEComponentClasspathContainerStore.saveState(javaProjectLite.getProject().getName(), lastUpdate);
}
}
+ private IClasspathEntry createEntry(LastUpdate lastUpdate, int index){
+ if(lastUpdate.isBinary[index]){
+ ClasspathDecorations dec = decorationsManager.getDecorations( getPath().toString(), lastUpdate.paths[index].toString() );
+
+ IPath srcpath = null;
+ IPath srcrootpath = null;
+ IClasspathAttribute[] attrs = {};
+ IAccessRule[] access = {};
+
+ if( dec != null ) {
+ srcpath = dec.getSourceAttachmentPath();
+ srcrootpath = dec.getSourceAttachmentRootPath();
+ attrs = dec.getExtraAttributes();
+ }
+ IClasspathEntry newEntry = JavaCoreLite.newLibraryEntry( lastUpdate.paths[index], srcpath, srcrootpath, access, attrs, lastUpdate.exportEntries );
+ return newEntry;
+ }
+ IClasspathEntry newEntry = JavaCoreLite.newProjectEntry(lastUpdate.paths[index], lastUpdate.exportEntries);
+ return newEntry;
+ }
+
private List<IVirtualReference> getBaseEARLibRefs(IVirtualComponent component) {
List <IVirtualReference> libRefs = new ArrayList<IVirtualReference>();
// check for the references in the lib dirs of the referencing EARs
@@ -314,7 +416,9 @@
// retrieve the EAR's library directory
String libDir = EarUtilities.getEARLibDir(earComp);
// if the EAR version is lower than 5, then the library directory will be null
- if (libDir != null) {
+ // or if it is the empty string, do nothing.
+ if (libDir != null && libDir.trim().length() != 0) {
+ IPath libDirPath = new Path(libDir).makeRelative();
// check if the component itself is not in the library directory of this EAR - avoid cycles in the build patch
IVirtualReference ref = earComp.getReference(component.getName());
if(ref != null){
@@ -328,16 +432,18 @@
refPath = refPath.removeLastSegments(1);
}
}
- if (!libDir.equals(refPath.toString())) {
+ refPath = refPath.makeRelative();
+ if (!libDirPath.equals(refPath)) {
// retrieve the referenced components from the EAR
IVirtualReference[] earRefs = earComp.getReferences();
for (IVirtualReference earRef : earRefs) {
if(earRef.getDependencyType() == IVirtualReference.DEPENDENCY_TYPE_USES){
// check if the referenced component is in the library directory
- boolean isInLibDir = libDir.equals(earRef.getRuntimePath().toString());
+ IPath runtimePath = earRef.getRuntimePath().makeRelative();
+ boolean isInLibDir = libDirPath.equals(runtimePath);
if(!isInLibDir){
IPath fullPath = earRef.getRuntimePath().append(earRef.getArchiveName());
- isInLibDir = fullPath.removeLastSegments(1).toString().equals(libDir);
+ isInLibDir = fullPath.removeLastSegments(1).makeRelative().equals(libDirPath);
}
if (isInLibDir) {
libRefs.add(earRef);
@@ -348,7 +454,6 @@
//add EAR classpath container refs
try {
ClasspathLibraryExpander classpathLibExpander = new ClasspathLibraryExpander(earComp);
- IPath libDirPath = new Path(libDir);
IFlatResource flatLibResource = classpathLibExpander.fetchResource(libDirPath);
if(flatLibResource instanceof IFlatFolder){
IFlatFolder flatLibFolder = (IFlatFolder)flatLibResource;
@@ -365,7 +470,7 @@
}
}
} catch (CoreException e) {
- org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.logError(e);
+ J2EEPlugin.logError(e);
}
}
}
@@ -374,26 +479,60 @@
return libRefs;
}
- public static void install(IPath containerPath, IJavaProject javaProject) {
+ public static J2EEComponentClasspathContainer install(IPath containerPath, IJavaProject javaProject, LastUpdate restoreState) {
try{
J2EEComponentClasspathUpdater.getInstance().pauseUpdates();
final IJavaProject[] projects = new IJavaProject[]{javaProject};
final J2EEComponentClasspathContainer container = new J2EEComponentClasspathContainer(containerPath, javaProject);
- container.update();
+ container.update(restoreState);
final IClasspathContainer[] conts = new IClasspathContainer[]{container};
try {
JavaCore.setClasspathContainer(containerPath, projects, conts, null);
} catch (JavaModelException e) {
J2EEPlugin.logError(e);
}
+ return container;
} finally {
J2EEComponentClasspathUpdater.getInstance().resumeUpdates();
}
}
+ public static void install(final IPath containerPath, final IJavaProject javaProject) {
+ final String projectName = javaProject.getProject().getName();
+ LastUpdate restoreState = J2EEComponentClasspathContainerStore.getRestoreState(projectName);
+ boolean needToVerify = false;
+ if(null != restoreState){
+ synchronized (restoreState) {
+ needToVerify = restoreState.needToVerify;
+ restoreState.needToVerify = false;
+ }
+ }
+ final J2EEComponentClasspathContainer container = install(containerPath, javaProject, restoreState);
+ if(needToVerify){
+ Job verifyJob = new Job(Messages.J2EEComponentClasspathUpdater_Verify_EAR_Libraries){
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ container.refresh();
+ return Status.OK_STATUS;
+ }
+ };
+ verifyJob.setSystem(true);
+ verifyJob.setRule(ResourcesPlugin.getWorkspace().getRoot());
+ verifyJob.schedule();
+ }
+ }
+
public void refresh(boolean force){
+ if (!force) {
+ if(IDependencyGraph.INSTANCE.isStale()){
+ //avoid deadlock https://bugs.eclipse.org/bugs/show_bug.cgi?id=334050
+ //if the data is stale abort and attempt to update again in the near future
+ J2EEComponentClasspathUpdater.getInstance().queueUpdate(javaProject.getProject());
+ return;
+ }
+ }
if(force || requiresUpdate()){
- install(containerPath, javaProject);
+ install(containerPath, javaProject, null);
}
}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainerStore.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainerStore.java
new file mode 100644
index 0000000..10f1083
--- /dev/null
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainerStore.java
@@ -0,0 +1,202 @@
+package org.eclipse.jst.j2ee.internal.common.classpath;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.ISafeRunnable;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.SafeRunner;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainer.LastUpdate;
+import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
+
+public class J2EEComponentClasspathContainerStore {
+ private static final String EAR_LIBRARIES_CACHE = "earLibrariesCache.index"; //$NON-NLS-1$
+ private static Map<String, LastUpdate> restoreStateMap;
+ private static Map<String, LastUpdate> saveStateMap = new HashMap<String, LastUpdate>();
+
+ static {
+ IPath stateLocation = J2EEPlugin.getDefault().getStateLocation();
+ java.io.File file = stateLocation.append(EAR_LIBRARIES_CACHE).toFile();
+ try {
+ if (file.exists()) {
+ FileInputStream fIn = null;
+ boolean deleteCache = true;
+ try {
+ fIn = new FileInputStream(file);
+ BufferedInputStream bIn = new BufferedInputStream(fIn);
+ ObjectInputStream oIn = new ObjectInputStream(bIn);
+ restoreStateMap = (HashMap<String, LastUpdate>) oIn.readObject();
+ oIn.close();
+
+ //it is unfortunate this is necessary, but without iterating over the map
+ //and explicitly testing each value, class cast exceptions may occur later
+ //best to check them all now and recover
+ Iterator<Entry<String, LastUpdate>> iterator = restoreStateMap.entrySet().iterator();
+ while(iterator.hasNext()){
+ Entry<String, LastUpdate> next = iterator.next();
+ String s = next.getKey();
+ LastUpdate lu = next.getValue();
+ if(s == null || lu == null){
+ //may throw ClassCastException
+ }
+ }
+ deleteCache = false;
+ } catch (FileNotFoundException e) {
+ J2EEPlugin.logError(e);
+ } catch (IOException e) {
+ J2EEPlugin.logError(e);
+ } catch (ClassNotFoundException e) {
+ J2EEPlugin.logError(e);
+ } catch (ClassCastException e){
+ J2EEPlugin.logError(e);
+ }
+ finally {
+ if (fIn != null) {
+ try {
+ fIn.close();
+ } catch (IOException e) {
+ J2EEPlugin.logError(e);
+ }
+ }
+ if(deleteCache){
+ restoreStateMap = new HashMap<String, LastUpdate>();
+ file.delete();
+ }
+ }
+ }
+ } catch (Throwable e){
+ try{
+ J2EEPlugin.logError(e);
+ file.delete();
+ } catch (Exception e2){
+ //eat it
+ }
+ restoreStateMap = new HashMap<String, LastUpdate>();
+ } finally {
+ if (restoreStateMap == null) {
+ restoreStateMap = new HashMap<String, LastUpdate>();
+ }
+ }
+ }
+
+ private static void persist() {
+ synchronized (saveStateMap) {
+ IPath stateLocation = J2EEPlugin.getDefault().getStateLocation();
+ java.io.File file = stateLocation.append(EAR_LIBRARIES_CACHE).toFile();
+ FileOutputStream fOut = null;
+ try {
+ fOut = new FileOutputStream(file);
+ BufferedOutputStream bOut = new BufferedOutputStream(fOut);
+ ObjectOutputStream oOut = new ObjectOutputStream(bOut);
+ oOut.writeObject(saveStateMap);
+ oOut.close();
+ } catch (FileNotFoundException e) {
+ J2EEPlugin.logError(e);
+ } catch (IOException e) {
+ J2EEPlugin.logError(e);
+ } finally {
+ if (fOut != null) {
+ try {
+ fOut.close();
+ } catch (IOException e) {
+ J2EEPlugin.logError(e);
+ }
+ }
+ }
+ }
+ }
+
+ static void flush(String projectName) {
+ synchronized (restoreStateMap) {
+ restoreStateMap.remove(projectName);
+ }
+ synchronized (saveStateMap) {
+ saveStateMap.remove(projectName);
+ }
+ }
+
+ static void flushAll() {
+ synchronized (restoreStateMap) {
+ restoreStateMap.clear();
+ }
+ synchronized (saveStateMap) {
+ saveStateMap.clear();
+ }
+ IPath stateLocation = J2EEPlugin.getDefault().getStateLocation();
+ java.io.File file = stateLocation.append(EAR_LIBRARIES_CACHE).toFile();
+ file.delete();
+ }
+
+ static LastUpdate getRestoreState(String projectName) {
+ LastUpdate lastUpdate = null;
+ synchronized (restoreStateMap) {
+ lastUpdate = restoreStateMap.get(projectName);
+ }
+ if (lastUpdate != null) {
+ synchronized (saveStateMap) {
+ saveStateMap.put(projectName, lastUpdate);
+ }
+ }
+ return lastUpdate;
+ }
+
+ private static class PersistJob extends Job {
+
+ public PersistJob() {
+ super("Persist EAR Libraries State"); //$NON-NLS-1$
+ setSystem(true);
+ setRule(null);
+ }
+
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ SafeRunner.run(new ISafeRunnable() {
+ public void run() throws Exception {
+ persist();
+ }
+
+ public void handleException(Throwable exception) {
+ J2EEPlugin.logError(exception);
+ }
+ });
+ return Status.OK_STATUS;
+ }
+ }
+
+ private static int persistDelay = 60000; // 1 minute
+ private static PersistJob persistJob = new PersistJob();
+
+ static void saveState(String projectName, LastUpdate lastUpdate) {
+ boolean scheduleJob = false;
+ synchronized (saveStateMap) {
+ LastUpdate previousUpdate = saveStateMap.get(projectName);
+ //this check is to avoid I/O if possible
+ if(null == previousUpdate || !previousUpdate.equals(lastUpdate)){
+ saveStateMap.put(projectName, lastUpdate);
+ scheduleJob = true;
+ }
+ }
+ if(scheduleJob){
+ synchronized (restoreStateMap) {
+ //if it changed, do not load it from the cache again
+ restoreStateMap.remove(projectName);
+ }
+ persistJob.schedule(persistDelay);
+ }
+ }
+
+}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathUpdater.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathUpdater.java
index b41387c..9fce19a 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathUpdater.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathUpdater.java
@@ -59,6 +59,7 @@
import org.eclipse.wst.common.componentcore.ModuleCoreNature;
import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
+import org.eclipse.wst.common.componentcore.internal.builder.IDependencyGraph;
import org.eclipse.wst.common.componentcore.internal.builder.IDependencyGraphListener;
import org.eclipse.wst.common.componentcore.internal.builder.IDependencyGraphUpdateEvent;
import org.eclipse.wst.common.componentcore.internal.impl.ResourceTreeRootAdapter;
@@ -253,6 +254,12 @@
for (int p = 0; p < projects.length; p++) {
IProject project = (IProject) projects[p];
if (!isKnown(project)) {
+ if(IDependencyGraph.INSTANCE.isStale()){
+ //avoid deadlock https://bugs.eclipse.org/bugs/show_bug.cgi?id=334050
+ //if the data is stale abort and attempt to update again in the near future
+ J2EEComponentClasspathUpdater.getInstance().queueUpdate(project);
+ continue;
+ }
IProject[] earProjects = EarUtilities.getReferencingEARProjects(project);
for (int i = 0; i < earProjects.length; i++) {
queueEAR(earProjects[i]);
@@ -291,7 +298,7 @@
IClasspathContainer webAppLibrariesContainer = J2EEComponentClasspathContainerUtils.getInstalledWebAppLibrariesContainer(project);
// If the container is present, refresh it
if (webAppLibrariesContainer != null) {
- ((FlexibleProjectContainer) webAppLibrariesContainer).refresh();
+ ((FlexibleProjectContainer) webAppLibrariesContainer).refresh(forceUpdateOnNextRun);
}
}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/Messages.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/Messages.java
index dade7f7..26ba7ab 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/Messages.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/Messages.java
@@ -6,6 +6,7 @@
public static final String BUNDLE_NAME = "org.eclipse.jst.j2ee.internal.common.classpath.messages"; //$NON-NLS-1$
public static String J2EEComponentClasspathUpdater_EAR_Libraries_Update_Jo_;
+ public static String J2EEComponentClasspathUpdater_Verify_EAR_Libraries;
static {
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/messages.properties b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/messages.properties
index 60f487d..9dd79ad 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/messages.properties
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/messages.properties
@@ -1 +1,2 @@
J2EEComponentClasspathUpdater_EAR_Libraries_Update_Jo_=EAR Libraries Update Job
+J2EEComponentClasspathUpdater_Verify_EAR_Libraries=Verify EAR Libraries
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/ClasspathDependenciesCollector.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/ClasspathDependenciesCollector.java
new file mode 100644
index 0000000..a585035
--- /dev/null
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/ClasspathDependenciesCollector.java
@@ -0,0 +1,176 @@
+/*******************************************************************************
+ * Copyright (c) 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and 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.exportmodel;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jst.common.internal.modulecore.AddClasspathLibReferencesParticipant;
+import org.eclipse.jst.common.internal.modulecore.IClasspathDependencyComponent;
+import org.eclipse.jst.common.internal.modulecore.IClasspathDependencyProvider;
+import org.eclipse.jst.common.internal.modulecore.IClasspathDependencyReceiver;
+import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
+import org.eclipse.jst.j2ee.project.WebUtilities;
+import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
+import org.eclipse.wst.common.componentcore.internal.flat.AbstractFlattenParticipant;
+import org.eclipse.wst.common.componentcore.internal.flat.ChildModuleReference;
+import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent;
+import org.eclipse.wst.common.componentcore.internal.flat.IChildModuleReference;
+import org.eclipse.wst.common.componentcore.internal.flat.IFlatFile;
+import org.eclipse.wst.common.componentcore.internal.flat.IFlatFolder;
+import org.eclipse.wst.common.componentcore.internal.flat.IFlatResource;
+import org.eclipse.wst.common.componentcore.internal.flat.VirtualComponentFlattenUtility;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+
+
+public class ClasspathDependenciesCollector extends FlatVirtualComponent {
+
+ public ClasspathDependenciesCollector(IVirtualComponent component) {
+ super(component);
+ }
+
+ @Override
+ protected boolean canOptimize() {
+ return true;
+ }
+
+ @Override
+ protected void optimize(List<IFlatResource> resources, List<IChildModuleReference> children) {
+ if (getComponent() != null) {
+ AbstractFlattenParticipant classpathReferences = null;
+ IProject project = getComponent().getProject();
+
+ if (JavaEEProjectUtilities.isEARProject(project)) {
+ classpathReferences = new AddClasspathLibReferencesParticipant();
+ }
+ else if (JavaEEProjectUtilities.isDynamicWebProject(project)) {
+ classpathReferences = new WebLibClasspathReferencesParticipant();
+ }
+
+ if (classpathReferences != null) {
+ classpathReferences.finalize(getComponent(), null, resources);
+ // Retrieve the children modules contributed by classpath references and
+ // add them as children of this FlatVirtualComponent
+ List <IVirtualReference> refToModules = classpathReferences.getChildModules(getComponent(), null);
+ if (refToModules != null){
+ for (IVirtualReference ref:refToModules){
+ ChildModuleReference cm = new ChildModuleReference(ref, new Path("")); //$NON-NLS-1$
+ List<IChildModuleReference> duplicates = new ArrayList();
+ for( IChildModuleReference tmp : children ) {
+ if(tmp.getRelativeURI().equals(cm.getRelativeURI()))
+ duplicates.add(tmp);
+ }
+ children.removeAll(duplicates);
+ children.add(cm);
+ }
+ }
+ }
+ }
+ }
+
+ public List <IFlatFile> fetchFlatFiles() throws CoreException {
+ IFlatResource [] resources = fetchResources();
+ List<IFlatFile> flatFiles = new ArrayList<IFlatFile>();
+ return fetchFlatFiles(resources, flatFiles);
+ }
+
+ /**
+ * This method will return an array of {@link IVirtualReference} for all of
+ * the utility modules contributed by classpath dependencies.
+ *
+ * @return - an array of {@link IVirtualReference} of utility modules
+ * @throws CoreException
+ */
+ public IVirtualReference[] getUtilityModuleReferences() throws CoreException {
+
+ List <IVirtualReference> result = new ArrayList<IVirtualReference>();
+ if (getComponent() != null) {
+ List<String> componentTypes = Collections.singletonList(IJ2EEFacetConstants.UTILITY);
+ for (IChildModuleReference moduleRef:getChildModules()){
+ if (componentTypes.contains(JavaEEProjectUtilities.getJ2EEComponentType(moduleRef.getReference().getReferencedComponent()))) {
+ result.add(moduleRef.getReference());
+ }
+ }
+
+ if (result.size() > 0)
+ return result.toArray(new IVirtualReference[result.size()]);
+ }
+ return new IVirtualReference[0];
+ }
+
+ private List <IFlatFile> fetchFlatFiles(IFlatResource[] resources, List<IFlatFile> flatFiles) {
+ for (int i = 0; i < resources.length; i++) {
+ IFlatResource resource = resources[i];
+ if (resource instanceof IFlatFile) {
+ if (((IFlatFile) resource).getAdapter(File.class) != null)
+ flatFiles.add((IFlatFile)resource);
+ } else if (resource instanceof IFlatFolder) {
+ fetchFlatFiles(((IFlatFolder)resource).members(), flatFiles);
+ }
+ }
+ return flatFiles;
+ }
+
+ private class WebLibClasspathReferencesParticipant extends AbstractFlattenParticipant {
+ private List<IFlatResource> list;
+
+ @Override
+ public void finalize(IVirtualComponent webComponent, FlatComponentTaskModel dataModel, List<IFlatResource> resources) {
+ this.list = resources;
+ addReferencedComponentClasspathDependencies((IClasspathDependencyReceiver)webComponent);
+ }
+
+ private void addReferencedComponentClasspathDependencies(final IClasspathDependencyReceiver webComponent) {
+ final IVirtualReference[] refs = webComponent.getReferences();
+ for (int i = 0; i < refs.length; i++) {
+ final IVirtualReference reference = refs[i];
+ final IPath runtimePath = reference.getRuntimePath();
+ final IVirtualComponent referencedComponent = reference.getReferencedComponent();
+
+ if (!runtimePath.equals(WebUtilities.WEBLIB)) {
+ continue;
+ }
+
+ // if the reference cannot export dependencies, skip
+ if( !(referencedComponent instanceof IClasspathDependencyProvider) )
+ continue;
+
+ if (!referencedComponent.isBinary() && referencedComponent instanceof IClasspathDependencyProvider) {
+ final IVirtualReference[] cpRefs = ((IClasspathDependencyProvider) referencedComponent).getJavaClasspathReferences();
+ for (int j = 0; j < cpRefs.length; j++) {
+ final IVirtualReference cpRef = cpRefs[j];
+ IPath cpRefRuntimePath = cpRef.getRuntimePath();
+
+ if (cpRef.getReferencedComponent() instanceof IClasspathDependencyComponent) {
+ IClasspathDependencyComponent cpComp = (IClasspathDependencyComponent) cpRef.getReferencedComponent();
+ // don't want to process class folder refs here
+ if (cpComp.isClassFolder())
+ continue;
+
+ if (!cpRefRuntimePath.toString().equals(IClasspathDependencyReceiver.RUNTIME_MAPPING_INTO_CONTAINER))
+ continue;
+
+ cpRefRuntimePath = runtimePath;
+ new VirtualComponentFlattenUtility(list, null).addFile(cpComp, cpRefRuntimePath, cpComp);
+ }
+ }
+ }
+ }
+ }
+ }
+
+}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEEComponentExportCallback.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEEComponentExportCallback.java
index d945e9f..c5df2bb 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEEComponentExportCallback.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEEComponentExportCallback.java
@@ -19,6 +19,8 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jst.common.internal.modulecore.AddClasspathFoldersParticipant;
+import org.eclipse.jst.common.internal.modulecore.AddClasspathLibReferencesParticipant;
import org.eclipse.jst.j2ee.internal.J2EEConstants;
import org.eclipse.jst.j2ee.internal.archive.ComponentArchiveLoadAdapter;
import org.eclipse.jst.j2ee.internal.archive.JavaEEArchiveUtilities;
@@ -130,7 +132,9 @@
protected IFlattenParticipant[] getParticipants() {
return new IFlattenParticipant[]{
- createHierarchyParticipant()
+ createHierarchyParticipant(),
+ new AddClasspathLibReferencesParticipant(),
+ new AddClasspathFoldersParticipant()
};
}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEESingleRootCallback.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEESingleRootCallback.java
index ce0848f..bdcbf6f 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEESingleRootCallback.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEESingleRootCallback.java
@@ -34,6 +34,10 @@
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
public class JavaEESingleRootCallback implements SingleRootParticipantCallback {
+ //Warnings
+ public static final int UNNECESSARY_RESOURCE_MAP = 100;
+
+ //Errors
public static final int EAR_PROJECT_FOUND = 10100;
public static final int ATLEAST_1_RESOURCE_MAP_MISSING = 10101;
public static final int JAVA_OUTPUT_NOT_WEBINF_CLASSES = 10102;
@@ -123,6 +127,8 @@
*/
private boolean hasDefaultWebResourceMappings(SingleRootUtil util, List resourceMaps) {
int rootValidMaps = 0;
+ IPath pathMappedToContentRoot = null;
+ List<ComponentResource> tmpResources = new ArrayList<ComponentResource>();
IPath webInfClasses = new Path(J2EEConstants.WEB_INF_CLASSES).makeAbsolute();
for (int i = 0; i < resourceMaps.size(); i++) {
@@ -134,6 +140,8 @@
// Verify if the map is for the content root
if (util.isRootMapping(resourceMap)) {
rootValidMaps++;
+ if (pathMappedToContentRoot == null) //we are interested only if the first resource mapped to root
+ pathMappedToContentRoot = sourcePath;
}
// Verify if the map is for a java src folder and is mapped to "WEB-INF/classes"
else if (runtimePath.equals(webInfClasses)) {
@@ -147,11 +155,28 @@
}
}
else {
- util.reportStatus(RUNTIME_PATH_NOT_ROOT_OR_WEBINF_CLASSES, runtimePath);
- }
-
+ // Do not report status yet. Below we do some extra validation
+ tmpResources.add(resourceMap);
+ }
if (util.getValidateFlag() == CANCEL) return false;
}
+
+ if (pathMappedToContentRoot != null){
+ for (ComponentResource res:tmpResources){
+ IPath completePath = pathMappedToContentRoot.append(res.getRuntimePath());
+ if (completePath.equals(res.getSourcePath())){
+ // This mapping is redundant, because there is already a mapping that includes this resource
+ util.reportStatus(UNNECESSARY_RESOURCE_MAP, res.getSourcePath());
+ }
+ else{
+ // Not root, not WEB-INF/classes and not redundant, report status
+ util.reportStatus(RUNTIME_PATH_NOT_ROOT_OR_WEBINF_CLASSES, res.getRuntimePath());
+ }
+ if (util.getValidateFlag() == CANCEL) return false;
+ }
+ tmpResources = null;
+ }
+
// Make sure only one of the maps is the content root, and that at least one is for the java folder
if (rootValidMaps != 1) {
if (rootValidMaps < 1) {
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/model/J2EEModelProviderRegistry.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/model/J2EEModelProviderRegistry.java
index 20c12db..02c0992 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/model/J2EEModelProviderRegistry.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/model/J2EEModelProviderRegistry.java
@@ -10,6 +10,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
import org.eclipse.jem.util.RegistryReader;
import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
@@ -51,12 +52,13 @@
String priority = null;
if (!element.getName().equals(ELEMENT_providers))
return false;
-
+
IModelProviderFactory factory = null;
IConfigurationElement[] mp = element.getChildren(MODEL_PROVIDER);
try {
factory = (IModelProviderFactory) mp[0].createExecutableExtension(PROVIDER_FACTORY_CLASS);
} catch (CoreException e) {
+ logError(element, e.getMessage());
J2EEPlugin.logError(e);
}
if (factory != null) { //Optionally read priority if to override providers for type
@@ -69,11 +71,11 @@
try{
pv = ProjectFacetsManager.getProjectFacet(facetId);
} catch (IllegalArgumentException e){
- J2EEPlugin.logError("Unrecognized facet: " + facetId); //$NON-NLS-1$
+ logError(element, "Unrecognized facet: " + facetId); //$NON-NLS-1$
J2EEPlugin.logError(e);
}
if (pv == null) {
- J2EEPlugin.logError("Unrecognized facet: " + facetId); //$NON-NLS-1$
+ logError(element, "Unrecognized facet: " + facetId); //$NON-NLS-1$
return true; // Unrecognized facet
}
String facetVersions = facet[0].getAttribute(PROVIDER_FACET_VERSION);
@@ -84,16 +86,23 @@
if (fv != null)
addModelProvider(factory, fv, priority);
}
-
-
}
return true;
} catch (Exception e) {
+ logError(element, e.getMessage());
J2EEPlugin.logError(e);
}
return true;
}
+ @Override
+ protected void logError(IConfigurationElement element, String text) {
+ IExtension extension = element.getDeclaringExtension();
+ StringBuffer buf = new StringBuffer();
+ buf.append("Plugin " + extension.getContributor().getName() + ", extension " + extension.getExtensionPointUniqueIdentifier()); //$NON-NLS-1$ //$NON-NLS-2$
+ buf.append("\n" + text); //$NON-NLS-1$
+ J2EEPlugin.logError(buf.toString());
+ }
private static void addModelProvider(IModelProviderFactory provider, IProjectFacetVersion version, String priority) {
// Check priority of existing provider for override
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ListenerItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ListenerItemProvider.java
index cf06938..20b1cbf 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ListenerItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ListenerItemProvider.java
@@ -101,6 +101,11 @@
*/
@Override
public void notifyChanged(Notification notification) {
+ switch (notification.getFeatureID(Listener.class)) {
+ case CommonPackage.LISTENER__LISTENER_CLASS:
+ fireNotifyChanged(notification);
+ return;
+ }
super.notifyChanged(notification);
}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationDataModelProvider.java
index 0ee8ebc..989b0c2 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationDataModelProvider.java
@@ -63,13 +63,14 @@
List CompList = (List) getProperty(TARGET_COMPONENT_LIST);
IVirtualComponent earComp = (IVirtualComponent)getProperty(SOURCE_COMPONENT);
String libDir = EarUtilities.getEARLibDir(earComp);
- if (libDir != null) {
+ if (libDir != null && libDir.length() > 0) {
+ String libDirPath = new Path(libDir).makeAbsolute().toString();
for (int i = 0; i < CompList.size(); i++) {
if(null != CompList.get(i)){
IVirtualComponent Comp = (IVirtualComponent) CompList.get(i);
IProject CompProject = Comp.getProject();
if(JavaEEProjectUtilities.isUtilityProject(CompProject) && !EJBUtilities.isEJBClientProject(CompProject) && JavaEEProjectUtilities.isJEEComponent(earComp)){
- map.put(Comp, libDir);
+ map.put(Comp, libDirPath);
}
}
}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationOp.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationOp.java
index 356c7b1..f979a48 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationOp.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationOp.java
@@ -27,6 +27,8 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
+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.jst.j2ee.application.WebModule;
@@ -132,8 +134,7 @@
StructureEdit compse = null;
try {
compse = StructureEdit.getStructureEditForWrite(wc.getProject());
- WorkbenchComponent refwc = compse.getComponent();
- final ReferencedComponent ref = se.findReferencedComponent(earwc, refwc);
+ final ReferencedComponent ref = findReferencedComponent(earwc, wc, se, compse);
earModel.modify(new Runnable() {
public void run() {
final ICommonApplication application = (ICommonApplication)earModel.getModelObject();
@@ -144,10 +145,15 @@
if(name != null && !deployPath.equals("/")) //$NON-NLS-1$
name = (new Path(deployPath)).append(name).toString();
String libDir = EarUtilities.getEARLibDir(ear);
- if(libDir != null && deployPath.equals(libDir)) { // Do not consider library directory files as modules
+ IPath libDirPath = null;
+ if(libDir != null)
+ libDirPath = new Path(libDir).makeRelative();
+ if(libDirPath != null && !libDirPath.isEmpty() && new Path(deployPath).makeRelative().equals(libDirPath)) { // Do not consider library directory files as modules
return;
}
}
+ if(name != null)
+ name = new Path(name).makeRelative().toString();
ICommonModule mod = addModule(application, wc, name);
if(mod == null){ //utility project
return;
@@ -349,8 +355,10 @@
if (JavaEEProjectUtilities.isJEEComponent(ear, JavaEEProjectUtilities.DD_VERSION)){
String deployPath = model.getStringProperty(IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH);
String libDir = EarUtilities.getEARLibDir(ear);
-
- if(libDir != null && libDir.equals(deployPath)) {
+ IPath libDirPath = null;
+ if(libDir != null)
+ libDirPath = new Path(libDir).makeRelative();
+ if(libDirPath != null && deployPath != null && !libDirPath.isEmpty() && libDirPath.equals(new Path(deployPath).makeRelative())) {
// the component added is in the library directory of an EAR 5+ project
// we should trigger force update of the classpath of all module in the EAR
IVirtualReference[] refs = ear.getReferences();
@@ -371,6 +379,30 @@
private static IProgressMonitor submon(final IProgressMonitor parent, final int ticks) {
return (parent == null ? null : new SubProgressMonitor(parent, ticks));
}
+
+ public static ReferencedComponent findReferencedComponent(WorkbenchComponent aComponent, IVirtualComponent aReferencedComponent, StructureEdit se, StructureEdit compse) {
+ if(aComponent == null || aReferencedComponent == null)
+ return null;
+ if(aReferencedComponent.isBinary()){
+ EList referencedComponents = aComponent.getReferencedComponents();
+ String name = null;
+ if(aReferencedComponent.getName() != null) {
+ name = new Path(aReferencedComponent.getName()).lastSegment();
+ }
+ if(name != null) {
+ for (Iterator iter = referencedComponents.iterator(); iter.hasNext();) {
+ ReferencedComponent referencedComponent = (ReferencedComponent) iter.next();
+ URI uri = referencedComponent.getHandle();
+ if( uri != null && name.equals(uri.lastSegment()))
+ return referencedComponent;
+ }
+ }
+ } else {
+ WorkbenchComponent refwc = compse.getComponent();
+ return se.findReferencedComponent(aComponent, refwc);
+ }
+ return null;
+ }
@Override
public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java
index e8c2232..5eb78fc 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java
@@ -657,9 +657,9 @@
}
archives = new ArrayList(Arrays.asList(earComponent.getReferences()));
- Path earLibDirPath = null;
+ IPath earLibDirPath = null;
if(earLibraryDirectory != null)
- earLibDirPath = new Path(earLibraryDirectory);
+ earLibDirPath = new Path(earLibraryDirectory).makeRelative();
for( int i = 0; i < references.length; i++ ) {
if(references[i].getReferencedComponent().getProject().equals(component.getProject())) {
@@ -680,7 +680,7 @@
String uriString = null;
if(other != null)
uriString = JEEManifestDiscerner.calculateManifestRelativeRuntimePath(childProjectVirtualRef, other).append((new Path(other.getArchiveName())).lastSegment()).toString();
- if (other != null && isValidDependency(other.getReferencedComponent(), component) && (earLibraryDirectory == null || !other.getRuntimePath().equals(earLibDirPath)) && (uriString == null || uriString.equals(cpEntry))) {
+ if (other != null && isValidDependency(other.getReferencedComponent(), component) && (earLibraryDirectory == null || earLibDirPath != null && earLibDirPath.isEmpty() || !other.getRuntimePath().makeRelative().equals(earLibDirPath)) && (uriString == null || uriString.equals(cpEntry))) {
element = createElement(childProjectVirtualRef, other, cpEntry);
archives.remove(other);
} else {
@@ -736,9 +736,9 @@
// }
if (earComponent != null) {
- Path earLibDirPath = null;
+ IPath earLibDirPath = null;
if(earLibraryDirectory != null)
- earLibDirPath = new Path(earLibraryDirectory);
+ earLibDirPath = new Path(earLibraryDirectory).makeRelative();
if(childProjectVirtualRef == null) {
if(references == null)
@@ -758,7 +758,7 @@
for (int i = 0; i < archives.size(); i++) {
other = (IVirtualReference) archives.get(i);
- if (other != archive && isValidDependency(other.getReferencedComponent(), component) && (earLibraryDirectory == null || !other.getRuntimePath().equals(earLibDirPath))) {
+ if (other != archive && isValidDependency(other.getReferencedComponent(), component) && (earLibraryDirectory == null || earLibDirPath != null && earLibDirPath.isEmpty() || !other.getRuntimePath().makeRelative().equals(earLibDirPath))) {
IProject project = other.getReferencedComponent().getProject();
if (null == targetProjectName || null == project || !project.getName().equals(targetProjectName)) {
element = createElement(childProjectVirtualRef, other, null);
@@ -773,7 +773,7 @@
IVirtualReference ref = newrefs[i];
IVirtualComponent referencedComponent = ref.getReferencedComponent();
boolean isBinary = referencedComponent.isBinary();
- if( isBinary && (earLibraryDirectory == null || !ref.getRuntimePath().equals(earLibDirPath))){
+ if( isBinary && (earLibraryDirectory == null || earLibDirPath != null && earLibDirPath.isEmpty() || !ref.getRuntimePath().makeRelative().equals(earLibDirPath))){
/**
* Warning clean-up 12/05/2005
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/CopyArchiveIntoProjectOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/CopyArchiveIntoProjectOperation.java
index 3068048..9d3b6a9 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/CopyArchiveIntoProjectOperation.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/CopyArchiveIntoProjectOperation.java
@@ -59,7 +59,7 @@
String uriMapping = getUtilityJar().getName();
String earLib = EarUtilities.getEARLibDir(earComponent);
IFolder libDirFolder = null;
- if(earLib != null && earLib.length() >0) {
+ if(earLib != null && earLib.length() > 0) {
uriMapping = (new Path(earLib)).append(uriMapping).toString();
if(underlyingFolder.isAccessible()) {
libDirFolder = getWorkspaceRoot().getFolder(underlyingFolder.getFullPath().append(earLib));
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentImportDataModelProvider.java
index bad0688..8d7eab4 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentImportDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentImportDataModelProvider.java
@@ -304,7 +304,8 @@
// }
tempStatus = subDataModel.validateProperty(IFacetDataModelProperties.FACET_PROJECT_NAME);
if (!tempStatus.isOK()) {
- return WTPCommonPlugin.createErrorStatus(EARCreationResourceHandler.bind(EARCreationResourceHandler.EARImportDataModel_UI_0, new Object[] { tempProjectName,
+ String subModelProjectName = subDataModel.getStringProperty(IJ2EEComponentImportDataModelProperties.PROJECT_NAME);
+ return WTPCommonPlugin.createErrorStatus(EARCreationResourceHandler.bind(EARCreationResourceHandler.EARImportDataModel_UI_0, new Object[] { subModelProjectName,
tempArchive.getPath() }));
}
tempStatus = subDataModel.validate();
@@ -589,6 +590,7 @@
suffix += count;
}
localModel.setProperty(IJ2EEModuleImportDataModelProperties.PROJECT_NAME, moduleName + suffix);
+ defaultModuleNames.add(moduleName + suffix);
}
}
return moduleModels;
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/RemoveComponentFromEnterpriseApplicationOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/RemoveComponentFromEnterpriseApplicationOperation.java
index 302a4c2..798b2b5 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/RemoveComponentFromEnterpriseApplicationOperation.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/RemoveComponentFromEnterpriseApplicationOperation.java
@@ -74,8 +74,7 @@
try {
compse = StructureEdit.getStructureEditForWrite(wc.getProject());
if(compse != null) {
- WorkbenchComponent refwc = compse.getComponent();
- final ReferencedComponent ref = se.findReferencedComponent(earwc, refwc);
+ final ReferencedComponent ref = AddComponentToEnterpriseApplicationOp.findReferencedComponent(earwc, wc, se, compse);
earModel.modify(new Runnable() {
public void run() {
ICommonApplication application = (ICommonApplication)earModel.getModelObject();
@@ -273,5 +272,4 @@
protected boolean removeModule(ICommonApplication application, Object module) {
return application.getEARModules().remove(module);
}
-
}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java
index 036be88..2541924 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java
@@ -437,7 +437,11 @@
IVirtualReference reference = null;
for (Iterator referenceItr = implicitUtilityReferences.iterator(); referenceItr.hasNext(); ) {
reference = (IVirtualReference) referenceItr.next();
- module = application.getFirstModule(reference.getArchiveName());
+ String uri = reference.getArchiveName();
+ if(uri != null && reference.getRuntimePath() != null) {
+ uri = reference.getRuntimePath().makeRelative().append(uri).toString();
+ }
+ module = application.getFirstModule(uri);
if(module != null)
referenceItr.remove();
}
@@ -486,7 +490,11 @@
IVirtualReference [] refs = earComponent.getReferences();
for(int i=0;i<refs.length; i++){
- if(uri.equals(refs[i].getArchiveName())){
+
+ if(refs[i].getRuntimePath() != null &&
+ refs[i].getArchiveName() != null &&
+ uri.equals(refs[i].getRuntimePath().makeRelative().append(refs[i].getArchiveName()).toString())){
+
return refs[i].getReferencedComponent();
}
}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARVirtualComponent.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARVirtualComponent.java
index f4ef8b7..f884892 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARVirtualComponent.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARVirtualComponent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -208,6 +208,11 @@
List<IVirtualReference> hardReferences = getHardReferences(this);
return hardReferences.toArray(new IVirtualReference[hardReferences.size()]);
}
+ if( refType != null && IVirtualComponent.DISPLAYABLE_REFERENCES_ALL.equals(refType)){
+ checkIfStillValid(); // This will clear the cache of raw references if needed.
+ return getAllReferences();
+ }
+
IVirtualReference[] refs = getReferences();
Boolean objGetExpandRefs = (Boolean)options.get(J2EEModuleVirtualComponent.GET_EXPANDED_LIB_REFS);
boolean getExpandRefs = objGetExpandRefs != null ? objGetExpandRefs.booleanValue() : false;
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarFacetInstallDataModelProvider.java
index eb82f03..e87cc5d 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarFacetInstallDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarFacetInstallDataModelProvider.java
@@ -16,14 +16,20 @@
import java.util.Set;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDataModelProvider;
import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.ModuleCoreNature;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.jst.j2ee.internal.project.ProjectSupportResourceHandler;
import org.eclipse.osgi.util.NLS;
@@ -44,6 +50,24 @@
if (propertyName.equals(FACET_ID)) {
return ENTERPRISE_APPLICATION;
} else if (propertyName.equals(CONTENT_DIR)) {
+ if (model.isPropertySet(FACET_PROJECT_NAME))
+ {
+ String projectName = model.getStringProperty(FACET_PROJECT_NAME);
+ IProject project = (projectName.length() > 0) ? ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) : null;
+
+ if (project != null && project.exists()) {
+ if (ModuleCoreNature.isFlexibleProject(project))
+ {
+ IVirtualComponent c = ComponentCore.createComponent(project, true);
+ IVirtualFolder ejbroot = c.getRootFolder();
+ IPath configFolderPath = J2EEModuleVirtualComponent.getDefaultDeploymentDescriptorFolder(ejbroot);
+ if (configFolderPath != null && project.getFolder(configFolderPath).exists())
+ {
+ return configFolderPath.toString();
+ }
+ }
+ }
+ }
return J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.APPLICATION_CONTENT_FOLDER);
} else if (propertyName.equals(J2EE_PROJECTS_LIST) || propertyName.equals(JAVA_PROJECT_LIST)) {
return Collections.EMPTY_LIST;
@@ -86,4 +110,16 @@
protected int convertFacetVersionToJ2EEVersion(IProjectFacetVersion version) {
return J2EEVersionUtil.convertVersionStringToInt(version.getVersionString());
}
+
+ @Override
+ public boolean propertySet(String propertyName, Object propertyValue) {
+ if (FACET_PROJECT_NAME.equals(propertyName))
+ {
+ if (!model.isPropertySet(CONTENT_DIR)) {
+ model.notifyPropertyChange(CONTENT_DIR, IDataModel.DEFAULT_CHG);
+ }
+ }
+
+ return super.propertySet(propertyName, propertyValue);
+ }
}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/JEEManifestDiscerner.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/JEEManifestDiscerner.java
index 167fb31..3747198 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/JEEManifestDiscerner.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/JEEManifestDiscerner.java
@@ -80,6 +80,9 @@
*/
private IVirtualReference[] trimEarHardRefs(IVirtualComponent ear, IProject childProject, IVirtualReference[] hardRefs) {
String earLibDir = EarUtilities.getEARLibDir(ear);
+ IPath earLibDirPath = null;
+ if(earLibDir != null)
+ earLibDirPath = new Path(earLibDir).makeRelative();
ArrayList<IVirtualReference> refs = new ArrayList<IVirtualReference>();
// We have to prune out self-references
for( int i = 0; i < hardRefs.length; i++ ) {
@@ -88,7 +91,7 @@
|| hardRefs[i].getDependencyType() == IVirtualReference.DEPENDENCY_TYPE_CONSUMES
|| !hardRefs[i].getReferencedComponent().getProject().equals(childProject))
&& hardRefs[i].getArchiveName().endsWith("jar")) { //$NON-NLS-1$ // Only jar's are legal in MANIFEST
- if(earLibDir == null || !hardRefs[i].getRuntimePath().equals(new Path(earLibDir))) {// Jars in the EAR's library directory should not be added to the MANIFEST for EE5/EE6
+ if(earLibDirPath == null || earLibDirPath.isEmpty() || !hardRefs[i].getRuntimePath().makeRelative().equals(earLibDirPath)) {// Jars in the EAR's library directory should not be added to the MANIFEST for EE5/EE6
refs.add(hardRefs[i]);
}
}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetInstallDelegate.java
index 9ae043a..04fd949 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetInstallDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetInstallDelegate.java
@@ -1,5 +1,5 @@
/******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
+ * Copyright (c) 2005, 2011 BEA Systems, Inc. and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
*
* Contributors:
* Konstantin Komissarchik - initial API and implementation
+ * Roberto Sanchez (IBM) - Set default deployment descriptor folder
******************************************************************************/
package org.eclipse.jst.j2ee.project.facet;
@@ -24,6 +25,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jst.common.project.facet.WtpUtils;
+import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
import org.eclipse.jst.j2ee.internal.J2EEConstants;
import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
@@ -60,7 +62,9 @@
c.create(0, null);
final IVirtualFolder earroot = c.getRootFolder();
- earroot.createLink(new Path("/" + model.getStringProperty(IEarFacetInstallDataModelProperties.CONTENT_DIR)), 0, null); //$NON-NLS-1$
+ Path contentDirPath = new Path(model.getStringProperty(IEarFacetInstallDataModelProperties.CONTENT_DIR));
+ earroot.createLink(contentDirPath, 0, null);
+ J2EEModuleVirtualComponent.setDefaultDeploymentDescriptorFolder(earroot, contentDirPath, null);
try {
((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null);
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetRuntimeHandler.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetRuntimeHandler.java
index 5702337..b2b3eda 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetRuntimeHandler.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetRuntimeHandler.java
@@ -12,7 +12,6 @@
package org.eclipse.jst.j2ee.project.facet;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import org.eclipse.core.resources.IProject;
@@ -23,10 +22,7 @@
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
/**
* @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
@@ -47,56 +43,9 @@
throws CoreException
{
- if( monitor != null )
- {
- monitor.beginTask( "", 1 ); //$NON-NLS-1$
- }
-
- try
- {
- final IFacetedProject earFacetedProject
- = ProjectFacetsManager.create( earProject );
-
- final IRuntime earRuntime = earFacetedProject.getRuntime();
-
- final IFacetedProject moduleFacetedProject
- = ProjectFacetsManager.create( moduleProject );
-
- if( moduleFacetedProject != null &&
- ! equals( earRuntime, moduleFacetedProject.getRuntime() ) )
- {
- boolean supports = true;
-
- if( earRuntime != null )
- {
- for( Iterator itr = moduleFacetedProject.getProjectFacets().iterator();
- itr.hasNext(); )
- {
- final IProjectFacetVersion fver
- = (IProjectFacetVersion) itr.next();
-
- if( ! earRuntime.supports( fver ) )
- {
- supports = false;
- break;
- }
- }
- }
-
- if( supports )
- {
- moduleFacetedProject.setRuntime( earRuntime, submon( monitor, 1 ) );
- }
- }
- }
- finally
- {
- if( monitor != null )
- {
- monitor.done();
- }
- }
- }
+ // Attempt to change the runtime for the specified module
+ J2EEFacetRuntimeChangedDelegate.updateProjectRuntime( earProject, moduleProject, submon( monitor, 1 ));
+ }
public static void updateModuleProjectRuntime( final IProject earProject,
final Set moduleProjects,
@@ -105,29 +54,9 @@
throws CoreException
{
- if( monitor != null )
- {
- monitor.beginTask( "", moduleProjects.size() ); //$NON-NLS-1$
- }
-
- try
- {
- for( Iterator itr = moduleProjects.iterator(); itr.hasNext(); )
- {
- final IProject moduleProject = (IProject) itr.next();
-
- updateModuleProjectRuntime( earProject, moduleProject,
- submon( monitor, 1 ) );
- }
- }
- finally
- {
- if( monitor != null )
- {
- monitor.done();
- }
- }
- }
+ // Attempt to change the runtime of the referenced module projects.
+ J2EEFacetRuntimeChangedDelegate.updateProjectRuntime( earProject, moduleProjects, monitor);
+ }
public static final class RuntimeChangedDelegate
@@ -149,9 +78,10 @@
try
{
+ // Cascade this runtime change to projects referenced by this project
+
// Compile the list of projects referenced by this ear project.
-
- final Set moduleProjects = new HashSet();
+ final Set<IProject> moduleProjects = new HashSet<IProject>();
final IVirtualComponent earvc
= ComponentCore.createComponent( project );
@@ -170,12 +100,11 @@
{
monitor.worked( 1 );
}
-
- // Attempt to change the runtime for each of the referenced projects.
-
- updateModuleProjectRuntime( project, moduleProjects,
- submon( monitor, 9 ) );
- }
+
+ // Attempt to change the runtime of the referenced module projects.
+ J2EEFacetRuntimeChangedDelegate.updateProjectRuntime( project, moduleProjects,
+ submon( monitor, 9 ) );
+ }
finally
{
if( monitor != null )
@@ -191,24 +120,4 @@
{
return ( parent == null ? null : new SubProgressMonitor( parent, ticks ) );
}
-
- private static boolean equals( final Object obj1,
- final Object obj2 )
- {
- if( obj1 == obj2 )
- {
- return true;
- }
- else if( obj1 == null || obj2 == null )
- {
- return false;
- }
- else
- {
- return obj1.equals( obj2 );
- }
- }
-
-
-
}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/J2EEModuleVirtualComponent.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/J2EEModuleVirtualComponent.java
index e274e88..1c95720 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/J2EEModuleVirtualComponent.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/J2EEModuleVirtualComponent.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -19,8 +19,10 @@
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IClasspathAttribute;
import org.eclipse.jdt.core.IClasspathEntry;
@@ -48,12 +50,14 @@
import org.eclipse.wst.common.componentcore.internal.resources.VirtualReference;
import org.eclipse.wst.common.componentcore.internal.util.IComponentImplFactory;
import org.eclipse.wst.common.componentcore.internal.util.VirtualReferenceUtilities;
+import org.eclipse.wst.common.componentcore.resources.ITaggedVirtualResource;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
public class J2EEModuleVirtualComponent extends VirtualComponent implements IComponentImplFactory, IClasspathDependencyProvider, IClasspathDependencyReceiver {
+ public static final String DD_FOLDER_TAG = org.eclipse.wst.common.componentcore.internal.WorkbenchComponent.DEFAULT_ROOT_SOURCE_TAG;
public static String GET_JAVA_REFS = "GET_JAVA_REFS"; //$NON-NLS-1$
public static String GET_FUZZY_EAR_REFS = "GET_FUZZY_EAR_REFS"; //$NON-NLS-1$
public static String GET_EXPANDED_LIB_REFS = "GET_EXPANDED_LIB_REFS"; //$NON-NLS-1$
@@ -61,7 +65,7 @@
* Use this value to retrieve references consisting of only META-INF/MANIFEST.MF classpath
* attributes. Do this as follows:
* <code>
- * IVirtualCompoment compoment = a virtual component
+ * IVirtualCompoment component = a virtual component
* Map<String, Object> onlyManifestRefs = new HashMap<String, Object>();
* onlyManifestRefs.put(IVirtualComponent.REQUESTED_REFERENCE_TYPE, J2EEModuleVirtualComponent.ONLY_MANIFEST_REFERENCES);
* IVirtualReference[] refs = component.getReferences(onlyManifestRefs);
@@ -72,6 +76,9 @@
private long depGraphModStamp;
private long jeeModStamp;
+ /**
+ * Accessors of this field should always use getHardReferences()
+ */
private IVirtualReference[] hardReferences = null;
private IVirtualReference[] javaReferences = null;
private IVirtualReference[] parentEarManifestReferences = null;
@@ -135,6 +142,9 @@
if( val != null ) {
if( HARD_REFERENCES.equals(val) || NON_DERIVED_REFERENCES.equals(val) || DISPLAYABLE_REFERENCES.equals(val)){
return getHardReferences();
+ } else if(DISPLAYABLE_REFERENCES_ALL.equals(val)){
+ checkIfStillValid(); // This will clear the cache of raw references if needed.
+ return getAllReferences();
} else if (ONLY_MANIFEST_REFERENCES.equals(val)){
ArrayList<IVirtualReference> all = new ArrayList<IVirtualReference>();
checkIfStillValid();
@@ -173,9 +183,10 @@
IVirtualReference reference = iterator.next();
IVirtualComponent dynamicComponent = reference.getReferencedComponent();
boolean shouldInclude = true;
- for (int i = 0; i < hardReferences.length && shouldInclude ; i++) {
- if (hardReferences[i].getReferencedComponent().equals(dynamicComponent)) {
+ for(IVirtualReference hardRef : getHardReferences()){
+ if(hardRef.getReferencedComponent().equals(dynamicComponent)){
shouldInclude = false;
+ break;
}
}
if (shouldInclude) {
@@ -316,29 +327,22 @@
}
if (add && entryLocation != null) {
+ final IVirtualReference entryReference;
String componentPath = null;
- ClasspathDependencyVirtualComponent entryComponent = null;
- /*
- * if (entry.getEntryKind() == IClasspathEntry.CPE_PROJECT)
- * { componentPath =
- * VirtualArchiveComponent.CLASSPATHARCHIVETYPE; final
- * IProject cpEntryProject =
- * ResourcesPlugin.getWorkspace().getRoot
- * ().getProject(entry.getPath().lastSegment());
- * entryComponent = (VirtualArchiveComponent)
- * ComponentCore.createArchiveComponent(cpEntryProject,
- * componentPath); } else {
- */
- componentPath = VirtualArchiveComponent.CLASSPATHARCHIVETYPE
- + IPath.SEPARATOR + entryLocation.toPortableString();
- entryComponent = new ClasspathDependencyVirtualComponent(
- project, componentPath, isClassFolder);
- // }
- final IVirtualReference entryReference = ComponentCore
- .createReference(this, entryComponent, runtimePath);
- ((VirtualReference) entryReference).setDerived(true);
- entryReference.setArchiveName(ClasspathDependencyUtil
- .getArchiveName(entry));
+
+ if (entry.getEntryKind() == IClasspathEntry.CPE_PROJECT)
+ {
+ final IProject cpEntryProject = ResourcesPlugin.getWorkspace().getRoot().getProject(entry.getPath().lastSegment());
+ IVirtualComponent entryComponent = ComponentCore.createComponent(cpEntryProject);
+ entryReference = ComponentCore.createReference(this, entryComponent, runtimePath);
+ entryReference.setArchiveName(VirtualReferenceUtilities.INSTANCE.getDefaultProjectArchiveName(entryComponent));
+ } else {
+ componentPath = VirtualArchiveComponent.CLASSPATHARCHIVETYPE + IPath.SEPARATOR + entryLocation.toPortableString();
+ ClasspathDependencyVirtualComponent entryComponent = new ClasspathDependencyVirtualComponent(project, componentPath, isClassFolder);
+ entryReference = ComponentCore.createReference(this, entryComponent, runtimePath);
+ ((VirtualReference) entryReference).setDerived(true);
+ entryReference.setArchiveName(ClasspathDependencyUtil.getArchiveName(entry));
+ }
cpRefs.add(entryReference);
}
}
@@ -517,4 +521,26 @@
}
return new Path("/"); //$NON-NLS-1$
}
+
+ public static void setDefaultDeploymentDescriptorFolder(IVirtualFolder folder, IPath aProjectRelativeLocation, IProgressMonitor monitor) {
+ if (folder instanceof ITaggedVirtualResource){
+ ITaggedVirtualResource taggedFolder = (ITaggedVirtualResource)folder;
+ //First, remove tag is there is already one folder already tagged
+ IPath[] paths = taggedFolder.getTaggedResources(DD_FOLDER_TAG);
+ for (IPath path:paths){
+ taggedFolder.tagResource(path, null, monitor);
+ }
+ // Now, tag the correct path
+ ((ITaggedVirtualResource)folder).tagResource(aProjectRelativeLocation, DD_FOLDER_TAG, monitor);
+ }
+ }
+
+ public static IPath getDefaultDeploymentDescriptorFolder(IVirtualFolder folder) {
+ IPath returnValue = null;
+ if (folder instanceof ITaggedVirtualResource){
+ returnValue = ((ITaggedVirtualResource)folder).getFirstTaggedResource(DD_FOLDER_TAG);
+ }
+ return returnValue;
+ }
+
}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JavaEEBinaryComponentHelper.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JavaEEBinaryComponentHelper.java
index 9b4cbbe..56a4852 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JavaEEBinaryComponentHelper.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JavaEEBinaryComponentHelper.java
@@ -5,7 +5,9 @@
import java.util.HashSet;
import java.util.Hashtable;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.zip.ZipException;
@@ -107,7 +109,7 @@
try {
helper.openArchive();
} catch (ArchiveOpenFailureException e) {
- J2EEPlugin.logError(e);
+ logError(e);
}
} finally {
if (helper != null) {
@@ -408,11 +410,48 @@
try {
return openArchive();
} catch (ArchiveOpenFailureException e) {
- J2EEPlugin.logError(e);
+ logError(e);
}
return null;
}
+ static class LRUMap extends LinkedHashMap {
+ private static final long serialVersionUID = 1L;
+
+ private int fMaxSize;
+
+ LRUMap(int maxSize) {
+ super();
+ fMaxSize = maxSize;
+ }
+
+ @Override
+ protected boolean removeEldestEntry(Entry eldest) {
+ return size() > fMaxSize;
+ }
+ }
+
+ static LRUMap loggedBadPaths = new LRUMap(1000);
+
+ /**
+ * This is to suppress excessive logging of for the same missing archive.
+ * Now each missing archive will only be logged once.
+ *
+ * @param e
+ */
+ static void logError(ArchiveOpenFailureException e) {
+ IPath archivePath = e.getArchivePath();
+ if (archivePath != null) {
+ if (loggedBadPaths.containsKey(archivePath)) {
+ // only log an error for a specific archive path once.
+ return;
+ }
+ loggedBadPaths.put(archivePath, archivePath);
+ }
+ J2EEPlugin.logError(e);
+ }
+
+
protected IArchive openArchive() throws ArchiveOpenFailureException {
ArchiveCache cache = ArchiveCache.getInstance();
IArchive archive = cache.getArchive(getComponent());
@@ -483,9 +522,9 @@
try {
binaryAdapter.physicallyOpen();
} catch (ZipException e) {
- org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.logError(e);
+ J2EEPlugin.logError(e);
} catch (IOException e) {
- org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.logError(e);
+ J2EEPlugin.logError(e);
}
}
}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JavaEEBinaryComponentLoadAdapter.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JavaEEBinaryComponentLoadAdapter.java
index 12c4ad5..65561dc 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JavaEEBinaryComponentLoadAdapter.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JavaEEBinaryComponentLoadAdapter.java
@@ -39,10 +39,10 @@
try{
resetZipFile(archivePath);
} catch (ZipException e) {
- ArchiveOpenFailureException openFailureException = new ArchiveOpenFailureException(file.getAbsolutePath(), e);
+ ArchiveOpenFailureException openFailureException = new ArchiveOpenFailureException(archivePath, file.getAbsolutePath(), e);
throw openFailureException;
} catch (IOException e) {
- ArchiveOpenFailureException openFailureException = new ArchiveOpenFailureException(file.getAbsolutePath(), e);
+ ArchiveOpenFailureException openFailureException = new ArchiveOpenFailureException(archivePath, file.getAbsolutePath(), e);
throw openFailureException;
}
} else {
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/EarUtilities.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/EarUtilities.java
index bc7de44..b14d2c0 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/EarUtilities.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/EarUtilities.java
@@ -20,6 +20,7 @@
import java.util.Map;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.jst.j2ee.application.Module;
import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
@@ -110,9 +111,9 @@
if (earLib == null)
return refs;
ArrayList<IVirtualReference> moduleRefs = new ArrayList<IVirtualReference>();
- Path earLibPath = new Path(earLib);
+ IPath earLibPath = new Path(earLib).makeRelative();
for (int i = 0; i < refs.length; i++) {
- if (!refs[i].getRuntimePath().equals(earLibPath)) {
+ if (earLibPath.isEmpty() || !refs[i].getRuntimePath().makeRelative().equals(earLibPath)) {
moduleRefs.add(refs[i]);
}
}
@@ -482,7 +483,7 @@
// default lib dir if there is no deployment descriptor
// or if the deployment descriptor does not override
- String libDir = J2EEConstants.EAR_DEFAULT_LIB_DIR;
+ String libDir = new Path(J2EEConstants.EAR_DEFAULT_LIB_DIR).makeRelative().toString();
// retrieve the model provider
IModelProvider modelProvider = ModelProviderManager.getModelProvider(earProject);
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/WebUtilities.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/WebUtilities.java
index c0cc52c..6c6fdee 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/WebUtilities.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/WebUtilities.java
@@ -11,6 +11,8 @@
package org.eclipse.jst.j2ee.project;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -20,7 +22,9 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil;
import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
+import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
import org.eclipse.jst.j2ee.internal.J2EEConstants;
import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
import org.eclipse.jst.j2ee.internal.common.XMLResource;
@@ -106,7 +110,7 @@
IVirtualReference[] refComponents = webComponent.getReferences(options);
for(IVirtualReference virtualReference : refComponents){
- if(virtualReference.getRuntimePath().equals(WEBLIB)){
+ if(virtualReference.getRuntimePath().equals(WEBLIB) && !ClasspathDependencyUtil.isClassFolderReference(virtualReference)){
IVirtualComponent virtualComponent = virtualReference.getReferencedComponent();
if(JavaEEProjectUtilities.isWebFragmentProject(virtualComponent)){
result.add(virtualComponent);
@@ -157,7 +161,7 @@
// base path
for (int i = 0; i < refComponents.length; i++) {
IVirtualReference reference = refComponents[i];
- if (reference.getRuntimePath().equals(WEBLIB))
+ if (reference.getRuntimePath().equals(WEBLIB) && !ClasspathDependencyUtil.isClassFolderReference(reference))
result.add(reference);
}
@@ -222,4 +226,64 @@
{
ComponentUtilities.setServerContextRoot(webProject, contextRoot);
}
+ /**
+ * This method will get the context root on the associated workbench module if null is passed for the earProject, or will use the ear to determine the context root.
+ * This context root is used by the server at runtime.
+ *
+ * @param webProject IProject
+ * @param earProject IProject - can be null
+ */
+ public static String getServerContextRoot(IProject webProject,IProject earProject) {
+ String contextRoot = null;
+ if (earProject == null || !JavaEEProjectUtilities.deploymentDescriptorExists(earProject))
+ return ComponentUtilities.getServerContextRoot(webProject);
+ else if (JavaEEProjectUtilities.isEARProject(earProject) && JavaEEProjectUtilities.isDynamicWebProject(webProject)) {
+ EARArtifactEdit edit = null;
+ try {
+ edit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
+ contextRoot = edit.getWebContextRoot(webProject);
+ } finally {
+ if (edit!=null)
+ edit.dispose();
+ }
+ }
+ return contextRoot;
+ }
+
+ /**
+ * Returns all referencing Web projects.
+ *
+ * @param project
+ * Project to check. If <code>null</code> then a zero length
+ * array is returned. If a WAR, then a one element array will be
+ * returned.
+ * @return Array of referencing Web projects.
+ */
+ public static IProject[] getReferencingWebProjects(final IProject project) {
+ if (project == null) {
+ return new IProject[0];
+ } else if (isDynamicWebProject(project)) {
+ return new IProject[] { project };
+ }
+
+ List result = new ArrayList();
+ IVirtualComponent component = ComponentCore.createComponent(project);
+ if (component != null) {
+ IVirtualComponent[] refComponents = component.getReferencingComponents();
+ for (int i = 0; i < refComponents.length; i++) {
+ if (isDynamicWebProject(refComponents[i].getProject()))
+ result.add(refComponents[i].getProject());
+ }
+ }
+
+ IProject[] webProjects = (IProject[]) result.toArray(new IProject[result.size()]);
+ // sort the list so it is consistent
+ Arrays.sort(webProjects, new Comparator<IProject>() {
+ public int compare(IProject p0, IProject p1) {
+ return p0.getName().compareTo(p1.getName());
+ }
+ });
+
+ return webProjects;
+ }
}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetProjectCreationDataModelProvider.java
index 56338f1..236d17a 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetProjectCreationDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetProjectCreationDataModelProvider.java
@@ -15,6 +15,7 @@
import java.util.List;
import java.util.Set;
+import org.eclipse.core.filesystem.EFS;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@@ -39,6 +40,7 @@
public class J2EEFacetProjectCreationDataModelProvider extends FacetProjectCreationDataModelProvider implements IJ2EEFacetProjectCreationDataModelProperties {
private static Set<IProjectFacet> MODULE_FACETS = new HashSet<IProjectFacet>();
+ private boolean caseSensitiveFs = EFS.getLocalFileSystem().isCaseSensitive();
static
{
@@ -186,6 +188,10 @@
String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.SAME_MODULE_AND_EAR_NAME, new Object[]{getStringProperty(EAR_PROJECT_NAME)});
return WTPCommonPlugin.createErrorStatus(errorMessage);
}
+ if (!caseSensitiveFs && getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME).equalsIgnoreCase(getStringProperty(EAR_PROJECT_NAME))) {
+ String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.SAME_MODULE_AND_EAR_NAME_DIFFERENT_CASE, new Object[]{getStringProperty(EAR_PROJECT_NAME)});
+ return WTPCommonPlugin.createErrorStatus(errorMessage);
+ }
}
}
return super.validate(propertyName);
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetRuntimeChangedDelegate.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetRuntimeChangedDelegate.java
index a8e2666..c4fd416 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetRuntimeChangedDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetRuntimeChangedDelegate.java
@@ -12,8 +12,10 @@
package org.eclipse.jst.j2ee.project.facet;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -21,6 +23,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.jdt.core.IClasspathAttribute;
import org.eclipse.jdt.core.IClasspathEntry;
@@ -30,6 +33,9 @@
import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
import org.eclipse.jst.common.project.facet.core.IClasspathProvider;
import org.eclipse.jst.common.project.facet.core.internal.FacetCorePlugin;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
import org.eclipse.wst.common.project.facet.core.IDelegate;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
@@ -60,7 +66,7 @@
{
if( monitor != null )
{
- monitor.beginTask( "", 1 ); //$NON-NLS-1$
+ monitor.beginTask( "", 11 ); //$NON-NLS-1$
}
try
@@ -79,6 +85,27 @@
{
monitor.worked( 1 );
}
+
+ // Cascade this runtime change to projects referenced by this project
+
+ // Compile the list of projects referenced by this project.
+ final Set<IProject> childProjects = new HashSet<IProject>();
+
+ final IVirtualComponent projectVC = ComponentCore.createComponent( project );
+ final IVirtualReference[] vrefs = projectVC.getReferences();
+
+ for( int i = 0; i < vrefs.length; i++ ) {
+ final IVirtualReference vref = vrefs[ i ];
+ final IVirtualComponent vc = vref.getReferencedComponent();
+ childProjects.add( vc.getProject() );
+ }
+
+ if( monitor != null ) {
+ monitor.worked( 1 );
+ }
+
+ // Attempt to change the runtime for each of the referenced projects.
+ updateProjectRuntime( project, childProjects, submon( monitor, 9 ) );
}
finally
{
@@ -198,5 +225,82 @@
return list;
}
+
+ private static IProgressMonitor submon( final IProgressMonitor parent, final int ticks ) {
+ return ( parent == null ? null : new SubProgressMonitor( parent, ticks ) );
+ }
+
+ public static void updateProjectRuntime( final IProject project,
+ final IProject childProject,
+ final IProgressMonitor monitor ) throws CoreException {
+ if( monitor != null ) {
+ monitor.beginTask( "", 1 ); //$NON-NLS-1$
+ }
+ try
+ {
+ final IFacetedProject facetedProject = ProjectFacetsManager.create( project );
+
+ final IRuntime projectRuntime = facetedProject.getRuntime();
+
+ final IFacetedProject childFacetedProject = ProjectFacetsManager.create( childProject );
+
+ if( childFacetedProject != null &&
+ ! equals(projectRuntime, childFacetedProject.getRuntime()))
+ {
+ boolean supports = true;
+
+ if( projectRuntime != null )
+ {
+ for( Iterator itr = childFacetedProject.getProjectFacets().iterator(); itr.hasNext(); ) {
+ final IProjectFacetVersion fver = (IProjectFacetVersion) itr.next();
+
+ if(!projectRuntime.supports(fver)) {
+ supports = false;
+ break;
+ }
+ }
+ }
+
+ if( supports ) {
+ childFacetedProject.setRuntime(projectRuntime, submon( monitor, 1 ) );
+ }
+ }
+ }
+ finally {
+ if( monitor != null ) {
+ monitor.done();
+ }
+ }
+ }
+
+ public static void updateProjectRuntime( final IProject project,
+ final Set<IProject> childProjects,
+ final IProgressMonitor monitor ) throws CoreException {
+ if( monitor != null ) {
+ monitor.beginTask( "", childProjects.size() ); //$NON-NLS-1$
+ }
+
+ try {
+ for(final IProject childProject : childProjects) {
+ updateProjectRuntime( project, childProject,
+ submon( monitor, 1 ) );
+ }
+ }
+ finally {
+ if( monitor != null ) {
+ monitor.done();
+ }
+ }
+ }
+
+ private static boolean equals( final Object obj1, final Object obj2 ) {
+ if( obj1 == obj2 ) {
+ return true;
+ } else if( obj1 == null || obj2 == null ) {
+ return false;
+ } else {
+ return obj1.equals( obj2 );
+ }
+ }
}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEModuleFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEModuleFacetInstallDataModelProvider.java
index 7405c00..c99a51a 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEModuleFacetInstallDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEModuleFacetInstallDataModelProvider.java
@@ -22,6 +22,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
@@ -32,6 +33,7 @@
import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainerUtils;
import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
+import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences.Keys;
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
import org.eclipse.osgi.util.NLS;
@@ -204,16 +206,40 @@
{
final Object config = javaInstallAction.getConfig();
- if( config instanceof JavaFacetInstallConfig )
+ if(config != null)
{
- this.javaFacetInstallConfig = (JavaFacetInstallConfig) config;
+ if( config instanceof JavaFacetInstallConfig )
+ {
+ this.javaFacetInstallConfig = (JavaFacetInstallConfig) config;
+
+ String providerId = model.getID();
+ if(providerId != "") //$NON-NLS-1$
+ {
+ if (providerId.indexOf("WebFacetInstallDataModelProvider") != -1) //$NON-NLS-1$
+ { this.javaFacetInstallConfig.setDefaultOutputFolder(new Path(J2EEPlugin.getDefault().getJ2EEPreferences().getString(Keys.DYN_WEB_OUTPUT_FOLDER))); }
+ else
+ if(providerId.indexOf("EjbFacetInstallDataModelProvider") != -1) //$NON-NLS-1$
+ { this.javaFacetInstallConfig.setDefaultOutputFolder(new Path(J2EEPlugin.getDefault().getJ2EEPreferences().getString(Keys.EJB_OUTPUT_FOLDER))); }
+ else
+ if(providerId.indexOf("AppClientFacetInstallDataModelProvider") != -1) //$NON-NLS-1$
+ { this.javaFacetInstallConfig.setDefaultOutputFolder(new Path(J2EEPlugin.getDefault().getJ2EEPreferences().getString(Keys.APP_CLIENT_OUTPUT_FOLDER))); }
+ else
+ if(providerId.indexOf("ConnectorFacetInstallDataModelProvider") != -1) //$NON-NLS-1$
+ { this.javaFacetInstallConfig.setDefaultOutputFolder(new Path(J2EEPlugin.getDefault().getJ2EEPreferences().getString(Keys.JCA_OUTPUT_FOLDER))); }
+ else
+ if(providerId.indexOf("UtilityFacetInstallDataModelProvider") != -1) //$NON-NLS-1$
+ { this.javaFacetInstallConfig.setDefaultOutputFolder(new Path(J2EEPlugin.getDefault().getJ2EEPreferences().getUtilityOutputFolderName())); }
+ }
+ }
+ else
+ {
+ this.javaFacetInstallConfig = (JavaFacetInstallConfig) Platform.getAdapterManager().getAdapter( config, JavaFacetInstallConfig.class );
+ }
+ if (this.javaFacetInstallConfig != null)
+ {
+ this.javaFacetInstallConfig.addListener( this.javaFacetSourceFolderListener, JavaFacetInstallConfig.ChangeEvent.Type.SOURCE_FOLDERS_CHANGED );
+ }
}
- else
- {
- this.javaFacetInstallConfig = (JavaFacetInstallConfig) Platform.getAdapterManager().getAdapter( config, JavaFacetInstallConfig.class );
- }
-
- this.javaFacetInstallConfig.addListener( this.javaFacetSourceFolderListener, JavaFacetInstallConfig.ChangeEvent.Type.SOURCE_FOLDERS_CHANGED );
}
}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableFactory.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableFactory.java
index 307111b..6a03672 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableFactory.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableFactory.java
@@ -235,7 +235,7 @@
List<IModule> modulesToRemove = null;
for (Iterator<IModule> iterator = moduleDelegates.keySet().iterator(); iterator.hasNext();) {
IModule module = iterator.next();
- if (module.getProject().equals(project)) {
+ if (module.getProject() != null && module.getProject().equals(project)) {
if (modulesToRemove == null) {
modulesToRemove = new ArrayList<IModule>();
}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPreferences.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPreferences.java
index 04aefde..dea3c29 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPreferences.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPreferences.java
@@ -91,10 +91,18 @@
firePreferenceChanged();
}
+ /**
+ * @return
+ * @deprecated Do not use. The ALLOW_CLASSPATH_DEP preference has been deprecated and its ability to disable dynamic manifest updates will soon be removed.
+ */
public boolean getAllowClasspathDep() {
return getBoolean(Keys.ALLOW_CLASSPATH_DEP);
}
+ /**
+ * @param value
+ * @deprecated Do not use. The ALLOW_CLASSPATH_DEP preference has been deprecated and its ability to disable dynamic manifest updates will soon be removed.
+ */
public void setAllowClasspathDep(boolean value) {
getInstancePreferenceNode(J2EEPlugin.PLUGIN_ID).putBoolean(Keys.ALLOW_CLASSPATH_DEP, value);
firePreferenceChanged();
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java
index dc1b3f5..1d30b6d 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java
@@ -29,7 +29,11 @@
final static String USE_EAR_LIBRARIES = "org.eclipse.jst.j2ee.preferences.useEARLibraries";//$NON-NLS-1$
final static String USE_WEB_APP_LIBRARIES = "org.eclipse.jst.j2ee.preferences.useWebAppLibraries";//$NON-NLS-1$
final static String USE_EAR_LIBRARIES_JDT_EXPORT = "org.eclipse.jst.j2ee.preferences.useEARLibrariesJDTExport";//$NON-NLS-1$
+ /**
+ * @deprecated Do not use. The ALLOW_CLASSPATH_DEP preference has been deprecated and its ability to disable dynamic manifest updates will soon be removed.
+ */
final static String ALLOW_CLASSPATH_DEP = IProductConstants.ALLOW_CLASSPATH_DEP;
+ final static String VALIDATE_DUPLICATE_CLASSPATH_COMPONENT_URI= IProductConstants.VALIDATE_DUPLICATE_CLASSPATH_COMPONENT_URI;
static final String J2EE_WEB_CONTENT = "org.eclipse.jst.j2ee.preference.j2eeWebContentName"; //$NON-NLS-1$
static final String STATIC_WEB_CONTENT = "org.eclipse.jst.j2ee.preference.staticWebContentName"; //$NON-NLS-1$
@@ -156,7 +160,11 @@
final static boolean INCREMENTAL_DEPLOYMENT_SUPPORT = true;
final static boolean USE_EAR_LIBRARIES_JDT_EXPORT = false;
final static String ID_PERSPECTIVE_HIERARCHY_VIEW = "org.eclipse.ui.navigator.ProjectExplorer"; //$NON-NLS-1$
+ /**
+ * @deprecated Do not use. The ALLOW_CLASSPATH_DEP preference has been deprecated and its ability to disable dynamic manifest updates will soon be removed.
+ */
final static boolean ALLOW_CLASSPATH_DEP = true;
+ final static boolean VALIDATE_DUPLICATE_CLASSPATH_COMPONENT_URI = true;
final static boolean SHOW_JAVA_EE_MODULE_DEPENDENCY_PAGE = true;
public static final String STRING_DEFAULT_DEFAULT = ""; //$NON-NLS-1$
public static final boolean BOOLEAN_DEFAULT_DEFAULT = false;
@@ -211,6 +219,9 @@
String allowClasspathDep = ProductManager.getProperty(IProductConstants.ALLOW_CLASSPATH_DEP);
boolean allowClasspathDepDefault = (allowClasspathDep != null) ? Boolean.parseBoolean(allowClasspathDep) : Defaults.ALLOW_CLASSPATH_DEP;
node.putBoolean(Keys.ALLOW_CLASSPATH_DEP, allowClasspathDepDefault);
+ String validateDupClasspathCompURIs = ProductManager.getProperty(IProductConstants.VALIDATE_DUPLICATE_CLASSPATH_COMPONENT_URI);
+ boolean validateDupClasspathCompURIsDefault = (validateDupClasspathCompURIs != null) ? Boolean.parseBoolean(validateDupClasspathCompURIs) : Defaults.VALIDATE_DUPLICATE_CLASSPATH_COMPONENT_URI;
+ node.putBoolean(Keys.VALIDATE_DUPLICATE_CLASSPATH_COMPONENT_URI, validateDupClasspathCompURIsDefault);
String showJavaEEModuleDependencyPage = ProductManager.getProperty(IProductConstants.SHOW_JAVA_EE_MODULE_DEPENDENCY_PAGE);
boolean showJavaEEModuleDependencyPageDefault = (showJavaEEModuleDependencyPage != null) ? Boolean.parseBoolean(showJavaEEModuleDependencyPage) : Defaults.SHOW_JAVA_EE_MODULE_DEPENDENCY_PAGE;
node.putBoolean(Keys.SHOW_JAVA_EE_MODULE_DEPENDENCY_PAGE, showJavaEEModuleDependencyPageDefault);
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarValidator.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarValidator.java
index 0f9b689..58dbc1b 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarValidator.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/UIEarValidator.java
@@ -60,7 +60,7 @@
import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
import org.eclipse.jst.j2ee.internal.J2EEConstants;
import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyEnablement;
+import org.eclipse.jst.j2ee.internal.classpathdep.DuplicateClasspathComponentURIValidatorEnablement;
import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
@@ -283,7 +283,7 @@
status = super.validateInJob(inHelper, inReporter);
validateModuleMaps(earModule);
validateManifests();
- if(ClasspathDependencyEnablement.isAllowClasspathComponentDependency()){
+ if(DuplicateClasspathComponentURIValidatorEnablement.shouldValidateDuplicateClasspathComponentURI()){
validateDuplicateClasspathComponentURIs(earModule);
}
// validateUtilJarMaps(earEdit,earModule);
diff --git a/plugins/org.eclipse.jst.j2ee/plugin.xml b/plugins/org.eclipse.jst.j2ee/plugin.xml
index 58653c0..42a4437 100644
--- a/plugins/org.eclipse.jst.j2ee/plugin.xml
+++ b/plugins/org.eclipse.jst.j2ee/plugin.xml
@@ -23,6 +23,7 @@
<extension-point id="J2EEModelProvider" name="J2EE Model Provider" schema="schema/J2EEModelProvider.exsd"/>
<extension-point id="archiveExportParticipants" name="Archive Export Participants Extension Point" schema="schema/archiveExportParticipants.exsd"/>
<extension-point id="RefactoringChecker" name="RefactoringChecker" schema="schema/RefactoringChecker.exsd"/>
+ <extension-point id="ClasspathDependencyExtension" name="ClasspathDependencyExtension" schema="schema/ClasspathDependencyExtension.exsd"/>
<!--============================-->
<!-- Module Core Nature -->
@@ -348,6 +349,16 @@
types="jst.utility"
versions="1.0">
</moduleType>
+ <enablement>
+ <or>
+ <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.appclient:1.4]"/>
+ <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.ejb:2.1]"/>
+ <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.utility:1.0]"/>
+ <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.connector:1.5]"/>
+ <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.web:2.4]"/>
+ <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.ear:1.4]"/>
+ </or>
+ </enablement>
</moduleFactory>
</extension>
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java
index e1e5655..49796b2 100644
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java
+++ b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java
@@ -16,8 +16,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.resources.WorkspaceJob;
@@ -269,20 +269,6 @@
for (int i = 0; i < childDeltas.length; i++) {
processResourceDelta(childDeltas[i], localRootFolder, localSourceToRuntime, pathsToAdd, pathsToRemove, changedJavaPaths);
}
- } else if (kind == IResourceDelta.REMOVED){
- if(sourceToRuntime != null){
- IResource resource = delta.getResource();
- if(resource.getType() == IResource.FOLDER){
- IVirtualComponent c = ComponentCore.createComponent(resource.getProject());
- if(c != null){
- localRootFolder = c.getRootFolder();
- final IPath movedFrom = delta.getProjectRelativePath();
- final IPath runtimePath = (IPath) sourceToRuntime.get(movedFrom);
- final IVirtualFolder folder = rootFolder.getFolder(runtimePath);
- pathsToRemove.add(new Object[]{movedFrom, folder});
- }
- }
- }
} else {
final int flags = delta.getFlags();
if ((flags & IResourceDelta.MOVED_FROM) == IResourceDelta.MOVED_FROM) {
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRenameOperation.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRenameOperation.java
index 5f97e78..ffab03f 100644
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRenameOperation.java
+++ b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRenameOperation.java
@@ -17,7 +17,9 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
import org.eclipse.jst.j2ee.model.IModelProvider;
import org.eclipse.jst.j2ee.model.ModelProviderManager;
@@ -29,9 +31,11 @@
import org.eclipse.jst.javaee.core.JavaeeFactory;
import org.eclipse.jst.javaee.ejb.EJBJar;
import org.eclipse.jst.javaee.web.WebApp;
+import org.eclipse.wst.common.componentcore.internal.Property;
import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
+import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
@@ -71,15 +75,30 @@
StructureEdit core = null;
WorkbenchComponent component = null;
try{
- core = StructureEdit.getStructureEditForWrite(refactoredMetadata.getProject());
- if(core != null){
- component = core.getComponent();
- }
+ core = StructureEdit.getStructureEditForWrite(refactoredMetadata.getProject());
+ if(core != null){
+ component = core.getComponent();
+ }
- // if the deploy-name equals the old project name, update it in the module-specific deployment descriptor
- if (component != null && component.getName().equals(originalMetadata.getProjectName())) {
- component.setName(refactoredMetadata.getProjectName());
- }
+ // if the deploy-name equals the old project name, update it in the module-specific deployment descriptor
+ if (component != null && component.getName().equals(originalMetadata.getProjectName())) {
+ component.setName(refactoredMetadata.getProjectName());
+ }
+
+ //update the java-output-path property
+ if (component != null){
+ List<Property> properties = component.getProperties();
+ for (Property property:properties){
+ if (property.getName().equals(IModuleConstants.PROJ_REL_JAVA_OUTPUT_PATH)){
+ IPath javaOutputPath = new Path(property.getValue());
+ IPath oldProjectNamePath = new Path(oldProjectName).makeAbsolute();
+ if (oldProjectNamePath.isPrefixOf(javaOutputPath)){
+ IPath newJavaOutputPath = new Path(newProjectName).append(javaOutputPath.removeFirstSegments(1)).makeAbsolute();
+ property.setValue(newJavaOutputPath.toString());
+ }
+ }
+ }
+ }
}finally {
if(core != null) {
core.saveIfNecessary(null);
@@ -88,8 +107,8 @@
}
final IProject refactoredProject = refactoredMetadata.getProject();
String pType = JavaEEProjectUtilities.getJ2EEProjectType(refactoredProject);
- if(IJ2EEFacetConstants.UTILITY.equals(pType) || "".equals(pType)) { //$NON-NLS-1$
- // skip if a utility project (will not have a ModelProvider and checking logs an error
+ if(IJ2EEFacetConstants.UTILITY.equals(pType) || "".equals(pType) || IJ2EEFacetConstants.STATIC_WEB.equals(pType)) { //$NON-NLS-1$
+ // skip if a utility or static web project (will not have a ModelProvider and checking logs an error
return;
}
final IModelProvider model = ModelProviderManager.getModelProvider(refactoredProject);
diff --git a/plugins/org.eclipse.jst.j2ee/schema/ClasspathDependencyExtension.exsd b/plugins/org.eclipse.jst.j2ee/schema/ClasspathDependencyExtension.exsd
new file mode 100644
index 0000000..7b7e505
--- /dev/null
+++ b/plugins/org.eclipse.jst.j2ee/schema/ClasspathDependencyExtension.exsd
@@ -0,0 +1,119 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.jst.j2ee" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+ <appInfo>
+ <meta.schema plugin="org.eclipse.jst.j2ee" id="ClasspathDependencyExtension" name="ClasspathDependencyExtension"/>
+ </appInfo>
+ <documentation>
+ [Enter description of this extension point.]
+ </documentation>
+ </annotation>
+
+ <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
+
+ <element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ <documentation>
+ This extension is used by extenders to indicate if a particular project will handle the exporting of external jars referenced in the classpath. It also allows the extender to provide the path or where the external jar will be located in an exported project.
+ </documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="classpathdependency" minOccurs="1" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appInfo>
+ <meta.attribute translatable="true"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="classpathdependency">
+ <annotation>
+ <documentation>
+ This element allows the extender to provide an enablement child element. The enablement element allows the extender to indicate at a high level if this project applies to them. If no enablement element is provided an enablement value of true is assumed. The classpathdependency element also requires that a class attribute be specified. See the description of this class attribute for more details.
+ </documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="enablement" minOccurs="0" maxOccurs="1"/>
+ </sequence>
+ <attribute name="class" type="string" use="required">
+ <annotation>
+ <documentation>
+ This class allows the extender to specify two things.
+
+1) with the projectHandlesExport method the extender can verify in more detail if this project and classpath entry applies to them. Returning true indicates that the project and classpath applies to their situation and mechanism is in place export externally referenced jar files.
+
+2) with the getClasspathdependencyAttribute method the extender can indicate the location of an external jar file in an exported project. If the extender wants the default WTP calculated path value then null should be returned.
+ </documentation>
+ <appInfo>
+ <meta.attribute kind="java" basedOn="org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyExtension:"/>
+ </appInfo>
+ </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>
+
+
+</schema>
diff --git a/plugins/org.eclipse.jst.jee.ui/.classpath b/plugins/org.eclipse.jst.jee.ui/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/plugins/org.eclipse.jst.jee.ui/.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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.jee.ui/.cvsignore b/plugins/org.eclipse.jst.jee.ui/.cvsignore
deleted file mode 100644
index 7722bc8..0000000
--- a/plugins/org.eclipse.jst.jee.ui/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 51b9c61..0000000
--- a/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,54 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.jee.ui;singleton:=true
-Bundle-Version: 1.0.303.qualifier
-Bundle-Activator: org.eclipse.jst.jee.ui.plugin.JEEUIPlugin
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.jst.j2ee.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.jee;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.web.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.103,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.102,2.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.103,2.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jst.j2ee.navigator.ui;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.j2ee.jca;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-Localization: plugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.jst.jee.ui.internal,
- org.eclipse.jst.jee.ui.internal.deployables,
- org.eclipse.jst.jee.ui.internal.navigator,
- org.eclipse.jst.jee.ui.internal.navigator.appclient,
- org.eclipse.jst.jee.ui.internal.navigator.dnd,
- org.eclipse.jst.jee.ui.internal.navigator.ear,
- org.eclipse.jst.jee.ui.internal.navigator.ejb,
- org.eclipse.jst.jee.ui.internal.navigator.web,
- org.eclipse.jst.jee.ui.plugin,
- org.eclipse.jst.jee.ui.project.facet
diff --git a/plugins/org.eclipse.jst.jee.ui/about.html b/plugins/org.eclipse.jst.jee.ui/about.html
deleted file mode 100644
index 0799bdb..0000000
--- a/plugins/org.eclipse.jst.jee.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributor's license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.jee.ui/about.ini b/plugins/org.eclipse.jst.jee.ui/about.ini
deleted file mode 100644
index 68af291..0000000
--- a/plugins/org.eclipse.jst.jee.ui/about.ini
+++ /dev/null
@@ -1,12 +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 "featureImage" contains path to feature image (32x32)
-featureImage=icons/WTP_icon_x32_v2.png
-
diff --git a/plugins/org.eclipse.jst.jee.ui/about.mappings b/plugins/org.eclipse.jst.jee.ui/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/plugins/org.eclipse.jst.jee.ui/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.jst.jee.ui/about.properties b/plugins/org.eclipse.jst.jee.ui/about.properties
deleted file mode 100644
index 3b900be..0000000
--- a/plugins/org.eclipse.jst.jee.ui/about.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-
-blurb=Eclipse Java EE Developer Tools\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
diff --git a/plugins/org.eclipse.jst.jee.ui/build.properties b/plugins/org.eclipse.jst.jee.ui/build.properties
deleted file mode 100644
index 1e9caaf..0000000
--- a/plugins/org.eclipse.jst.jee.ui/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties,\
- about.html,\
- icons/,\
- about.ini,\
- about.mappings,\
- about.properties
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/30_ejbjar_obj.gif b/plugins/org.eclipse.jst.jee.ui/icons/30_ejbjar_obj.gif
deleted file mode 100644
index 75bf52f..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/30_ejbjar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/31_ejbjar_obj.gif b/plugins/org.eclipse.jst.jee.ui/icons/31_ejbjar_obj.gif
deleted file mode 100644
index f165442..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/31_ejbjar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/WTP_icon_x32_v2.png b/plugins/org.eclipse.jst.jee.ui/icons/WTP_icon_x32_v2.png
deleted file mode 100644
index 6f09c2a..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/WTP_icon_x32_v2.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/appclient_50.gif b/plugins/org.eclipse.jst.jee.ui/icons/appclient_50.gif
deleted file mode 100644
index 6e3ab16..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/appclient_50.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/appclient_60.gif b/plugins/org.eclipse.jst.jee.ui/icons/appclient_60.gif
deleted file mode 100644
index 8442581..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/appclient_60.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/appclientgroup_obj.gif b/plugins/org.eclipse.jst.jee.ui/icons/appclientgroup_obj.gif
deleted file mode 100644
index 2768428..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/appclientgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/config_prop_obj.gif b/plugins/org.eclipse.jst.jee.ui/icons/config_prop_obj.gif
deleted file mode 100644
index bc47239..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/config_prop_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/connection.gif b/plugins/org.eclipse.jst.jee.ui/icons/connection.gif
deleted file mode 100755
index e8efe69..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/connection.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/connectorgroup_obj.gif b/plugins/org.eclipse.jst.jee.ui/icons/connectorgroup_obj.gif
deleted file mode 100644
index ad3af3c..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/connectorgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/ear_50.gif b/plugins/org.eclipse.jst.jee.ui/icons/ear_50.gif
deleted file mode 100644
index bb0e361..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/ear_50.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/ear_60.gif b/plugins/org.eclipse.jst.jee.ui/icons/ear_60.gif
deleted file mode 100644
index a9be4b4..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/ear_60.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/eargroup_obj.gif b/plugins/org.eclipse.jst.jee.ui/icons/eargroup_obj.gif
deleted file mode 100644
index 2eeb3ef..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/eargroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/ejbgroup_obj.gif b/plugins/org.eclipse.jst.jee.ui/icons/ejbgroup_obj.gif
deleted file mode 100644
index b0adb3e..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/ejbgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/full/ctool16/dep_desc.gif b/plugins/org.eclipse.jst.jee.ui/icons/full/ctool16/dep_desc.gif
deleted file mode 100644
index 31ecb7a..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/full/ctool16/dep_desc.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/license_obj.gif b/plugins/org.eclipse.jst.jee.ui/icons/license_obj.gif
deleted file mode 100644
index 50e8dbd..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/license_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/ovr/business_local_ovr.gif b/plugins/org.eclipse.jst.jee.ui/icons/ovr/business_local_ovr.gif
deleted file mode 100644
index 4d87826..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/ovr/business_local_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/ovr/business_remote_ovr.gif b/plugins/org.eclipse.jst.jee.ui/icons/ovr/business_remote_ovr.gif
deleted file mode 100644
index 9114e38..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/ovr/business_remote_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/ovr/home_ovr.gif b/plugins/org.eclipse.jst.jee.ui/icons/ovr/home_ovr.gif
deleted file mode 100644
index 3cbfe78..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/ovr/home_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/ovr/local_home_ovr.gif b/plugins/org.eclipse.jst.jee.ui/icons/ovr/local_home_ovr.gif
deleted file mode 100644
index d782734..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/ovr/local_home_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/ovr/local_ovr.gif b/plugins/org.eclipse.jst.jee.ui/icons/ovr/local_ovr.gif
deleted file mode 100644
index 43e1655..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/ovr/local_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/ovr/remote_ovr.gif b/plugins/org.eclipse.jst.jee.ui/icons/ovr/remote_ovr.gif
deleted file mode 100644
index 19c9cae..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/ovr/remote_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/resource_adapter_obj.gif b/plugins/org.eclipse.jst.jee.ui/icons/resource_adapter_obj.gif
deleted file mode 100644
index 959c660..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/resource_adapter_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/webapp_25.gif b/plugins/org.eclipse.jst.jee.ui/icons/webapp_25.gif
deleted file mode 100644
index efb8c1b..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/webapp_25.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/webapp_30.gif b/plugins/org.eclipse.jst.jee.ui/icons/webapp_30.gif
deleted file mode 100644
index 52bd43b..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/webapp_30.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/webgroup_obj.gif b/plugins/org.eclipse.jst.jee.ui/icons/webgroup_obj.gif
deleted file mode 100644
index 274d361..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/webgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/plugin.properties b/plugins/org.eclipse.jst.jee.ui/plugin.properties
deleted file mode 100644
index c0e95c1..0000000
--- a/plugins/org.eclipse.jst.jee.ui/plugin.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.jst.jee.ui
-Bundle-Name.0 = Eclipse Java EE Developer Tools
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-create_deploy_files=Generate Deployment Descriptor Stub
-j2ee=Java EE
-j2ee.actions.description_ui_=Actions for Java EE Development
-ENTERPRISE_BEAN_DECORATOR=Java EE 5 Enterprise Beans and Interfaces Decorator
-ENTERPRISE_BEAN_DECORATOR.DESCRIPTION=Java EE 5 Enterprise Beans are decorated according to their type Session/Message Driven/Entity. The same decorator is used to mark Business and 2.x interfaces
-JAVA_EE_5_PROBLEM_MARKER_RESOURCE_DECORATOR=Java EE 5 Project Problem Marker Resource Decorator
-JAVA_EE_5_PROBLEM_MARKER_RESOURCE_DECORATOR.DESCRIPTION=Resource Decorator enables error markers to be put on the project node.
-jeeProjectDecorator=Java EE 5 Project Decorator
-jeeProjectDecorator.description=Decorator is used to mark Java EE 5 projects
-ADD_REMOVE_MODULE_DEPENDENCIES_ACTION = Add/Remove
-EJB_NAVIGATOR_CONTENT = Java EE Navigator Content EJB
-WEB_NAVIGATOR_CONTENT = Java EE Navigator Content WEB
-EAR_NAVIGATOR_CONTENT = Java EE Navigator Content EAR
-APP_CLIENT_NAVIGATOR_CONTENT = Java EE Navigator Content Application Client
-CONNECTOR_NAVIGATOR_CONTENT = Java EE Navigator Content Connector
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jee.ui/plugin.xml b/plugins/org.eclipse.jst.jee.ui/plugin.xml
deleted file mode 100644
index 2855f3e..0000000
--- a/plugins/org.eclipse.jst.jee.ui/plugin.xml
+++ /dev/null
@@ -1,1430 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IProject">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IFile">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
-
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.javaee.application.Application">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- adaptableType="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider"
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
- <adapter
- type="org.eclipse.debug.ui.actions.ILaunchable">
- </adapter>
- </factory>
-
- </extension>
-
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IProject">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jdt.core.ICompilationUnit">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IFile">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.javaee.web.Servlet">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.javaee.web.WebApp">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
-
- </extension>
-
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IProject">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jdt.core.ICompilationUnit">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IFile">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
-
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.javaee.ejb.EJBJar">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
-
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.javaee.ejb.SessionBean">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
-
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.javaee.ejb.MessageDrivenBean">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
-
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.javaee.ejb.EntityBean">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- </extension>
- <extension
- point="org.eclipse.core.runtime.adapters">
- <factory
- adaptableType="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode"
- class="org.eclipse.jst.jee.ui.internal.navigator.DDAdapterFactory">
- <adapter
- type="org.eclipse.jdt.core.IJavaElement">
- </adapter>
- </factory>
- </extension>
-
- <extension
- point="org.eclipse.wst.server.core.moduleArtifactAdapters">
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.server.ear1"
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.javaee.application.Application"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.server.ear2"
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear:[5.0" />
- </adapt>
-
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.server.ear3"
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IFile">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear:[5.0" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- <moduleArtifactAdapter
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory"
- id="org.eclipse.jst.jee.server.ear4">
- <enablement>
- <with
- variable="selection">
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- </extension>
-
-
- <!-- ==================================================================== -->
-<!-- Extension point: org.eclipse.etools.server.core.moduleObjectAdapters -->
-<!-- Purpose: Define adapters for Web resources -->
-<!-- ==================================================================== -->
- <extension point="org.eclipse.wst.server.core.moduleArtifactAdapters">
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.web.server.webresource"
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.javaee.web.WebApp"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.web.server.webresource2"
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.javaee.web.Servlet"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.web.server.webresource3"
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web:[2.5" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.web.server.webresource4"
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IFile">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web:[2.5" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.web.server.webresource5"
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
-
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jdt.core.ICompilationUnit">
- <test forcePluginActivation="true"
- property="org.eclipse.jst.j2ee.common.projectFacet"
- value="jst.web:[2.5" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- </extension>
-
-
- <!-- ==================================================================== -->
-<!-- Extension point: org.eclipse.etools.server.core.moduleObjectAdapters -->
-<!-- Purpose: Define adapters for Web fragment resources -->
-<!-- ==================================================================== -->
- <extension point="org.eclipse.wst.server.core.moduleArtifactAdapters">
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.web.server.webresource"
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.javaee.web.WebFragment"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.web.server.webresource2"
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.javaee.web.Servlet"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.web.server.webresource3"
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.webfragment:[3.0" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.web.server.webresource4"
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IFile">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.webfragment:[3.0" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.web.server.webresource5"
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
-
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jdt.core.ICompilationUnit">
- <test forcePluginActivation="true"
- property="org.eclipse.jst.j2ee.common.projectFacet"
- value="jst.webfragment:[3.0" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- </extension>
-
- <!-- ==================================================================== -->
-<!-- Purpose: Define adapters for EJB resources -->
-<!-- Extension point: org.eclipse.wst.server.core.moduleArtifactAdapters -->
-<!-- ==================================================================== -->
- <extension
- point="org.eclipse.wst.server.core.moduleArtifactAdapters">
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.j2ee.server.ejb"
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.javaee.ejb.EJBJar"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- <moduleArtifactAdapter
- id="org.eclipse.jst.j2ee.server.ejb2"
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.javaee.ejb.SessionBean"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.server.ejb3"
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jdt.core.ICompilationUnit"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.server.ejb4"
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IFile">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb:[3.0" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.server.ejb5"
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb:[3.0" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.j2ee.server.ejb6"
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.javaee.ejb.MessageDrivenBean"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.j2ee.server.ejb7"
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.javaee.ejb.EntityBean"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- </extension>
- <extension
- point="org.eclipse.wst.server.core.moduleArtifactAdapters">
- <moduleArtifactAdapter
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- id="org.eclipse.jst.jee.server.ejb">
- <enablement>
- <with
- variable="selection">
- <adapt
- type="org.eclipse.core.resources.IProject">
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb:[3.0">
- </test>
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- <moduleArtifactAdapter
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- id="org.eclipse.jst.jee.server.ejb77">
- <enablement>
- <with
- variable="selection">
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider">
- </instanceof>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- </extension>
-
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.core.resources.IProject"
- adaptable="true"
- id="org.eclipse.jst.jee.ui.CreateDeploymentFilesAction">
- <action
- class="org.eclipse.jst.jee.ui.internal.CreateDeploymentFilesActionDelegate"
- enablesFor="1"
- icon="icons/full/ctool16/dep_desc.gif"
- id="createDeploymentFiles"
- label="%create_deploy_files"
- menubarPath="javeeUIPopupMenuCategory/slot2">
- </action>
- <enablement>
- <or>
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb:[3.0" />
- </adapt>
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web:[2.5" />
- </adapt>
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear:[5.0" />
- </adapt>
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.appclient:[5.0" />
- </adapt>
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.connector:[1.6" />
- </adapt>
- </or>
- </enablement>
-
-
- </objectContribution>
- <objectContribution
- id="show_dep_prop_page"
- nameFilter="*"
- objectClass="org.eclipse.jst.jee.ui.internal.navigator.ear.ModulesNode">
- <action
- class="org.eclipse.jst.jee.ui.internal.navigator.ear.ShowDepPropPageAction"
- enablesFor="1"
- id="show_dep_prop_page"
- label="%ADD_REMOVE_MODULE_DEPENDENCIES_ACTION"
- menubarPath="additions">
- </action>
- </objectContribution>
- </extension>
-
-
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- adaptable="true"
- id="org.eclipse.jst.jee.ui.CreateDeploymentFilesAction2"
- objectClass="java.lang.Object">
- <action
- class="org.eclipse.jst.jee.ui.internal.CreateDeploymentFilesActionDelegate"
- enablesFor="1"
- icon="icons/full/ctool16/dep_desc.gif"
- id="createDeploymentFiles"
- label="%create_deploy_files">
- </action>
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.appclient.GroupAppClientProvider">
- </instanceof>
- </or>
- </enablement>
- </objectContribution>
- </extension>
-
-
-
- <!--
- <extension
- point="org.eclipse.wst.common.frameworks.OperationExtension"
- id="org.eclipse.wst.common.frameworks.datamodel.tests.extended">
- <operationExtension
- id="org.eclipse.jst.jee.ui.internal.CreateDeploymentFilesDataModelOperation"
- postOperationClass="org.eclipse.wst.common.frameworks.datamodel.tests.extended.B"
- preOperationClass="org.eclipse.wst.common.frameworks.datamodel.tests.extended.A"/>
-
- </extension>
- -->
- <extension
- point="org.eclipse.ui.navigator.navigatorContent">
- <navigatorContent
- activeByDefault="true"
- contentProvider="org.eclipse.jst.jee.ui.internal.navigator.Ejb3ContentProvider"
- icon="icons/ejbgroup_obj.gif"
- id="org.eclipse.jst.jee.ui.ejb"
- labelProvider="org.eclipse.jst.jee.ui.internal.navigator.Ejb3LabelProvider"
- name="%EJB_NAVIGATOR_CONTENT"
- priority="highest">
- <triggerPoints>
- <or>
- <adapt type="org.eclipse.core.resources.IProject">
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb:3.0"/>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb:3.1">
- </test>
- </or>
- </adapt>
- <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode" />
- <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode" />
- <instanceof value="org.eclipse.jst.javaee.core.JavaEEObject" />
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.AbstractEjbGroupProvider">
- </instanceof>
- </or>
- </triggerPoints>
- <possibleChildren>
- <or>
- <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode" />
- <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode" />
- <instanceof value="org.eclipse.jst.javaee.core.JavaEEObject" />
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.AbstractEjbGroupProvider">
- </instanceof>
- </or>
- </possibleChildren>
-
-
- <commonWizard
- menuGroupId="org.eclipse.jst.ejb.ui"
- type="new"
- wizardId="org.eclipse.jst.ejb.ui.internal.wizard.AddSessionBeanWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEjbSession">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.ejb.SessionBean">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanInterfaceNode">
- </instanceof>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode">
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.jst.jee.ui.beanType"
- value="isSessionBean">
- </test>
- </or>
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ejb.ui"
- type="new"
- wizardId="org.eclipse.jst.ejb.ui.internal.wizard.AddMessageDrivenBeanWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEjbMessageDriven">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.ejb.MessageDrivenBean">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.ActivationConfigProperties">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.ejb.ActivationConfigProperty">
- </instanceof>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode">
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.jst.jee.ui.beanType"
- value="isMessageDrivenBean">
- </test>
- </or>
- </adapt>
- </or></enablement>
- </commonWizard>
-
-
- <actionProvider
- class="org.eclipse.jst.jee.ui.internal.navigator.JEEActionProvider"
- id="org.eclipse.jst.javaee.ui.JEEActionProvider">
- <enablement>
- <or>
- <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode"/>
- <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode"/>
- <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanInterfaceNode"/>
- <instanceof value="org.eclipse.jst.javaee.core.JavaEEObject" />
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.appclient.GroupAppClientProvider">
- </instanceof>
- </or>
- </enablement>
- </actionProvider>
-
-
- <actionProvider
- class="org.eclipse.ui.internal.navigator.resources.actions.NewActionProvider"
- id="org.eclipse.ui.navigator.resources.JEENewActions">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider">
- </instanceof>
-
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.AbstractSubWebProviders">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </instanceof></or>
- </enablement>
- </actionProvider>
-
- <actionProvider
- class="org.eclipse.ui.internal.navigator.resources.actions.ResourceMgmtActionProvider"
- id="org.eclipse.ui.navigator.resources.actions.JEEResourceMgmtAction">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider">
- </instanceof>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
-
- </or>
- </enablement>
- </actionProvider>
- <actionProvider
- class="org.eclipse.ui.internal.navigator.resources.actions.WorkManagementActionProvider"
- id="org.eclipse.ui.internal.navigator.resources.actions.JEEWorkMgmtAction">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider">
- </instanceof>
-
- <instanceof
- value="org.eclipse.jst.javaee.core.JavaEEObject">
- </instanceof>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
-
- </or>
- </enablement>
- </actionProvider>
- <actionProvider
- class="org.eclipse.ui.internal.navigator.resources.actions.PortingActionProvider"
- id="org.eclipse.ui.internal.navigator.resources.actions.JEEPortingAction">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode">
- </instanceof>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
-
- </or>
- </enablement>
- </actionProvider>
- <commonWizard
- menuGroupId="org.eclipse.jst.ejb.export1"
- type="export"
- wizardId="org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentExportWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider">
- </instanceof>
- </or>
- </enablement>
- </commonWizard>
-
-
- </navigatorContent>
-
- <navigatorContent
- contentProvider="org.eclipse.jst.jee.ui.internal.navigator.Web25ContentProvider"
- icon="icons/webgroup_obj.gif"
- id="org.eclipse.jst.jee.ui.web"
- labelProvider="org.eclipse.jst.jee.ui.internal.navigator.Web25LabelProvider"
- name="%WEB_NAVIGATOR_CONTENT"
- priority="highest">
- <triggerPoints>
- <or>
- <adapt type="org.eclipse.core.resources.IProject">
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web:2.5"/>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web:3.0">
- </test>
- </or>
- </adapt>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.AbstractWebGroupProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebArtifactNode">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.core.JavaEEObject">
- </instanceof>
- </or>
- </triggerPoints>
- <possibleChildren>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.AbstractWebGroupProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebArtifactNode">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.core.JavaEEObject">
- </instanceof>
- </or>
- </possibleChildren>
-
-
- <actionProvider
- class="org.eclipse.ui.internal.navigator.resources.actions.ResourceMgmtActionProvider"
- id="org.eclipse.ui.internal.navigator.resources.actions.JEEWebResourceMgmtAction">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.AbstractSubWebProviders">
- </instanceof>
- <!--<instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>-->
- </or>
- </enablement>
- </actionProvider>
- <actionProvider
- class="org.eclipse.ui.internal.navigator.resources.actions.WorkManagementActionProvider"
- id="org.eclipse.ui.internal.navigator.resources.actions.JEEWebWrkMngmntAction">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.AbstractSubWebProviders">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>
-
- <instanceof
- value="org.eclipse.jst.javaee.core.JavaEEObject">
- </instanceof>
-
- </or>
- </enablement>
- </actionProvider>
- <actionProvider
- class="org.eclipse.ui.internal.navigator.resources.actions.PortingActionProvider"
- id="org.eclipse.ui.internal.navigator.resources.actions.JEEWebPortingAction">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.AbstractSubWebProviders">
- </instanceof>
- <!--
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>-->
- </or>
- </enablement>
- </actionProvider>
-
- <commonWizard
- menuGroupId="org.eclipse.wst.web.ui.webclass"
- type="new"
- wizardId="org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.GroupServletItemProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.web.Servlet">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.GroupServletMappingItemProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.web.ServletMapping">
- </instanceof>
- </or></enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.wst.web.ui.webclass"
- type="new"
- wizardId="org.eclipse.jst.servlet.ui.internal.wizard.AddFilterWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.GroupFiltersItemProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.web.Filter">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.GroupFilterMappingItemProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.web.FilterMapping">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.web.Servlet">
- </instanceof>
- </or></enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.wst.web.ui.webclass"
- type="new"
- wizardId="org.eclipse.jst.servlet.ui.internal.wizard.AddListenerWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.GroupListenerItemProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.core.Listener">
- </instanceof>
- </or></enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.wst.web.export"
- type="export"
- wizardId="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentExportWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>
- </or>
- </enablement>
- </commonWizard>
- </navigatorContent>
- <navigatorContent
- activeByDefault="true"
- contentProvider="org.eclipse.jst.jee.ui.internal.navigator.Ear5ContentProvider"
- icon="icons/eargroup_obj.gif"
- id="org.eclipse.jst.jee.ui.ear"
- labelProvider="org.eclipse.jst.jee.ui.internal.navigator.Ear5LabelProvider"
- name="%EAR_NAVIGATOR_CONTENT"
- priority="highest">
- <triggerPoints>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear..BundledNode">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </instanceof>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear:5.0">
- </test>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear:6.0">
- </test>
- </or>
- </adapt>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.ModulesNode">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.BundledLibsNode">
- </instanceof>
- <instanceof
- value="org.eclipse.wst.common.componentcore.resources.IVirtualReference">
- </instanceof>
- </or>
- </triggerPoints>
- <possibleChildren>
- <or>
- <instanceof
- value="java.io.File">
- </instanceof>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web">
- </test>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb">
- </test>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.utility">
- </test>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear">
- </test>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.appclient">
- </test>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.connector">
- </test>
- </or>
- </adapt>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.ModulesNode"/>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.BundledNode"/>
- <instanceof
- value="org.eclipse.core.internal.resources.File">
- </instanceof>
- <instanceof
- value="org.eclipse.jdt.internal.core.JarPackageFragmentRoot">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.core.internal.resources.Project">
- </instanceof>
- <instanceof
- value="org.eclipse.wst.common.componentcore.resources.IVirtualReference">
- </instanceof>
- </or>
- </possibleChildren>
- <commonSorter
- class="org.eclipse.jst.jee.ui.internal.navigator.ear.Application5ViewerSorter"
- id="org.eclipse.jst.jee.navigator.internal.ApplicationViewerSorter">
- </commonSorter>
- <dropAssistant
- class="org.eclipse.jst.jee.ui.internal.navigator.dnd.AddProjectToEARDropAssistant"
- id="org.eclipse.jst.jee.navigator.ui.AddModulesToEAR">
- <possibleDropTargets>
- <or>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear">
- </test>
- </adapt>
- <instanceof
- value="org.eclipse.jst.javaee.application.Application">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.AbstractEarNode">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </instanceof>
- </or>
- </possibleDropTargets>
- </dropAssistant>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui"
- type="new"
- wizardId="org.eclipse.jst.ejb.ui.project.facet.EjbProjectWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or></enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui"
- type="new"
- wizardId="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui"
- type="new"
- wizardId="org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui"
- type="new"
- wizardId="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui"
- type="new"
- wizardId="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui.export"
- type="export"
- wizardId="org.eclipse.jst.j2ee.internal.wizard.EARComponentExportWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui.import"
- type="import"
- wizardId="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentImportWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui.import"
- type="import"
- wizardId="org.eclipse.jst.j2ee.internal.wizard.EARComponentImportWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui.import"
- type="import"
- wizardId="org.eclipse.jst.j2ee.internal.wizard.J2EEUtilityJarImportWizardNew">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui.import"
- type="import"
- wizardId="org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentImportWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui.import"
- type="import"
- wizardId="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentImportWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui.import"
- type="import"
- wizardId="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentImportWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- </navigatorContent>
- <navigatorContent
- activeByDefault="true"
- contentProvider="org.eclipse.jst.jee.ui.internal.navigator.AppClient5ContentProvider"
- icon="icons/appclientgroup_obj.gif"
- id="org.eclipse.jst.jee.ui.appclient"
- labelProvider="org.eclipse.jst.jee.ui.internal.navigator.AppClient5LabelProvider"
- name="%APP_CLIENT_NAVIGATOR_CONTENT"
- priority="highest">
- <triggerPoints>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IProject">
- </instanceof>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.appclient:5.0">
- </test>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.appclient:6.0">
- </test>
- </or>
- </adapt>
- <instanceof
- value="org.eclipse.jst.javaee.core.JavaEEObject">
- </instanceof>
- </or>
- </triggerPoints>
- <possibleChildren>
- <or>
- <instanceof
- value="org.eclipse.jst.javaee.core.JavaEEObject">
- </instanceof>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.appclient:5.0">
- </test>
- </or>
- </adapt>
- </or>
- </possibleChildren>
- </navigatorContent>
- <navigatorContent
- activeByDefault="true"
- contentProvider="org.eclipse.jst.jee.ui.internal.navigator.ConnectorContentProvider"
- icon="icons/connectorgroup_obj.gif"
- id="org.eclipse.jst.jee.ui.ra"
- labelProvider="org.eclipse.jst.jee.ui.internal.navigator.ConnectorLabelProvider"
- name="%CONNECTOR_NAVIGATOR_CONTENT"
- priority="highest">
- <possibleChildren>
- <or>
- <instanceof
- value="org.eclipse.jst.javaee.core.JavaEEObject">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ra.AbstractConnectorGroupProvider">
- </instanceof>
- </or>
- </possibleChildren>
- <triggerPoints>
- <or>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.connector:1.6">
- </test>
- </or>
- </adapt>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ra.AbstractConnectorGroupProvider">
- </instanceof>
- </or>
- </triggerPoints>
-
- </navigatorContent>
- </extension>
- <extension
- point="org.eclipse.core.runtime.adapters">
- <factory
- adaptableType="org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider"
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
- <adapter
- type="org.eclipse.debug.ui.actions.ILaunchable">
- </adapter>
- </factory>
- <factory
- adaptableType="org.eclipse.jst.javaee.core.JavaEEObject"
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
- <adapter
- type="org.eclipse.debug.ui.actions.ILaunchable">
- </adapter>
- </factory>
- <factory
- adaptableType="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider"
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
- <adapter
- type="org.eclipse.debug.ui.actions.ILaunchable">
- </adapter>
- </factory>
-
-
- <factory
- adaptableType="org.eclipse.jst.javaee.core.JavaEEObject"
- class="org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory">
- <adapter type="org.eclipse.core.resources.IResource"/>
- </factory>
-
- </extension>
- <extension
- point="org.eclipse.ui.navigator.viewer">
- <viewerActionBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
- <includes>
- <actionExtension pattern="org.eclipse.jst.javaee.ui.JEEActionProvider"/>
- </includes>
- </viewerActionBinding>
- </extension>
- <extension
- point="org.eclipse.ui.decorators">
- <decorator
- adaptable="true"
- location="TOP_RIGHT"
- lightweight="true"
- label="%ENTERPRISE_BEAN_DECORATOR"
- state="true"
- class="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanDecorator"
- id="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanDecorator">
- <enablement>
- <or>
- <objectClass
- name="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanInterfaceNode">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode">
- </objectClass>
- </or>
- </enablement>
- <description>
- %ENTERPRISE_BEAN_DECORATOR.DESCRIPTION
- </description>
- </decorator>
- </extension>
- <extension
- point="org.eclipse.ui.navigator.viewer">
- <viewerContentBinding
- viewerId="org.eclipse.ui.navigator.ProjectExplorer">
- <includes>
- <contentExtension pattern="org.eclipse.jst.jee.ui.*"/>
- <contentExtension pattern="org.eclipse.jst.jee.ui.filters.*"/>
- <contentExtension
- pattern="org.eclipse.jst.jee.ui.internal.navigator.*">
- </contentExtension>
- </includes>
- </viewerContentBinding>
- </extension>
-
-
-<!-- ====================================================== -->
-<!-- Label Decorators -->
-<!-- ====================================================== -->
- <extension
- point="org.eclipse.ui.decorators">
- <decorator
- adaptable="true"
- location="TOP_LEFT"
- lightweight="true"
- label="%jeeProjectDecorator"
- state="true"
- class="org.eclipse.jst.j2ee.navigator.internal.J2EEProjectDecorator"
- id="org.eclipse.jst.jee.navigator.internal.JEEProjectDecorator">
- <enablement>
- <or>
- <objectClass name="org.eclipse.core.resources.IProject"/>
- <objectClass name="org.eclipse.jdt.core.IJavaProject"/>
- </or>
- </enablement>
- <description>
- %jeeProjectDecorator.description
- </description>
- </decorator>
- </extension>
-
- <extension
- point="org.eclipse.core.expressions.propertyTesters">
- <propertyTester
- class="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNodePropertyTester"
- id="org.eclipse.jst.jee.ui.BeanNodePropertyTester"
- namespace="org.eclipse.jst.jee.ui"
- properties="beanType"
- type="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode">
- </propertyTester>
- </extension>
-
-
-
- </plugin>
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/CreateDeploymentFilesActionDelegate.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/CreateDeploymentFilesActionDelegate.java
deleted file mode 100644
index ec04fd22..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/CreateDeploymentFilesActionDelegate.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.ui.internal;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.actions.BaseAction;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.jee.project.facet.IAppClientCreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.project.facet.IConnectorCreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.project.facet.ICreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.project.facet.IEJBCreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.project.facet.IEarCreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.project.facet.IWebCreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author ramanday
- */
-public class CreateDeploymentFilesActionDelegate extends BaseAction {
-
- @Override
- public void selectionChanged(org.eclipse.jface.action.IAction action, org.eclipse.jface.viewers.ISelection aSelection) {
- super.selectionChanged(action, aSelection);
- boolean isEnabled = false;
- if (aSelection != null) {
- IStructuredSelection structuredSelection = (IStructuredSelection) aSelection;
- isEnabled = isValidSelection(getProjectFromSelection(structuredSelection), null);
- }
- setEnabled(isEnabled);
- action.setEnabled(isEnabled);
- }
-
- private IProject getProjectFromSelection(IStructuredSelection structuredSelection){
- IProject project = ProjectUtilities.getProject(structuredSelection.getFirstElement());
- if (project == null){
- Object firstElement = structuredSelection.getFirstElement();
- if (IAdaptable.class.isInstance(firstElement)){
- return (IProject) ((IAdaptable) firstElement).getAdapter(IProject.class);
- }
- }
- return project;
- }
-
- private boolean isValidSelection(IProject project, Shell shell) {
- return (project != null
- && J2EEProjectUtilities.isJEEProject(project)
- && !hasDeploymentDescriptor(project, shell));
- }
-
- /**
- * Method informInvalidSelection.
- */
- private void informInvalidSelection(Shell shell) {
- MessageDialog.openInformation(shell, Messages.INVALID_DEP_DESC_SELECTION_TITLE,
- Messages.INFORM_INVALID_DEP_DESC_SELECTION);
- }
-
- private boolean hasDeploymentDescriptor(IProject project, Shell shell) {
- boolean ret = true;
- IPath ddFilePath = null;
- if(JavaEEProjectUtilities.isEARProject(project)){
- ddFilePath = new Path(J2EEConstants.APPLICATION_DD_URI);
- } else if(JavaEEProjectUtilities.isEJBProject(project)){
- ddFilePath = new Path(J2EEConstants.EJBJAR_DD_URI);
- } else if(JavaEEProjectUtilities.isDynamicWebProject(project)){
- ddFilePath = new Path(J2EEConstants.WEBAPP_DD_URI);
- } else if(JavaEEProjectUtilities.isApplicationClientProject(project)){
- ddFilePath = new Path(J2EEConstants.APP_CLIENT_DD_URI);
- }else if(JavaEEProjectUtilities.isJCAProject(project)){
- ddFilePath = new Path(J2EEConstants.RAR_DD_URI);
- }
- IVirtualComponent component = ComponentCore.createComponent(project);
- if(component.getRootFolder() != null
- && component.getRootFolder().getUnderlyingFolder() != null){
- IFile ddXmlFile = component.getRootFolder().getUnderlyingFolder().getFile(ddFilePath);
- ret = ddXmlFile.exists();
- if(shell != null && ret)
- informInvalidSelection(shell);
- }
- return ret;
- }
-
-
- /*
- */
- @Override
- protected void primRun(Shell shell) {
- IProject project = getProjectFromSelection(selection);
- if (!validateSelection(project, shell))
- return;
- try {
- getDataModel(project).getDefaultOperation().execute( new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- JEEUIPlugin.logError(e);
- }
- }
-
- private IDataModel getDataModel(IProject project) {
- Class dataModelClass = null;
- if(JavaEEProjectUtilities.isEARProject(project)){
- dataModelClass = IEarCreateDeploymentFilesDataModelProperties.class;
- } else if(JavaEEProjectUtilities.isEJBProject(project)){
- dataModelClass = IEJBCreateDeploymentFilesDataModelProperties.class;
- } else if(JavaEEProjectUtilities.isDynamicWebProject(project)){
- dataModelClass = IWebCreateDeploymentFilesDataModelProperties.class;
- } else if(JavaEEProjectUtilities.isApplicationClientProject(project)){
- dataModelClass = IAppClientCreateDeploymentFilesDataModelProperties.class;
- }else if(JavaEEProjectUtilities.isJCAProject(project)){
- dataModelClass = IConnectorCreateDeploymentFilesDataModelProperties.class;
- }
- IDataModel dataModel = DataModelFactory.createDataModel(dataModelClass);
- dataModel.setProperty(ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT, project);
- return dataModel;
- }
-
- private boolean validateSelection(IProject project, Shell shell) {
- boolean validSelection = true;
- if (!isValidSelection(project, shell)) {
- validSelection = false;
- }
- return validSelection;
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/Messages.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/Messages.java
deleted file mode 100644
index aa593a4..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/Messages.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.ui.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-
-public class Messages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.jee.ui.internal.messages"; //$NON-NLS-1$
-
-
- private Messages() {
- // Do not instantiate
- }
-
- public static String INVALID_DEP_DESC_SELECTION_TITLE;
- public static String INFORM_INVALID_DEP_DESC_SELECTION;
- public static String DEPLOYMENT_DESCRIPTOR;
- public static String SESSION_BEANS;
- public static String ENTITY_BEANS;
- public static String MESSAGE_DRIVEN_BEANS;
- public static String MessageAdapterNode_MESSAGE_ADAPTER;
- public static String MessageListenerNode_MessageListener;
- public static String ActicationSpecNode_ActivationSpec;
- public static String ACTIVATION_CONFIG_PROPERTIES;
- public static String ENTERPRISE_BEAN_CLASS_DESCRIPTION;
-
- public static String SERVLET_ITEM_PROVIDER;
- public static String LISTENER_ITEM_PROVIDER;
- public static String FILTERS_ITEM_PROVIDER;
- public static String FILTER_MAPPING_ITEM_PROVIDER;
- public static String SERVLET_MAPPING_ITEM_PROVIDER;
- public static String ERROR_PAGES_ITEM_PROVIDER;
- public static String WELCOME_PAGES_ITEM_PROVIDER;
- public static String CONTEXT_PARAMS_ITEM_PROVIDER;
-
-
-
-
- public static String REFERENCES;
- public static String BUNDLED_LIBRARIES_NODE;
- public static String LIBRARY_DIRECTORY;
- public static String EAR_MODULES_NODE;
- public static String EJBLOCAL_REFERENCES;
- public static String EJB_REFERENCES;
- public static String ENVIROMENT_ENTRIES;
- public static String RESOURCE_ENVIROMENT_ENTRIES;
- public static String RESOURCE_REFERENCES;
- public static String SERVICE_REFERENCES;
- public static String AddProjectToEARDropAssistant_The_dragged_project_cannot_be_added_;
- public static String AddProjectToEARDropAssistant_The_project_0_cannot_be_accesse_;
- public static String AddProjectToEARDropAssistant_Could_not_add_module_to_Enterprise_;
- public static String AddModuleToEarDropAssistant_Adding_module_to_ea_;
- public static String ImportJEEModuleDropAssistant_Importing_Java_Enterprise_Edition_artifacts;
- public static String ImportJEEModuleDropAssistant_Could_not_recognize_extension_0_;
- public static String InboundRaNode_Inbound_Resource_adapter;
-
- public static String ConnectorLabelProvider_ADMIN_OBJECT;
- public static String ConnectorLabelProvider_CONFIG_PROPERTY;
- public static String ConnectorLabelProvider_ConnectionDefinition;
- public static String ConnectorLabelProvider_LICENSE_ARTIFACT;
- public static String ConnectorLabelProvider_RequiredConfigProperty;
- public static String GroupRaContentProvider_RESOURCE_ADAPTER;
- public static String OutboundRaNode_OutboundResourceAdapter;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EJBDeployableArtifactAdapterFactory.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EJBDeployableArtifactAdapterFactory.java
deleted file mode 100644
index f58efe0..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EJBDeployableArtifactAdapterFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-/*
- * Created on Jan 18, 2005
- */
-package org.eclipse.jst.jee.ui.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
-
-public class EJBDeployableArtifactAdapterFactory extends ModuleArtifactAdapterDelegate implements IAdapterFactory {
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[]{ILaunchable.class};
- }
-
- @Override
- public IModuleArtifact getModuleArtifact(Object obj) {
- return EJBDeployableArtifactAdapterUtil.getModuleObject(obj);
- }
- @Override
- public IModuleArtifact[] getModuleArtifacts(Object obj) {
-
- if (obj instanceof SessionBean)
- return EJBDeployableArtifactAdapterUtil.getModuleObjects((SessionBean) obj);
- IModuleArtifact artifact = getModuleArtifact(obj);
- if (artifact != null)
- return new IModuleArtifact[] { artifact };
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EJBDeployableArtifactAdapterUtil.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EJBDeployableArtifactAdapterUtil.java
deleted file mode 100644
index a2621d8..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EJBDeployableArtifactAdapterUtil.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.ui.internal.deployables;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EntityBean;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.internal.deployables.JEEFlexProjDeployable;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.jst.server.core.EJBBean;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.ModuleDelegate;
-import org.eclipse.wst.server.core.util.NullModuleArtifact;
-
-/**
- * @version 1.0
- * @author
- */
-public class EJBDeployableArtifactAdapterUtil {
- /**
- * Constructor for EJBDeployableObjectAdapter.
- */
- public EJBDeployableArtifactAdapterUtil() {
- super();
- }
-
- public static IModuleArtifact getModuleObject(Object obj) {
- if (obj == null)
- return null;
- else if (obj instanceof EJBJar)
- return getModuleObject((EJBJar) obj);
- else if (obj instanceof SessionBean)
- return getModuleObject((SessionBean) obj);
- else if (obj instanceof MessageDrivenBean)
- return getModuleObject((MessageDrivenBean) obj);
- else if (obj instanceof EntityBean)
- return getModuleObject((EntityBean) obj);
- else if (obj instanceof IProject)
- return getModuleObject((IProject) obj);
- else if (obj instanceof IJavaProject)
- return getModuleObject(((IJavaProject) obj).getProject());
- else if (obj instanceof IFile)
- return getModuleObject((IFile) obj);
- else if (obj instanceof ICompilationUnit)
- return getModuleObject((ICompilationUnit) obj);
- return null;
- }
-
- protected static boolean hasInterestedComponents(IProject project) {
- return JavaEEProjectUtilities.isEJBProject(project);
- }
-
- protected static IModuleArtifact getModuleObject(ICompilationUnit cu) {
-
- try {
- IFile file = (IFile) cu.getCorrespondingResource();
- IProject project = file.getProject();
- if (hasInterestedComponents(project)) {
- return getModuleJavaObject(file);
- }
-
- } catch (JavaModelException e) {
- JEEUIPlugin.logError(e);
- }
- return null;
- }
-
- protected static IModuleArtifact getModuleObject(EJBJar ejbJar) {
- IModule dep = getModule((EObject)ejbJar);
- return createModuleObject(dep, null, false, false);
- }
-
- protected static IModuleArtifact getModuleObject(SessionBean ejb) {
- IModule dep = getModule((EObject)ejb);
- return createModuleObject(dep, ejb.getEjbName(), false, false);
- }
- protected static IModuleArtifact getModuleObject(EntityBean ejb) {
- IModule dep = getModule((EObject)ejb);
- return createModuleObject(dep, ejb.getEjbName(), false, false);
- }
- protected static IModuleArtifact getModuleObject(MessageDrivenBean ejb) {
- IModule dep = getModule((EObject)ejb);
- return createModuleObject(dep, ejb.getEjbName(), false, false);
- }
- protected static IModuleArtifact[] getModuleObjects(SessionBean ejb) {
- List modArtifacts = new ArrayList();
- IModule dep = getModule((EObject)ejb);
- List busLocals = ejb.getBusinessLocals();
- List busRemotes = ejb.getBusinessRemotes();
- for (Iterator iterator = busLocals.iterator(); iterator.hasNext();) {
- String localName = (String) iterator.next();
- modArtifacts.add(createModuleObjectForSessionBean(dep, ejb.getEjbName(), localName, false,true));
-
- }
- for (Iterator iterator = busRemotes.iterator(); iterator.hasNext();) {
- String remoteName = (String) iterator.next();
- modArtifacts.add(createModuleObjectForSessionBean(dep, ejb.getEjbName(), remoteName, true, false));
- }
- return (IModuleArtifact[])modArtifacts.toArray(new IModuleArtifact[modArtifacts.size()]);
- }
-
- protected static IModuleArtifact getModuleObject(IProject project) {
- if (hasInterestedComponents(project)) {
- IModule dep = getModule(project, null);
- return createModuleObject(dep, null, false, false);
- }
- return null;
- }
-
- protected static IModuleArtifact getModuleObject(IFile file) {
- IVirtualResource[] resources = ComponentCore.createResources(file);
- IVirtualComponent component = null;
- if (resources[0] != null || resources.length <= 0)
- component = resources[0].getComponent();
- if (hasInterestedComponents(file.getProject())) {
- String ext = file.getFileExtension();
- if ("java".equals(ext) || "class".equals(ext)) //$NON-NLS-1$ //$NON-NLS-2$
- return getModuleJavaObject(file);
- if (file.getProjectRelativePath().toString().endsWith(J2EEConstants.EJBJAR_DD_URI))
- return createModuleObject(getModule(file.getProject(), component), null, false, false);
- }
- return null;
- }
-
- protected static IModule getModule(EObject refObject) {
- IProject proj = ProjectUtilities.getProject(refObject);
- if (proj == null)
- return null;
- Resource refResource = refObject.eResource();
- IVirtualResource[] resources = null;
- IVirtualComponent component = null;
- try {
- IResource eclipeServResoruce = WorkbenchResourceHelper.getFile(refResource);
- resources = ComponentCore.createResources(eclipeServResoruce);
- if (resources[0] != null)
- component = resources[0].getComponent();
- } catch (Exception e) {
- JEEUIPlugin.logError(e);
- }
- return getModule(proj, component);
- }
-
- protected static IModule getModule(IProject project, IVirtualComponent component) {
- IModule deployable = null;
- Iterator iterator = Arrays.asList(ServerUtil.getModules(J2EEProjectUtilities.EJB)).iterator();
- String componentName = null;
- if (component != null)
- componentName = component.getName();
- else
- return getModuleProject(project, iterator);
- while (iterator.hasNext()) {
- Object next = iterator.next();
- if (next instanceof IModule) {
- deployable = (IModule) next;
- if (deployable.getName().equals(componentName)) {
- return deployable;
- }
- }
- }
- return null;
- }
-
- protected static IModule getModuleProject(IProject project, Iterator iterator) {
- IModule deployable = null;
- while (iterator.hasNext()) {
- Object next = iterator.next();
- if (next instanceof IModule) {
- deployable = (IModule) next;
- if (deployable.getProject().equals(project))
- return deployable;
- }
- }
- return null;
- }
-
-
- protected static IModuleArtifact getModuleJavaObject(IFile file) {
- return null;
- }
-
- protected static IModuleArtifact createModuleObject(IModule module, String ejbName, boolean remote, boolean local) {
- if (module != null) {
- String jndiName = null;
- if (ejbName != null) {
- module.loadAdapter(ModuleDelegate.class, new NullProgressMonitor());
- JEEFlexProjDeployable moduleDelegate = (JEEFlexProjDeployable)module.getAdapter(ModuleDelegate.class);
- jndiName = moduleDelegate.getJNDIName(ejbName);
- return new EJBBean(module, jndiName, remote, local,EJBBean.EJB_30);
- }
- return new NullModuleArtifact(module);
- }
- return null;
- }
-
- protected static IModuleArtifact createModuleObjectForSessionBean(IModule module, String ejbName, String interfaceName, boolean remote, boolean local) {
- if (module != null) {
- String jndiName = null;
- if (ejbName != null) {
- module.loadAdapter(ModuleDelegate.class, new NullProgressMonitor());
- JEEFlexProjDeployable moduleDelegate = (JEEFlexProjDeployable)module.getAdapter(ModuleDelegate.class);
- jndiName = moduleDelegate.getJNDIName(ejbName, interfaceName);
- return new EJBBean(module, jndiName, remote, local,EJBBean.EJB_30, interfaceName);
- }
- return new NullModuleArtifact(module);
- }
- return null;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EnterpriseApplicationDeployableAdapterUtil.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EnterpriseApplicationDeployableAdapterUtil.java
deleted file mode 100644
index 32bc317..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EnterpriseApplicationDeployableAdapterUtil.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.ui.internal.deployables;
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.javaee.application.Application;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.util.NullModuleArtifact;
-
-/**
- * Creates the Object adapter for ear projects.
- */
-public class EnterpriseApplicationDeployableAdapterUtil {
-
- /**
- * Constructor for EnterpriseApplicationDeployableObjectAdapter.
- */
- public EnterpriseApplicationDeployableAdapterUtil() {
- super();
- }// EnterpriseApplicationDeployableObjectAdapter
-
- /**
- * Gets the object for a type of object.
- *
- * @param Object
- * obj - Object to adapt.
- */
- public static IModuleArtifact getModuleObject(Object obj) {
- if (obj instanceof Application)
- return getModuleObject((Application) obj);
- if (obj instanceof IProject)
- return getModuleObject((IProject) obj);
- if (obj instanceof IFile)
- return getModuleObject((IFile) obj);
- return null;
- }// getDeployableObject
-
- /**
- * Gets the deployable object for ear instance.
- *
- * @param Application
- * application - EAR instance.
- */
- protected static IModuleArtifact getModuleObject(Application application) {
- IModule dep = getModule((EObject)application);
- return createModuleObject(dep);
- }
-
- /**
- * Gets the deployable object for project instances.
- *
- * @param IProject
- * project - Project instance.
- * @return IModuleObject
- */
- protected static IModuleArtifact getModuleObject(IProject project) {
- IModule dep = getModule(project,null);
- return createModuleObject(dep);
- }// getModuleObject
-
- /**
- * Gets the deployable object for file instances.
- *
- * @param IFile
- * file - File instance.
- * @return IModuleObject
- */
- protected static IModuleArtifact getModuleObject(IFile file) {
- if (file.getProjectRelativePath().toString().endsWith(J2EEConstants.APPLICATION_DD_URI)) {
- {
- IVirtualResource[] resources = ComponentCore.createResources(file);
- IVirtualComponent component = null;
- if (resources[0] != null || resources.length <= 0)
- component = resources[0].getComponent();
- return createModuleObject(getModule(file.getProject(), component));
- }
- }// if
- return null;
- }// getModuleObject
-
- /**
- * Gets the deployable object.
- *
- * @param EObject
- * refObject - The current refObject.
- * @return IModule
- */
- protected static IModule getModule(EObject refObject) {
- IProject proj = ProjectUtilities.getProject(refObject);
- Resource servResource = refObject.eResource();
- IVirtualResource[] resources = null;
- try {
- IResource eclipeServResoruce = WorkbenchResourceHelper.getFile(servResource);
- resources = ComponentCore.createResources(eclipeServResoruce);
- } catch (Exception e) {
- JEEUIPlugin.logError(e);
- }
- IVirtualComponent component = null;
- if (resources != null && resources[0] != null){
- component = resources[0].getComponent();
- }
- return getModule(proj,component);
- }
-
-
-
- protected static IModule getModuleProject(IProject project, Iterator iterator) {
- IModule deployable = null;
- while (iterator.hasNext()) {
- Object next = iterator.next();
- if (next instanceof IModule) {
- deployable = (IModule) next;
- if (deployable.getProject().equals(project))
- return deployable;
- }
- }
- return null;
- }
-
- protected static IModule getModule(IProject project, IVirtualComponent component) {
- IModule deployable = null;
- Iterator iterator = Arrays.asList(ServerUtil.getModules(J2EEProjectUtilities.ENTERPRISE_APPLICATION)).iterator();
- String componentName = null;
- if (component != null)
- componentName = component.getName();
- else
- return getModuleProject(project, iterator);
- while (iterator.hasNext()) {
- Object next = iterator.next();
- if (next instanceof IModule) {
- deployable = (IModule) next;
- if (deployable.getName().equals(componentName)) {
- return deployable;
- }
- }
- }
- return null;
- }
-
- /**
- * Creates the deployable object.
- *
- * @param IModuleObject
- * deployable - The current module object.
- */
- protected static IModuleArtifact createModuleObject(IModule module) {
-
- if (module != null) {
- return new NullModuleArtifact(module);
- }
-
- return null;
- }// createDeployableObject
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.IModuleArtifactAdapter#getId()
- */
- public String getId() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.IModuleArtifactAdapter#getObjectClassName()
- */
- public String getObjectClassName() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.IModuleArtifactAdapter#isPluginActivated()
- */
- public boolean isPluginActivated() {
- return false;
- }
-
-}// EnterpriseApplicationDeployableObjectAdapter
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EnterpriseDeployableArtifactAdapterFactory.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EnterpriseDeployableArtifactAdapterFactory.java
deleted file mode 100644
index 6f05877..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EnterpriseDeployableArtifactAdapterFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 18, 2005
- */
-package org.eclipse.jst.jee.ui.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
-
-public class EnterpriseDeployableArtifactAdapterFactory extends ModuleArtifactAdapterDelegate implements IAdapterFactory {
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[] {ILaunchable.class };
- }
-
- @Override
- public IModuleArtifact getModuleArtifact(Object obj) {
- return EnterpriseApplicationDeployableAdapterUtil.getModuleObject(obj);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java
deleted file mode 100644
index 39b17cc..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.ui.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
-
-public class WebDeployableArtifactAdapterFactory extends ModuleArtifactAdapterDelegate implements IAdapterFactory {
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[]{ILaunchable.class};
- }
-
-
- @Override
- public IModuleArtifact getModuleArtifact(Object obj) {
- return WebDeployableArtifactUtil.getModuleObject(obj);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java
deleted file mode 100644
index dc5c32d..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.ui.internal.deployables;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.jfaces.extension.FileURL;
-import org.eclipse.jst.j2ee.internal.web.jfaces.extension.FileURLExtensionReader;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-import org.eclipse.jst.javaee.web.IWebCommon;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.javaee.web.ServletMapping;
-import org.eclipse.jst.javaee.web.internal.impl.ServletImpl;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.internal.ModuleType;
-import org.eclipse.wst.server.core.util.WebResource;
-
-/**
- * @version 1.0
- * @author
- */
-public class WebDeployableArtifactUtil {
-
- private final static String GENERIC_SERVLET_CLASS_TYPE = "javax.servlet.GenericServlet"; //$NON-NLS-1$
- private final static String CACTUS_SERVLET_CLASS_TYPE = "org.apache.cactus.server.ServletTestRedirector"; //$NON-NLS-1$
-
- public WebDeployableArtifactUtil() {
- super();
- }
-
- public static IModuleArtifact getModuleObject(Object obj) {
- IResource resource = null;
- if (obj instanceof IResource)
- resource = (IResource) obj;
- if (obj instanceof IModuleArtifact)
- resource = ((IModuleArtifact) obj).getModule().getProject();
- else if (obj instanceof IAdaptable)
- resource = (IResource) ((IAdaptable) obj).getAdapter(IResource.class);
- else if (obj instanceof EObject) {
- resource = ProjectUtilities.getProject((EObject) obj);
- if (obj instanceof Servlet) {
- ServletImpl servlet = ((ServletImpl) obj);
- Resource servResource = servlet.eResource();
- IVirtualResource[] resources = null;
- try {
- IResource eclipeServResoruce = WorkbenchResourceHelper.getFile(servResource);
- resources = ComponentCore.createResources(eclipeServResoruce);
- } catch (Exception e) {
- JEEUIPlugin.logError(e);
- }
- IVirtualComponent component = null;
- if (resources != null && resources[0] != null){
- component = resources[0].getComponent();
- }
- String mapping = null;
- java.util.List mappings = getServletMappings(resource, servlet.getServletClass());
-
- if (mappings != null && !mappings.isEmpty()) {
- ServletMapping map = (ServletMapping) mappings.get(0);
- UrlPatternType urlPattern = map.getUrlPatterns().get(0);
- mapping = urlPattern.getValue();
- }
- if (mapping != null) {
- return new WebResource(getModule(resource.getProject(), component), new Path(mapping));
- }
-
-// WebType webType = ((Servlet) obj).getWebType();
-// if (webType.isJspType()) {
-// resource = ((IProject) resource).getFile(((JSPType) webType).getJspFile()); //$NON-NLS-1$
-// } else if (webType.isServletType()) {
-// return new WebResource(getModule(resource.getProject(), component), new Path("servlet/" + ((ServletType) webType).getClassName())); //$NON-NLS-1$
-// }
- }
- }
- if (resource == null)
- return null;
-
- if (resource instanceof IProject) {
- IProject project = (IProject) resource;
- if (hasInterestedComponents(project))
- return new WebResource(getModule(project, null), project.getProjectRelativePath());
- }
-
- if (!hasInterestedComponents(resource.getProject()))
- return null;
- if (isCactusJunitTest(resource))
- return null;
-
- IPath resourcePath = resource.getFullPath();
- IVirtualResource[] resources = ComponentCore.createResources(resource);
- IVirtualComponent component = null;
- if (resources.length <= 0 || resources[0] == null )
- return null;
- component = resources[0].getComponent();
- String className = getServletClassName(resource);
- if (className != null && component != null) {
- String mapping = getServletMapping(resource, true, className, component.getName());
- if (mapping != null) {
- return new WebResource(getModule(resource.getProject(), component), new Path(mapping));
- }
- // if there is no servlet mapping, provide direct access to the servlet
- // through the fully qualified class name
- return new WebResource(getModule(resource.getProject(), component), new Path("servlet/" + className)); //$NON-NLS-1$
-
- }
- if (className == null) {
-// WebArtifactEdit webEdit = null;
-// try {
-// webEdit = WebArtifactEdit.getWebArtifactEditForRead(component);
-// List servlets = webEdit.getWebApp().getServlets();
-// for (int i=0; i<servlets.size(); i++) {
-// Servlet servlet = (Servlet) servlets.get(i);
-// WebType type = servlet.getWebType();
-// if (type.isJspType()) {
-// JSPType jsp = (JSPType)type;
-// String jspPath = resource.getProjectRelativePath().removeFirstSegments(1).toString();
-// if (jsp.getJspFile().equals(jspPath)) {
-// List mappings = servlet.getMappings();
-// String mapping = null;
-// if (mappings != null && !mappings.isEmpty()) {
-// ServletMapping map = (ServletMapping) mappings.get(0);
-// mapping = map.getUrlPattern();
-// if (mapping != null)
-// return new WebResource(getModule(resource.getProject(), component), new Path(mapping));
-// }
-// }
-// }
-// }
-// } finally {
-// if (webEdit != null)
-// webEdit.dispose();
-// }
- }
- resourcePath = resources[0].getRuntimePath();
-
- try {//adding try/catch to avoid future issues that would require commenting this out.
- // Extension read to get the correct URL for Java Server Faces file if
- // the jsp is of type jsfaces.
- FileURL jspURL = FileURLExtensionReader.getInstance().getFilesURL();
- if (jspURL != null) {
- IPath correctJSPPath = jspURL.getFileURL(resource, resourcePath);
- if (correctJSPPath != null && correctJSPPath.toString().length() > 0)
- return new WebResource(getModule(resource.getProject(), component), correctJSPPath);
- }
- }catch (Exception e) {}
-
- return new WebResource(getModule(resource.getProject(), component), resourcePath);
- }
-
- protected static IModule getModule(IProject project, IVirtualComponent component) {
- String componentName = null;
- if (component != null)
- componentName = component.getName();
- ModuleType[] moduleTypeArray = new ModuleType[]{
- ModuleType.getModuleType(J2EEProjectUtilities.DYNAMIC_WEB, null),
- ModuleType.getModuleType(J2EEProjectUtilities.WEBFRAGMENT, null)
- };
- IModule[] modules = ServerUtil.getModules(moduleTypeArray);
- for (IModule module : modules) {
- if ((project == null || project.equals(module.getProject()))
- && (componentName == null || componentName.equals(module.getName())))
- return module;
- }
-
- // otherwise fall back to other types of web modules on the project
- if (project != null) {
- modules = ServerUtil.getModules(project);
- for (IModule module : modules) {
- if (componentName == null || componentName.equals(module.getName()))
- return module;
- }
- }
- return null;
- }
-
- /**
- * @deprecated - see getModule() for better logic for finding a project's IModule
- */
- protected static IModule getModuleProject(IProject project, Iterator iterator) {
- IModule deployable = null;
- while (iterator.hasNext()) {
- Object next = iterator.next();
- if (next instanceof IModule) {
- deployable = (IModule) next;
- if (deployable.getProject().equals(project))
- return deployable;
- }
- }
- return null;
- }
-
- /**
- *
- * Very temporary api - TODO - rip this out by 1.0
- */
- private static boolean isCactusJunitTest(IResource resource) {
- return getClassNameForType(resource, CACTUS_SERVLET_CLASS_TYPE) != null;
- }
-
-
-
- private static IType[] getTypes(IJavaElement element) {
- try {
- if (element.getElementType() != IJavaElement.COMPILATION_UNIT)
- return null;
-
- return ((ICompilationUnit) element).getAllTypes();
- } catch (Exception e) {
- return null;
- }
- }
-
- public static String getServletClassName(IResource resource) {
- return getClassNameForType(resource, GENERIC_SERVLET_CLASS_TYPE);
- }
-
- public static String getClassNameForType(IResource resource, String superType) {
- if (resource == null)
- return null;
-
- try {
- IProject project = resource.getProject();
- IPath path = resource.getFullPath();
- if (!project.hasNature(JavaCore.NATURE_ID) || path == null)
- return null;
-
- IJavaProject javaProject = (IJavaProject) project.getNature(JavaCore.NATURE_ID);
- if (!javaProject.isOpen())
- javaProject.open(new NullProgressMonitor());
-
- // output location may not be on classpath
- IPath outputPath = javaProject.getOutputLocation();
- if (outputPath != null && "class".equals(path.getFileExtension()) && outputPath.isPrefixOf(path)) { //$NON-NLS-1$
- int count = outputPath.segmentCount();
- path = path.removeFirstSegments(count);
- }
-
- // remove initial part of classpath
- IClasspathEntry[] classPathEntry = javaProject.getResolvedClasspath(true);
- if (classPathEntry != null) {
- int size = classPathEntry.length;
- for (int i = 0; i < size; i++) {
- IPath classPath = classPathEntry[i].getPath();
- if (classPath.isPrefixOf(path)) {
- int count = classPath.segmentCount();
- path = path.removeFirstSegments(count);
- i += size;
- }
- }
- }
-
- // get java element
- IJavaElement javaElement = javaProject.findElement(path);
-
- IType[] types = getTypes(javaElement);
- if (types != null) {
- int size2 = types.length;
- for (int i = 0; i < size2; i++) {
- if (hasSuperclass(types[i], superType))
- return types[i].getFullyQualifiedName();
- }
- }
- return null;
- } catch (Exception e) {
- return null;
- }
- }
-
- public static boolean hasSuperclass(IType type, String superClassName) {
- try {
- ITypeHierarchy hierarchy = type.newSupertypeHierarchy(null);
- IType[] superClasses = hierarchy.getAllSuperclasses(type);
-
- int size = superClasses.length;
- for (int i = 0; i < size; i++) {
- if (superClassName.equals(superClasses[i].getFullyQualifiedName()))
- return true;
- }
- return false;
- } catch (Exception e) {
- return false;
- }
- }
-
- public static String getServletMapping(IResource resource, boolean isServlet, String typeName, String componentName) {
- if (typeName == null || typeName.equals("")) //$NON-NLS-1$
- return null;
-
- IModelProvider provider = ModelProviderManager.getModelProvider( resource.getProject() );
- Object mObj = provider.getModelObject();
-
- if ( mObj instanceof org.eclipse.jst.javaee.web.WebApp){
- org.eclipse.jst.javaee.web.WebApp webApp= (org.eclipse.jst.javaee.web.WebApp) mObj;
- List servlets = webApp.getServlets();
- // Ensure the display does not already exist in the web application
- if (servlets != null && !servlets.isEmpty()) {
- for (int i = 0; i < servlets.size(); i++) {
- org.eclipse.jst.javaee.web.Servlet servlet = (org.eclipse.jst.javaee.web.Servlet)servlets.get(i);
- if (servlet.getServletClass() != null && servlet.getServletClass().equals(typeName)) {
- java.util.List mappings = webApp.getServletMappings();
- if (mappings != null && !mappings.isEmpty()) {
- Iterator it = mappings.iterator();
- while( it.hasNext() ){
- org.eclipse.jst.javaee.web.ServletMapping map = (org.eclipse.jst.javaee.web.ServletMapping) it.next();
- if( map.getServletName().equals(servlet.getServletName())){
- org.eclipse.jst.javaee.core.UrlPatternType urlPattern = map.getUrlPatterns().get(0);
- return urlPattern.getValue();
- }
- }
-
- }
- }
-
- }
- }
-
-
- }
- return null;
-
- }
-
- protected static boolean hasInterestedComponents(IProject project) {
- return (JavaEEProjectUtilities.isDynamicWebProject(project) ||
- JavaEEProjectUtilities.isWebFragmentProject(project));
- }
-
- private static List getServletMappings(IResource resource, String typeName){
- if (typeName == null || typeName.equals("")) //$NON-NLS-1$
- return null;
-
- IModelProvider provider = ModelProviderManager.getModelProvider( resource.getProject() );
- IWebCommon webApp = (IWebCommon)provider.getModelObject();
-
- List servlets = webApp.getServlets();
- List list = new ArrayList();
-
- if (servlets != null && !servlets.isEmpty()) {
- for (int i = 0; i < servlets.size(); i++) {
- Servlet servlet = (Servlet)servlets.get(i);
- if( servlet.getServletClass().equals(typeName)){
-
- java.util.List mappings = webApp.getServletMappings();
- if (mappings != null && !mappings.isEmpty()) {
- Iterator it = mappings.iterator();
- while( it.hasNext() ){
- org.eclipse.jst.javaee.web.ServletMapping map = (org.eclipse.jst.javaee.web.ServletMapping) it.next();
- if( map.getServletName().equals(servlet.getServletName())){
- list.add(map);
- }
- }
- }
- }
-
- }
- }
- return list;
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/messages.properties b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/messages.properties
deleted file mode 100644
index b9c07b3..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/messages.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-INVALID_DEP_DESC_SELECTION_TITLE=Invalid Selection
-INFORM_INVALID_DEP_DESC_SELECTION=One or more Java EE projects selected already has a Deployment Descriptor.
-DEPLOYMENT_DESCRIPTOR=Deployment Descriptor: {0}
-SESSION_BEANS=Session Beans
-ENTITY_BEANS=Entity Beans (1.x-2.x)
-MESSAGE_DRIVEN_BEANS=Message-Driven Beans
-MessageAdapterNode_MESSAGE_ADAPTER=Message Adapter
-MessageListenerNode_MessageListener=Message Listener
-ActicationSpecNode_ActivationSpec=Activation Spec
-ACTIVATION_CONFIG_PROPERTIES=Activation Config Properties
-ENTERPRISE_BEAN_CLASS_DESCRIPTION=Enterprise Bean Class -
-
-SERVLET_ITEM_PROVIDER=Servlets
-LISTENER_ITEM_PROVIDER=Listeners
-FILTERS_ITEM_PROVIDER=Filters
-FILTER_MAPPING_ITEM_PROVIDER=Filter Mappings
-SERVLET_MAPPING_ITEM_PROVIDER=Servlet Mappings
-ERROR_PAGES_ITEM_PROVIDER=Error Pages
-WELCOME_PAGES_ITEM_PROVIDER=Welcome Pages
-CONTEXT_PARAMS_ITEM_PROVIDER=Context Parameters
-BUNDLED_LIBRARIES_NODE=Bundled Libraries
-LIBRARY_DIRECTORY=Library Directory
-EAR_MODULES_NODE=Modules
-EJBLOCAL_REFERENCES=Ejb Local References
-EJB_REFERENCES=Ejb References
-ENVIROMENT_ENTRIES=Environment Entries
-RESOURCE_ENVIROMENT_ENTRIES=Resource Environment Entries
-RESOURCE_REFERENCES=Resource References
-SERVICE_REFERENCES=Service References
-REFERENCES=References
-
-AddProjectToEARDropAssistant_The_dragged_project_cannot_be_added_=The dragged project cannot be added
-AddProjectToEARDropAssistant_The_project_0_cannot_be_accesse_=The project cannot be accessed
-AddProjectToEARDropAssistant_Could_not_add_module_to_Enterprise_=Could not add module to Enterprise
-AddModuleToEarDropAssistant_Adding_module_to_ea_=Adding module to ear
-ImportJEEModuleDropAssistant_Importing_Java_Enterprise_Edition_artifacts=Importing Java Enterprise Edition artifacts
-ImportJEEModuleDropAssistant_Could_not_recognize_extension_0_=Could not recognize extension
-InboundRaNode_Inbound_Resource_adapter=Inbound Resource Adapter
-
-ConnectorLabelProvider_ADMIN_OBJECT=Admin Object
-ConnectorLabelProvider_CONFIG_PROPERTY=Config Property
-ConnectorLabelProvider_ConnectionDefinition=Connection Definition
-ConnectorLabelProvider_LICENSE_ARTIFACT=License
-ConnectorLabelProvider_RequiredConfigProperty=Required Config Property
-GroupRaContentProvider_RESOURCE_ADAPTER=Resource Adapter
-OutboundRaNode_OutboundResourceAdapter=Outbound Resource Adapter
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AbstractDDNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AbstractDDNode.java
deleted file mode 100644
index 9340240..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AbstractDDNode.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Abstract Deployment Descriptor Node is an abstract wrapper class for the nodes in the Deployment
- * Descriptor it can contain information for the label provider some description for tool tip, an image
- * and the object that it is wrapping.
- *
- * @author Dimitar Giormov
- */
-public abstract class AbstractDDNode {
-
- protected Object adapterNode;
- protected Image image;
- protected String text;
- protected String description;
-
-
- /**
- * Constructor for the class
- *
- * @param adapterNode - the wrapped object
- */
- public AbstractDDNode(Object adapterNode){
- this.adapterNode = adapterNode;
- image = null;
- text = null;
- description = null;
- }
-
- public abstract List getChildren();
-
- public abstract boolean hasChildren();
-
- public void decorate(IDecoration decoration) {
- // do nothing, subclasses should override
- }
-
- public Image getImage() {
- return image;
- }
-
- public String getText() {
- return text;
- }
-
- public String getDescription() {
- return description;
- }
-
- public Object getAdapterNode() {
- return adapterNode;
- }
-
- public void reinit(JavaEEObject modelObject) {
- adapterNode = modelObject;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AbstractGroupProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AbstractGroupProvider.java
deleted file mode 100644
index 7a8168b..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AbstractGroupProvider.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Abstract group Deployment Descriptor node that has a number of sub nodes
- * (like Entity Beans, Session Beans, Message Driven Beans).
- *
- *
- * @author Dimitar Giormov
- *
- */
-public abstract class AbstractGroupProvider {
-
- protected List children = new ArrayList<Object>();
- protected JavaEEObject javaee;
- protected String text;
- protected boolean isValid = true;
-
- public void setValid(boolean isValid) {
- this.isValid = isValid;
- }
-
- public AbstractGroupProvider(JavaEEObject javaee) {
- this.javaee = javaee;
- text = NLS.bind(Messages.DEPLOYMENT_DESCRIPTOR, javaee.toString());
- }
-
- public abstract List getChildren();
-
- public abstract Image getImage();
-
- public String getText() {
- return text ;
- }
-
- public boolean hasChildren() {
- List children2 = getChildren();
- return children2 != null && !children2.isEmpty();
- }
-
- public JavaEEObject getJavaEEObject() {
- return javaee;
- }
-
- public void reinit(JavaEEObject modelObject) {
- this.javaee = modelObject;
- }
-
- public boolean isValid(){
- return isValid;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AppClient5ContentProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AppClient5ContentProvider.java
deleted file mode 100644
index 28ee5ee..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AppClient5ContentProvider.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.javaee.applicationclient.ApplicationClient;
-import org.eclipse.jst.jee.ui.internal.navigator.appclient.GroupAppClientProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.ear.ModulesNode;
-
-/**
- * Ear 5.0 Content provider is Deployment Descriptor content provider,
- * used for constructing of the descriptor tree in project explorer.
- *
- * @author Dimitar Giormov
- */
-public class AppClient5ContentProvider extends JEE5ContentProvider {
-
-
- public Object[] getChildren(Object aParentElement) {
- IProject project = null;
- List children = new ArrayList();
- if (aParentElement instanceof GroupAppClientProvider) {
- children.addAll(((GroupAppClientProvider) aParentElement).getChildren());
- } else if (aParentElement instanceof IAdaptable) {
- project = (IProject) ((IAdaptable) aParentElement).getAdapter(IPROJECT_CLASS);
- if (project != null && JavaEEProjectUtilities.isApplicationClientProject(project) &&
- J2EEProjectUtilities.isJEEProject(project)) {
- AbstractGroupProvider cachedContentProvider = getCachedContentProvider(project);
- if (cachedContentProvider != null){
- children.add(cachedContentProvider);
- }
- }
- }
- return children.toArray();
- }
-
-
-
- public boolean hasChildren(Object element) {
- if (element instanceof GroupAppClientProvider) {
- return !((GroupAppClientProvider) element).getChildren().isEmpty();
- }
- return false;
- }
-
- public Object getParent(Object object) {
- if (object instanceof ModulesNode){
- return ((ModulesNode) object).getEarProject();
- }
- return null;
- }
-
- public Object[] getElements(Object inputElement) {
- return getChildren(inputElement);
- }
-
-
-
- @Override
- protected AbstractGroupProvider getNewContentProviderInstance(IProject project) {
- return new GroupAppClientProvider((ApplicationClient) getCachedModelProvider(project).getModelObject(), project);
- }
-
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AppClient5LabelProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AppClient5LabelProvider.java
deleted file mode 100644
index d6f5b25..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AppClient5LabelProvider.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.appclient.GroupAppClientProvider;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Application Clent 5.0 Label provider is Deployment Descriptor label provider,
- * used for decorating of the descriptor tree in project explorer.
- *
- * @author Dimitar Giormov
- */
-public class AppClient5LabelProvider extends J2EELabelProvider {
-
- @Override
- public Image getImage(Object element) {
- Image ret = null;
- if (element instanceof GroupAppClientProvider) {
- ret = ((GroupAppClientProvider)element).getImage();
- }
- return ret;
- }
-
- @Override
- public String getText(Object element) {
- String ret = null;
- if (element instanceof GroupAppClientProvider) {
- ret = ((GroupAppClientProvider) element).getText();
- }
- return ret;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ConnectorContentProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ConnectorContentProvider.java
deleted file mode 100644
index f5b332f..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ConnectorContentProvider.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.javaee.jca.Connector;
-import org.eclipse.jst.jee.ui.internal.navigator.ra.RaGroupContentProvider;
-
-public class ConnectorContentProvider extends JEE5ContentProvider {
-
- public Object[] getChildren(Object aParentElement) {
- List<Object> children = new ArrayList<Object>();
- IProject project = null;
- if (IProject.class.isInstance(aParentElement)) {
- project = (IProject) aParentElement;
- AbstractGroupProvider cachedContentProvider = getCachedContentProvider(project);
- if (cachedContentProvider!= null && cachedContentProvider.isValid()){
- children.add(cachedContentProvider);
- }
- } else if (AbstractGroupProvider.class.isInstance(aParentElement)){
- AbstractGroupProvider abstractGroupProvider = (AbstractGroupProvider) aParentElement;
- if (abstractGroupProvider.hasChildren()){
- children.addAll(abstractGroupProvider.getChildren());
- }
- }
- return children.toArray();
- }
-
- public Object getParent(Object element) {
- return null;
- }
-
- public boolean hasChildren(Object element) {
- return true;
- }
-
- public Object[] getElements(Object inputElement) {
- return getChildren(inputElement);
- }
-
- @Override
- protected AbstractGroupProvider getNewContentProviderInstance(IProject project) {
- return new RaGroupContentProvider((Connector)getCachedModelProvider(project).getModelObject(), project);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ConnectorLabelProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ConnectorLabelProvider.java
deleted file mode 100644
index 0397c66..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ConnectorLabelProvider.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider;
-import org.eclipse.jst.javaee.jca.ConfigProperty;
-import org.eclipse.jst.javaee.jca.ConnectionDefinition;
-import org.eclipse.jst.javaee.jca.RequiredConfigProperty;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-public class ConnectorLabelProvider extends J2EELabelProvider {
-
- private Image CONFIG_PROP_IMAGE;
- private Image LICENSE_IMAGE;
-
- @Override
- public String getText(Object element) {
- if (AbstractGroupProvider.class.isInstance(element)){
- return ((AbstractGroupProvider) element).getText();
- } else if (element instanceof org.eclipse.jst.javaee.jca.License){
- return Messages.ConnectorLabelProvider_LICENSE_ARTIFACT;
- } else if (element instanceof ConfigProperty){
- return Messages.ConnectorLabelProvider_CONFIG_PROPERTY + ((ConfigProperty)element).getConfigPropertyName() != null ? ((ConfigProperty)element).getConfigPropertyName() : ""; //$NON-NLS-1$
- } else if (element instanceof RequiredConfigProperty){
- return Messages.ConnectorLabelProvider_RequiredConfigProperty + ((RequiredConfigProperty)element).getConfigPropertyName() != null ? ((RequiredConfigProperty)element).getConfigPropertyName() : ""; //$NON-NLS-1$
- } else if (element instanceof ConnectionDefinition){
- return Messages.ConnectorLabelProvider_ConnectionDefinition + ((ConnectionDefinition)element).getManagedconnectionfactoryClass() != null ?((ConnectionDefinition)element).getManagedconnectionfactoryClass() : ""; //$NON-NLS-1$
- }
-
- return super.getText(element);
- }
-
- @Override
- public Image getImage(Object element) {
- if (AbstractGroupProvider.class.isInstance(element)){
- return ((AbstractGroupProvider) element).getImage();
- } else if (element instanceof ConfigProperty){
- if (CONFIG_PROP_IMAGE == null) {
- CONFIG_PROP_IMAGE = JEEUIPlugin.getDefault().getImage(JEEUIPluginIcons.IMG_CONFIG_PROP);
- }
- return CONFIG_PROP_IMAGE;
- } else if (element instanceof org.eclipse.jst.javaee.jca.License){
- if (LICENSE_IMAGE == null) {
- LICENSE_IMAGE = JEEUIPlugin.getDefault().getImage(JEEUIPluginIcons.IMG_LICENSE);
- }
- return LICENSE_IMAGE;
- }
- return super.getImage(element);
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/DDAdapterFactory.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/DDAdapterFactory.java
deleted file mode 100644
index 01ae46d..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/DDAdapterFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaElement;
-
-public class DDAdapterFactory implements IAdapterFactory {
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if (adapterType == IJavaElement.class) {
- if (adaptableObject instanceof AbstractDDNode) {
- AbstractDDNode ddNode = (AbstractDDNode) adaptableObject;
- Object node = ddNode.getAdapterNode();
- if (node instanceof IJavaElement)
- return node;
- if (node instanceof IAdaptable)
- return ((IAdaptable) node).getAdapter(IJavaElement.class);
-
- return Platform.getAdapterManager().getAdapter(node, IJavaElement.class);
- }
- }
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[] { IJavaElement.class };
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ear5ContentProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ear5ContentProvider.java
deleted file mode 100644
index 60ed717..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ear5ContentProvider.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.j2ee.componentcore.util.EARVirtualComponent;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.javaee.application.Application;
-import org.eclipse.jst.jee.ui.internal.navigator.ear.AbstractEarNode;
-import org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * Application Client 5.0 Content provider is Deployment Descriptor content provider,
- * used for constructing of the descriptor tree in project explorer.
- *
- * @author Dimitar Giormov
- */
-public class Ear5ContentProvider extends JEE5ContentProvider {
-
- private List getComponentReferencesAsList(List componentTypes, IVirtualComponent virtualComponent, IPath runtimePath) {
- List components = new ArrayList();
- IVirtualComponent earComponent = virtualComponent;
- if (earComponent != null ) {
- IVirtualReference[] refComponents = earComponent.getReferences();
- for (int i = 0; i < refComponents.length; i++) {
- IVirtualComponent module = refComponents[i].getReferencedComponent();
- if (module == null) continue;
- // if component types passed in is null then return all components
- if (componentTypes == null || componentTypes.size() == 0) {
- components.add(refComponents[i]);
- } else {
- if (componentTypes.contains(JavaEEProjectUtilities.getJ2EEComponentType(module))) {
- components.add(refComponents[i]);
- }
- }
- }
- }
- return components;
- }
-
- public IVirtualReference[] getUtilityModuleReferences(IVirtualComponent component) {
- List explicitUtilityReferences =
- getComponentReferencesAsList(Collections.singletonList(J2EEProjectUtilities.UTILITY), component, null);
-
- // fetch other Utility Jars attached to the EAR project
- List implicitUtilityReferenceTypes =
- Arrays.asList(new String[] {
- IModuleConstants.JST_APPCLIENT_MODULE,
- IModuleConstants.JST_WEB_MODULE,
- IModuleConstants.JST_EJB_MODULE
- });
-
- List implicitUtilityReferences =
- getComponentReferencesAsList(implicitUtilityReferenceTypes, component, null);
-
- List allUtilityModuleReferences = new ArrayList();
- allUtilityModuleReferences.addAll(explicitUtilityReferences);
- allUtilityModuleReferences.addAll(implicitUtilityReferences);
-
- if(allUtilityModuleReferences.size() > 0)
- return (IVirtualReference[]) allUtilityModuleReferences.toArray(new IVirtualReference[allUtilityModuleReferences.size()]);
- return new IVirtualReference[0];
-
- }
-
- public Object[] getChildren(Object aParentElement) {
- IProject project = null;
- List children = new ArrayList();
- if (aParentElement instanceof GroupEARProvider) {
- children.addAll(((GroupEARProvider)aParentElement).getChildren());
- } else if (aParentElement instanceof AbstractEarNode) {
- return ((AbstractEarNode) aParentElement).getModules().toArray();
- } else if (aParentElement instanceof IAdaptable) {
- project = (IProject) ((IAdaptable) aParentElement).getAdapter(IPROJECT_CLASS);
- if (project != null && JavaEEProjectUtilities.isEARProject(project)) {
- IFacetedProject facetedProject;
- try {
- facetedProject = ProjectFacetsManager.create(project);
- if (facetedProject != null &&
- (facetedProject.hasProjectFacet(
- ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE).getVersion(
- J2EEVersionConstants.VERSION_5_0_TEXT)) || facetedProject.hasProjectFacet(
- ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE).getVersion(
- J2EEVersionConstants.VERSION_6_0_TEXT)))) {
- GroupEARProvider element = (GroupEARProvider) getCachedContentProvider(project);
- if (element != null){
- children.add(element);
- }
-
- }
- } catch (CoreException e) {
- String msg = "Error in the JEEContentProvider.getChildren() for parent:" + aParentElement; //$NON-NLS-1$
- JEEUIPlugin.logError(msg, e);
- }
- }
- }
- return children.toArray();
- }
-
- public boolean hasChildren(Object element) {
- if (element instanceof AbstractEarNode) {
- return ((AbstractEarNode) element).getModules().size() > 0;
- } else if (element instanceof GroupEARProvider){
- return true;
- } else return false;
- }
-
- public Object getParent(Object object) {
- if (object instanceof AbstractEarNode){
- return ((AbstractEarNode) object).getEarProject();
- }
- return null;
- }
-
- public Object[] getElements(Object inputElement) {
- return getChildren(inputElement);
- }
-
- @Override
- protected AbstractGroupProvider getNewContentProviderInstance(IProject project) {
- return new GroupEARProvider((Application) getCachedModelProvider(project).getModelObject(), (EARVirtualComponent)ComponentCore.createComponent(project));
- }
-
- public EarLibVisitor getVisitor() {
- return new EarLibVisitor();
- }
-
- protected class EarLibVisitor implements IResourceDeltaVisitor {
-
- private Set<IProject> projects = new HashSet<IProject>();
-
- public boolean visit(IResourceDelta delta) throws CoreException {
- IResourceDelta[] affectedChildren = delta.getAffectedChildren(IResourceDelta.ADDED | IResourceDelta.REMOVED | IResourceDelta.REPLACED | IResourceDelta.CHANGED);
- if (affectedChildren != null){
- for (int i = 0; i < affectedChildren.length; i++) {
- if (affectedChildren[i].getResource() != null && affectedChildren[i].getResource().getName() != null
- && (affectedChildren[i].getResource().getName().toLowerCase().endsWith(IJ2EEModuleConstants.JAR_EXT)
- || (affectedChildren[i].getResource().getName().equals(IJ2EEModuleConstants.JST_COMPONENT_FILE) && affectedChildren[i].getKind()==IResourceDelta.CHANGED))){
- projects.add(affectedChildren[i].getResource().getProject());
- }
- }
- }
- return true;
- }
-
- protected Set<IProject> getChangedProject() {
- return projects;
- }
-
- }
-
- @Override
- public void resourceChanged(IResourceChangeEvent event) {
- super.resourceChanged(event);
- if (event.getType() == IResourceChangeEvent.POST_CHANGE){
- EarLibVisitor visitor = getVisitor();
- if (visitor == null){
- return;
- }
- try {
- event.getDelta().accept(visitor);
- Set<IProject> changedProject = visitor.getChangedProject();
- for (IProject project : changedProject) {
- projectChanged(project);
- }
-
- } catch (CoreException e) {
- JEEUIPlugin.logError("Could not refresh changed project.", e); //$NON-NLS-1$
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ear5LabelProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ear5LabelProvider.java
deleted file mode 100644
index 58ac507..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ear5LabelProvider.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- * IBM - bug 281382 clean up
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.net.URL;
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider;
-import org.eclipse.jst.j2ee.navigator.internal.plugin.J2EENavigatorPlugin;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.jee.ui.internal.navigator.ear.AbstractEarNode;
-import org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.componentcore.internal.util.VirtualReferenceUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- * EAR 5.0 Label provider is Deployment Descriptor label provider,
- * used for decorating of the descriptor tree in project explorer.
- *
- * @author Dimitar Giormov
- */
-public class Ear5LabelProvider extends J2EELabelProvider {
-
- private static ImageDescriptor IMG_MODULES_NODE;
- private static ImageDescriptor IMG_MODULE_UTIL;
- private static ImageDescriptor IMG_MODULE_WEB;
- private static ImageDescriptor IMG_MODULE_EJB;
- private static ImageDescriptor IMG_MODULE_CLIENT;
- private static ImageDescriptor IMG_MODULE_CONNECTOR;
- private static HashMap<String, ImageDescriptor> typeToDescriptor;
- static {
- try {
- IMG_MODULES_NODE = J2EENavigatorPlugin.getDefault().getImageDescriptor("folder.gif"); //$NON-NLS-1$
- IMG_MODULE_UTIL = ImageDescriptor.createFromURL((URL) J2EEPlugin.getPlugin().getImage("utiljar_obj")); //$NON-NLS-1$
- IMG_MODULE_WEB = ImageDescriptor.createFromURL((URL) J2EEPlugin.getPlugin().getImage("full/obj16/module_web_obj")); //$NON-NLS-1$
- IMG_MODULE_EJB = ImageDescriptor.createFromURL((URL) J2EEPlugin.getPlugin().getImage("full/obj16/module_ejb_obj")); //$NON-NLS-1$
- IMG_MODULE_CLIENT = ImageDescriptor.createFromURL((URL) J2EEPlugin.getPlugin().getImage("module_clientapp_obj")); //$NON-NLS-1$
- IMG_MODULE_CONNECTOR = ImageDescriptor.createFromURL((URL) J2EEPlugin.getPlugin().getImage("full/obj16/connector_module")); //$NON-NLS-1$
- } catch (RuntimeException e) {
- String msg = e.getMessage() != null ? e.getMessage() : e.toString();
- JEEUIPlugin.logError(msg, e);
- IMG_MODULES_NODE = ImageDescriptor.getMissingImageDescriptor();
- IMG_MODULE_UTIL = ImageDescriptor.getMissingImageDescriptor();
- IMG_MODULE_WEB = ImageDescriptor.getMissingImageDescriptor();
- IMG_MODULE_EJB = ImageDescriptor.getMissingImageDescriptor();
- IMG_MODULE_CLIENT = ImageDescriptor.getMissingImageDescriptor();
- IMG_MODULE_CONNECTOR = ImageDescriptor.getMissingImageDescriptor();
- }
- typeToDescriptor = new HashMap<String, ImageDescriptor>();
- typeToDescriptor.put(IJ2EEFacetConstants.APPLICATION_CLIENT, IMG_MODULE_CLIENT);
- typeToDescriptor.put(IJ2EEFacetConstants.DYNAMIC_WEB, IMG_MODULE_WEB);
- typeToDescriptor.put(IJ2EEFacetConstants.EJB, IMG_MODULE_EJB);
- typeToDescriptor.put(IJ2EEFacetConstants.JCA, IMG_MODULE_CONNECTOR);
- typeToDescriptor.put(IJ2EEFacetConstants.UTILITY, IMG_MODULE_UTIL);
- }
-
- @Override
- public Image getImage(Object element) {
- Image ret = null;
- if (element instanceof AbstractEarNode) {
- ret = J2EENavigatorPlugin.getDefault().getImage(IMG_MODULES_NODE);
- } else if (element instanceof IVirtualReference) {
- IVirtualComponent component = ((IVirtualReference) element).getReferencedComponent();
- if (component.isBinary()) {
- ret = J2EENavigatorPlugin.getDefault().getImage(IMG_MODULE_UTIL);
- } else {
- String type = JavaEEProjectUtilities.getJ2EEComponentType(component);
- ImageDescriptor desc = typeToDescriptor.get(type);
- ret = J2EENavigatorPlugin.getDefault().getImage(desc == null ? IMG_MODULE_UTIL : desc);
- }
- } else if (element instanceof GroupEARProvider){
- ret = ((GroupEARProvider) element).getImage();
- }
- return ret;
- }
-
- @Override
- public String getText(Object element) {
- String ret = null;
- if (element instanceof AbstractEarNode) {
- ret = ((AbstractEarNode) element).getText();
- } else if (element instanceof IVirtualReference) {
- IVirtualComponent component = ((IVirtualReference) element).getReferencedComponent();
- String archiveName = ((IVirtualReference)element).getArchiveName();
- if( component.isBinary()) {
- ret = archiveName != null ? archiveName : (new Path(component.getDeployedName()).lastSegment());
- } else {
- // more efficient to get type once
- String type = JavaEEProjectUtilities.getJ2EEComponentType(component);
- if( archiveName == null )
- archiveName = VirtualReferenceUtilities.INSTANCE.getDefaultArchiveName((IVirtualReference)element);
-
- if( type.equals(IJ2EEFacetConstants.DYNAMIC_WEB))
- ret = "Web " + archiveName; //$NON-NLS-1$
- else if( type.equals(IJ2EEFacetConstants.EJB))
- ret = "EJB " + archiveName;//$NON-NLS-1$
- else if( type.equals(IJ2EEFacetConstants.APPLICATION_CLIENT))
- ret = "APP Client " + archiveName;//$NON-NLS-1$
- else if( type.equals(IJ2EEFacetConstants.JCA))
- ret = "Connector " + archiveName;//$NON-NLS-1$
- else if( type.equals(IJ2EEFacetConstants.UTILITY))
- ret = archiveName;
- }
- } else if (element instanceof GroupEARProvider){
- ret = ((GroupEARProvider) element).getText();
- }
- return ret;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3ContentProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3ContentProvider.java
deleted file mode 100644
index 2cf5088..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3ContentProvider.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EntityBean;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.ui.internal.navigator.JndiRefNode.KINDS;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.ActivationConfigProperties;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanInterfaceNode;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * Ejb 3.0 Content provider is Deployment Descriptor content provider,
- * used for constructing of the descriptor tree in project explorer.
- *
- * @author Dimitar Giormov
- */
-public class Ejb3ContentProvider extends JEE5ContentProvider {
-
-
- public Object[] getChildren(Object aParentElement) {
- List<Object> children = new ArrayList<Object>();
- IProject project = null;
-
- if (aParentElement instanceof AbstractGroupProvider) {
- List lst = ((AbstractGroupProvider) aParentElement).getChildren();
- children.addAll(lst);
- } else if (aParentElement instanceof AbstractDDNode) {
- List lst = ((AbstractDDNode) aParentElement).getChildren();
- children.addAll(lst);
- } else if (aParentElement instanceof SessionBean) {
- SessionBean sb = ((SessionBean)aParentElement);
- addSessionBeanSubNodes(sb, children);
-
- } else if (aParentElement instanceof EntityBean) {
- EntityBean eb = ((EntityBean)aParentElement);
-
- addEntityBeanSubNodes(eb, children);
-
- } else if (aParentElement instanceof MessageDrivenBean) {
- Object msgBean = new BeanNode((MessageDrivenBean) aParentElement);
- addActivationConfigProperties((MessageDrivenBean) aParentElement, children);
- if(((MessageDrivenBean) aParentElement).getEjbClass()!=null){
- children.add(msgBean);
- }
- } else
- if (aParentElement instanceof IAdaptable) {
- project = (IProject) ((IAdaptable) aParentElement)
- .getAdapter(IPROJECT_CLASS);
- if (project != null) {
- if (isEjbModuleProject(project)) {
- GroupEJBProvider root = (GroupEJBProvider) getCachedContentProvider(project);
- if (root != null) {
- children.add(root);
- }
- }
- }
- }
- return children.toArray();
- }
-
- private void addActivationConfigProperties(MessageDrivenBean parentElement,
- List<Object> children) {
- if (parentElement.getActivationConfig() != null && parentElement.getActivationConfig().getActivationConfigProperties() != null && !parentElement.getActivationConfig().getActivationConfigProperties().isEmpty()){
- children.add(new ActivationConfigProperties(parentElement.getActivationConfig().getActivationConfigProperties()));
- }
- }
-
- private void addEntityBeanSubNodes(EntityBean eb, List<Object> children) {
- if (eb.getLocal() != null) {
- children.add(new BeanInterfaceNode(eb, eb.getLocal(), BeanInterfaceNode.KINDS.LOCAL));
- }
- if (eb.getLocalHome() != null) {
- children.add(new BeanInterfaceNode(eb, eb.getLocalHome(), BeanInterfaceNode.KINDS.LOCAL_HOME));
- }
-
- if (eb.getRemote() != null) {
- children.add(new BeanInterfaceNode(eb, eb.getRemote(), BeanInterfaceNode.KINDS.REMOTE));
- }
- if (eb.getHome() != null) {
- children.add(new BeanInterfaceNode(eb, eb.getHome(), BeanInterfaceNode.KINDS.REMOTE_HOME));
- }
-
- if (eb.getEjbClass() != null) {
- children.add(new BeanNode(eb));
- }
-
- }
-
- private void addSessionBeanSubNodes(SessionBean sb, List children) {
- addClassRelatedInfo(sb, children);
- addSessionJNDIRefInfo(sb, children);
- }
-
- private void addSessionJNDIRefInfo(SessionBean sb, List children) {
- if (sb.getEjbLocalRefs() != null && !sb.getEjbLocalRefs().isEmpty()){
- children.add(new JndiRefNode(sb.getEjbLocalRefs(), KINDS.EJBLOCALREF));
- }
-
- if (sb.getEjbRefs() != null && !sb.getEjbRefs().isEmpty()){
- children.add(new JndiRefNode(sb.getEjbRefs(), KINDS.EJBREF));
- }
-
- if (sb.getResourceEnvRefs() != null && !sb.getResourceEnvRefs().isEmpty()){
- children.add(new JndiRefNode(sb.getResourceEnvRefs(), KINDS.RESENVENTY));
- }
- if (sb.getEnvEntries() != null && !sb.getEnvEntries().isEmpty()){
- children.add(new JndiRefNode(sb.getEnvEntries(), KINDS.ENVENTRY));
- }
-
- if (sb.getResourceRefs() != null && !sb.getResourceRefs().isEmpty()){
- children.add(new JndiRefNode(sb.getResourceRefs(), KINDS.RESREF));
- }
-
- if (sb.getServiceRefs() != null && !sb.getServiceRefs().isEmpty()){
- children.add(new JndiRefNode(sb.getServiceRefs(), KINDS.SERVICEREF));
- }
- }
-
- private void addClassRelatedInfo(SessionBean sb, List children) {
- if (sb.getLocal() != null) {
- children.add(new BeanInterfaceNode(sb, sb.getLocal(), BeanInterfaceNode.KINDS.LOCAL));
- }
-
- if (sb.getLocalHome() != null) {
- children.add(new BeanInterfaceNode(sb, sb.getLocalHome(), BeanInterfaceNode.KINDS.LOCAL_HOME));
- }
-
- if (sb.getRemote() != null) {
- children.add(new BeanInterfaceNode(sb, sb.getRemote(), BeanInterfaceNode.KINDS.REMOTE));
- }
-
- if (sb.getHome() != null) {
- children.add(new BeanInterfaceNode(sb, sb.getHome(), BeanInterfaceNode.KINDS.REMOTE_HOME));
- }
-
- if (sb.getEjbClass() != null) {
- children.add(new BeanNode(sb));
- }
-
- List r = sb.getBusinessLocals();
- for (Object locals : r) {
- children.add(new BeanInterfaceNode(sb, (String)locals, BeanInterfaceNode.KINDS.BUSSINESS_LOCAL));
- }
-
- r = sb.getBusinessRemotes();
- for (Object locals : r) {
- children.add(new BeanInterfaceNode(sb, (String)locals, BeanInterfaceNode.KINDS.BUSSINESS_REMOTE));
- }
- }
-
- private boolean isEjbModuleProject(IProject project) {
- try {
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- //EE6TODO
- IProjectFacetVersion installedVersion = facetedProject.getInstalledVersion(ProjectFacetsManager.getProjectFacet(IJ2EEFacetConstants.EJB).getVersion(IJ2EEFacetConstants.EJB_30.getVersionString()).getProjectFacet());
- return installedVersion != null;
- } catch (CoreException e) {
- JEEUIPlugin.logError("Can not acces project", e); //$NON-NLS-1$
- }
- return false;
- }
-
- public boolean hasChildren(Object element) {
- if (element instanceof AbstractGroupProvider) {
- return ((AbstractGroupProvider) element).hasChildren();
- } else if (element instanceof AbstractDDNode) {
- return ((AbstractDDNode) element).hasChildren();
- } else if (element instanceof SessionBean) {
- return true;
- } else if (element instanceof EntityBean) {
- return true;
- }else if (element instanceof MessageDrivenBean) {
- return true;
- } else
- return false;
- }
-
- public Object getParent(Object element) {
- return null;
- }
-
- public Object[] getElements(Object inputElement) {
- return getChildren(inputElement);
- }
-
- @Override
- protected AbstractGroupProvider getNewContentProviderInstance(IProject project) {
- IModelProvider cachedModelProvider = getCachedModelProvider(project);
- GroupEJBProvider root = new GroupEJBProvider((EJBJar) cachedModelProvider.getModelObject());
- root.setProjectName(project.getName());
- return root;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3LabelProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3LabelProvider.java
deleted file mode 100644
index a5a5d5e..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3LabelProvider.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008, 2010 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.provider.J2EEAdapterFactoryLabelProvider;
-import org.eclipse.jst.j2ee.navigator.internal.IJ2EENavigatorConstants;
-import org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider;
-import org.eclipse.jst.j2ee.navigator.internal.LoadingDDNode;
-import org.eclipse.jst.javaee.core.EjbLocalRef;
-import org.eclipse.jst.javaee.core.EjbRef;
-import org.eclipse.jst.javaee.core.EnvEntry;
-import org.eclipse.jst.javaee.core.ResourceEnvRef;
-import org.eclipse.jst.javaee.core.ResourceRef;
-import org.eclipse.jst.javaee.core.ServiceRef;
-import org.eclipse.jst.javaee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.javaee.ejb.EntityBean;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-
-/**
- * Ejb 3.0 Label provider is Deployment Descriptor label provider,
- * used for decorating of the descriptor tree in project explorer.
- *
- * @author Dimitar Giormov
- * @author Kaloyan Raev
- */
-public class Ejb3LabelProvider extends J2EELabelProvider {
-
- private Image ejb30Image;
- private Image ejb31Image;
- private Image sessionBeanImage;
- private Image mdbImage;
- private Image cmpImage;
- private Image ejbRefImage;
- private Image resourceRefImage;
- private Image serviceRefImage;
- private Image activationConfigImage;
-
- public Ejb3LabelProvider() {
- new J2EEAdapterFactoryLabelProvider(new DynamicAdapterFactory(IJ2EENavigatorConstants.VIEWER_ID));
- }
-
- @Override
- public Image getImage(Object element) {
- if(element instanceof LoadingDDNode) {
- return ((LoadingDDNode)element).getImage();
- } else if (element instanceof IProject || element instanceof IJavaProject) {
- return null;
- } else if (element instanceof GroupEJBProvider) {
- String version = ((GroupEJBProvider) element).getEjbJar().getVersion();
- if (J2EEVersionConstants.VERSION_3_0_TEXT.equals(version)) {
- return getEjb30Image();
- } else if (J2EEVersionConstants.VERSION_3_1_TEXT.equals(version)) {
- return getEjb31Image();
- }
- return getEjb30Image();
- } else if(element instanceof AbstractDDNode) {
- return ((AbstractDDNode) element).getImage();
- } else if (element instanceof SessionBean) {
- return getSessionBeanImage();
- } else if (element instanceof MessageDrivenBean) {
- return getMDBImage();
- } else if (element instanceof EntityBean){
- return getCMPImage();
- } else if (element instanceof EjbLocalRef || element instanceof EjbRef) {
- return getEjbRefImage();
- } else if (element instanceof EnvEntry) {
- return getResourceRefImage();
- } else if (element instanceof ResourceEnvRef) {
- return getResourceRefImage();
- } else if (element instanceof ResourceRef) {
- return getResourceRefImage();
- } else if (element instanceof ServiceRef) {
- return getServiceRefImage();
- } else if(element instanceof ActivationConfigProperty) {
- return getActivationConfigImage();
- }
-
- return null;
- }
-
- @Override
- public String getText(Object element) {
- String ret = null;
- if (element instanceof SessionBean || element instanceof MessageDrivenBean || element instanceof EntityBean) {
- ret = (element instanceof SessionBean) ? ((SessionBean) element).getEjbName() :
- (element instanceof MessageDrivenBean) ? ((MessageDrivenBean) element).getEjbName() :
- (element instanceof EntityBean) ? ((EntityBean) element).getEjbName() : null;
- } else if (element instanceof AbstractDDNode) {
- ret = ((AbstractDDNode) element).getText();
- } else if (element instanceof AbstractGroupProvider) {
- ret = ((AbstractGroupProvider) element).getText();
- } else if (element instanceof EjbLocalRef || element instanceof EjbRef){
- ret = element instanceof EjbLocalRef ? ((EjbLocalRef)element).getEjbRefName() : element instanceof EjbRef ? ((EjbRef)element).getEjbRefName() : null;
- } else if (element instanceof EnvEntry){
- ret = ((EnvEntry) element).getEnvEntryName();
- } else if (element instanceof ResourceEnvRef){
- ret = ((ResourceEnvRef) element).getResourceEnvRefName();
- } else if (element instanceof ResourceRef){
- ret = ((ResourceRef) element).getResRefName();
- } else if (element instanceof ServiceRef){
- ret = ((ServiceRef) element).getServiceRefName();
- } else if(element instanceof ActivationConfigProperty){
- ret = ((ActivationConfigProperty)element).getActivationConfigPropertyName() + ":" +((ActivationConfigProperty)element).getActivationConfigPropertyValue(); //$NON-NLS-1$
- }
-
- return ret;
- }
-
- @Override
- public String getDescription(Object anElement) {
- String description = super.getDescription(anElement);
-
- if (anElement instanceof AbstractDDNode) {
- String desc = ((AbstractDDNode) anElement).getDescription();
- if (desc != null) {
- description = desc;
- }
- }
-
- return description;
- }
-
- private Image getEjb30Image() {
- if (ejb30Image == null) {
- ejb30Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.IMG_EJBEEMODEL).createImage();
- }
- return ejb30Image;
- }
-
- private Image getEjb31Image() {
- if (ejb31Image == null) {
- ejb31Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.IMG_EJBEE6MODEL).createImage();
- }
- return ejb31Image;
- }
-
- private Image getSessionBeanImage() {
- if (sessionBeanImage == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("sessionBean_obj"); //$NON-NLS-1$
- sessionBeanImage = ImageDescriptor.createFromURL(url).createImage();
- }
- return sessionBeanImage;
- }
-
- private Image getMDBImage() {
- if (mdbImage == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("message_bean_obj"); //$NON-NLS-1$
- mdbImage = ImageDescriptor.createFromURL(url).createImage();
- }
- return mdbImage;
- }
-
- private Image getCMPImage() {
- if (cmpImage == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("cmpEntity_obj"); //$NON-NLS-1$
- cmpImage = ImageDescriptor.createFromURL(url).createImage();
- }
- return cmpImage;
- }
-
- private Image getEjbRefImage() {
- if (ejbRefImage == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("ejbRef_obj"); //$NON-NLS-1$
- ejbRefImage = ImageDescriptor.createFromURL(url).createImage();
- }
- return ejbRefImage;
- }
-
- private Image getResourceRefImage() {
- if (resourceRefImage == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("resourceRef_obj"); //$NON-NLS-1$
- resourceRefImage = ImageDescriptor.createFromURL(url).createImage();
- }
- return resourceRefImage;
- }
-
- private Image getServiceRefImage() {
- if (serviceRefImage == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("attribute_obj"); //$NON-NLS-1$
- serviceRefImage = ImageDescriptor.createFromURL(url).createImage();
- }
- return serviceRefImage;
- }
-
- private Image getActivationConfigImage() {
- if (activationConfigImage == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("access_intent_obj"); //$NON-NLS-1$
- activationConfigImage = ImageDescriptor.createFromURL(url).createImage();
- }
- return activationConfigImage;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/JEE5ContentProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/JEE5ContentProvider.java
deleted file mode 100644
index 7ad0b7a..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/JEE5ContentProvider.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProviderEvent;
-import org.eclipse.jst.j2ee.model.IModelProviderListener;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.navigator.internal.EMFRootObjectProvider.IRefreshHandlerListener;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.ejb.EntityBean;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.progress.UIJob;
-
-public abstract class JEE5ContentProvider implements ITreeContentProvider, IRefreshHandlerListener, IModelProviderListener, IResourceChangeListener {
-
- protected Viewer viewer;
- protected static final Class IPROJECT_CLASS = IProject.class;
-
- protected static Map<IProject, IModelProvider> groupProvidersMap = new HashMap<IProject, IModelProvider>();
-
- protected static Map<IProject, AbstractGroupProvider> groupContentProviders = new HashMap<IProject, AbstractGroupProvider>();
-
-
- public JEE5ContentProvider() {
- ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
- }
-
- public void inputChanged(Viewer aViewer, Object anOldInput, Object aNewInput) {
- viewer = aViewer;
- }
-
-
- protected IModelProvider getCachedModelProvider(IProject project) {
- IModelProvider provider = groupProvidersMap.get(project);
- if (provider == null){
- provider = ModelProviderManager.getModelProvider(project);
- provider.addListener(this);
- groupProvidersMap.put(project,provider);
- }
- return provider;
- }
-
- protected AbstractGroupProvider getCachedContentProvider(IProject project) {
- AbstractGroupProvider provider = groupContentProviders.get(project);
- if (provider == null){
- if (project == null || !project.isAccessible()){
- return null;
- }
- provider = getNewContentProviderInstance(project);
- groupContentProviders.put(project, provider);
- } else {
- Object modelObject = ModelProviderManager.getModelProvider(project).getModelObject();
- if (provider.getJavaEEObject() != modelObject){
- if (modelObject == null){
- provider.setValid(false);
- return provider;
- }
-
- provider.reinit((JavaEEObject)modelObject);
- }
- }
- return provider;
- }
-
- protected abstract AbstractGroupProvider getNewContentProviderInstance(IProject project);
-
-
- public void projectChanged(final IProject project) {
- try {
- Runnable refreshThread = new Runnable() {
- public void run() {
- if (viewer != null) {
- try{
-
- if( viewer.getControl() != null && !viewer.getControl().isDisposed() ){
- viewer.getControl().setRedraw(false);
- ISelection sel = ((TreeViewer) viewer).getSelection();
- ITreeContentProvider contentProvider = ((ITreeContentProvider) ((TreeViewer) viewer)
- .getContentProvider());
- contentProvider.getChildren(project);
- Object[] expandedElements = ((TreeViewer) viewer).getExpandedElements();
-
- ((StructuredViewer) viewer).refresh(project);
- ((TreeViewer) viewer).setSelection(sel);
-
- expandElements(expandedElements);
- }
-
- }finally{
- if( viewer.getControl() != null && !viewer.getControl().isDisposed() ){
- viewer.getControl().setRedraw(true);
- }
- }
- }
- }
-
- private void expandElements(Object[] expandedElements) {
- ArrayList<Object> newExpandedElements = new ArrayList<Object>();
-
- ArrayList<Object> allElements = new ArrayList<Object>();
- getViewerElements(allElements, ((TreeViewer) viewer).getControl());
-
- Object[] expandedElementsAfterRefresh = ((TreeViewer) viewer).getExpandedElements();
- newExpandedElements.addAll(Arrays.asList(expandedElementsAfterRefresh));
- for(int i=0;i < expandedElements.length;i++){
- boolean expanded = false;
- for(int j=0;j < expandedElementsAfterRefresh.length; j++){
- if(expandedElements[i].equals(expandedElementsAfterRefresh[j])){
- expanded = true;
- break;
- }
- }
- if(expanded){
- for(Object ob : allElements){
- if(ob instanceof SessionBean
- && expandedElements[i] instanceof SessionBean){
- SessionBean bean = (SessionBean) ob;
- SessionBean bean2 = (SessionBean) expandedElements[i];
- if(bean.getEjbName().equals(bean2.getEjbName())){
- newExpandedElements.add(ob);
- }
- }
- if(ob instanceof MessageDrivenBean
- && expandedElements[i] instanceof MessageDrivenBean){
- MessageDrivenBean bean = (MessageDrivenBean) ob;
- MessageDrivenBean bean2 = (MessageDrivenBean) expandedElements[i];
- if(bean.getEjbName().equals(bean2.getEjbName())){
- newExpandedElements.add(ob);
- }
- }
- if(ob instanceof EntityBean
- && expandedElements[i] instanceof EntityBean){
- EntityBean bean = (EntityBean) ob;
- EntityBean bean2 = (EntityBean) expandedElements[i];
- if(bean.getEjbName().equals(bean2.getEjbName())){
- newExpandedElements.add(ob);
- }
- }
- }
- }
- }
- ((TreeViewer) viewer).setExpandedElements(newExpandedElements.toArray());
- }
- };
- Display.getDefault().asyncExec(refreshThread);
- } catch (Exception e)
- {
- JEEUIPlugin.logError("Error during refresh", e); //$NON-NLS-1$
- }
- }
-
- private void getViewerElements(List result, Widget widget) {
- Item[] items = getChildren(widget);
- for (int i = 0; i < items.length; i++) {
- Item item = items[i];
- result.add(item.getData());
- getViewerElements(result, item);
- }
- }
-
- protected Item[] getChildren(Widget o) {
- if (o instanceof TreeItem) {
- return ((TreeItem) o).getItems();
- }
- if (o instanceof Tree) {
- return ((Tree) o).getItems();
- }
- return null;
- }
-
- public void modelsChanged(IModelProviderEvent event) {
- projectChanged(event.getProject());
-
- }
-
- public void onRefresh(final Object element) {
- if (viewer instanceof AbstractTreeViewer) {
- if (Display.getCurrent() != null) {
- ((AbstractTreeViewer) viewer).refresh(element, true);
- } else {
- /* Create and schedule a UI Job to update the Navigator Content Viewer */
- Job job = new UIJob("Update the Navigator Content Viewer Job") { //$NON-NLS-1$
- @Override
- public IStatus runInUIThread(IProgressMonitor monitor) {
- ((AbstractTreeViewer) viewer).refresh(element, true);
- return Status.OK_STATUS;
- }
- };
- ISchedulingRule rule = new ISchedulingRule() {
- public boolean contains(ISchedulingRule rule) {
- return rule == this;
- }
- public boolean isConflicting(ISchedulingRule rule) {
- return rule == this;
- }
- };
- job.setRule(rule);
- job.schedule();
- }
- }
- }
-
- public void dispose() {
- groupProvidersMap.clear();
- groupContentProviders.clear();
- }
-
- public void resourceChanged(IResourceChangeEvent event) {
- if (event.getType() == IResourceChangeEvent.PRE_DELETE && event.getResource() != null && event.getResource().getType() == IResource.PROJECT){
- groupContentProviders.remove(event.getResource());
- groupProvidersMap.remove(event.getResource());
- }
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/JEEActionProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/JEEActionProvider.java
deleted file mode 100644
index 7c0c02b..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/JEEActionProvider.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.internal.provider.J2EEUtilityJarItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.appclient.GroupAppClientProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanInterfaceNode;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.ra.RaGroupContentProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionContext;
-import org.eclipse.ui.actions.OpenWithMenu;
-import org.eclipse.ui.internal.navigator.resources.plugin.WorkbenchNavigatorMessages;
-import org.eclipse.ui.navigator.CommonActionProvider;
-import org.eclipse.ui.navigator.ICommonActionConstants;
-import org.eclipse.ui.navigator.ICommonActionExtensionSite;
-import org.eclipse.ui.navigator.ICommonMenuConstants;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * Standard operations Java EE Action Provider.
- * Introduces standard operations for Deployment descriptor tree nodes. (like open)
- *
- * @author Dimitar Giormov
- *
- */
-public class JEEActionProvider extends CommonActionProvider {
-
-private static final Class IRESOURCE_CLASS = IResource.class;
-
- private OpenJEEResourceAction openAction;
-
- /**
- *
- */
- public JEEActionProvider() {
- }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#init(org.eclipse.ui.IViewPart,
- * org.eclipse.jface.viewers.StructuredViewer,
- * org.eclipse.wst.common.navigator.internal.views.extensions.NavigatorContentService)
- */
- @Override
- public void init(ICommonActionExtensionSite aConfig) {
- openAction = new OpenJEEResourceAction();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#setActionContext(org.eclipse.ui.actions.ActionContext)
- */
- @Override
- public void setContext(ActionContext aContext) {
-
- if (aContext != null && aContext.getSelection() instanceof IStructuredSelection) {
- IStructuredSelection selection = (IStructuredSelection) aContext.getSelection();
-
- openAction.selectionChanged(selection);
-
- Object[] array = selection.toArray();
- if (isUtilityJars(array)) {
- J2EEUtilityJarItemProvider utilityJarItemProvider = null;
- List newSelection = new ArrayList();
- for (int i = 0; i < array.length; i++) {
- utilityJarItemProvider = (J2EEUtilityJarItemProvider) array[i];
- newSelection.addAll(utilityJarItemProvider.getChildren(null));
- }
- selection = new StructuredSelection(newSelection);
- }
- }
- super.setContext(aContext);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#fillActionBars(org.eclipse.ui.IActionBars)
- */
- @Override
- public void fillActionBars(IActionBars theActionBars) {
- if(openAction.isEnabled())
- theActionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openAction);
- return;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#fillContextMenu(org.eclipse.jface.action.IMenuManager)
- */
- @Override
- public void fillContextMenu(IMenuManager aMenu) {
- if (getContext()==null || getContext().getSelection().isEmpty())
- return;
- IStructuredSelection selection = (IStructuredSelection) getContext().getSelection();
- if(!adaptsToResource(selection.toArray())) {
- openAction.selectionChanged(selection);
-// createAction.selectionChanged(selection);
- if (openAction.isEnabled())
- aMenu.insertAfter(ICommonMenuConstants.GROUP_OPEN, openAction);
-// if (createAction.isEnabled())
-// aMenu.insertAfter(ICommonMenuConstants.GROUP_OPEN, createAction);
- addOpenWithMenu(aMenu);
-
- }
- }
-
- private boolean adaptsToResource(Object[] objects) {
- for (int i = 0; i < objects.length; i++) {
- if(objects[i] instanceof IResource) {
- return true;
- } else if (objects[i] instanceof IAdaptable && (((IAdaptable)objects[i]).getAdapter(IRESOURCE_CLASS) != null)) {
- return true;
- }
- }
- return false;
- }
- private boolean isUtilityJars(Object[] items) {
- if (items != null) {
- for (int i = 0; i < items.length; i++) {
- if (items[i] == null || items[i].getClass() != J2EEUtilityJarItemProvider.class)
- return false;
- }
- return true;
- }
- return false;
- }
-
- private void addOpenWithMenu(IMenuManager menu) {
- ISelection selection= getContext().getSelection();
- if (selection.isEmpty() || !(selection instanceof IStructuredSelection))
- return;
- IStructuredSelection ss= (IStructuredSelection)selection;
- if (ss.size() != 1)
- return;
-
- Object srcObject = ss.getFirstElement();
- Object resource = null;
-
- if (srcObject instanceof EObject) {
- resource = openEObject((EObject) srcObject);
- } else if (srcObject instanceof BeanInterfaceNode) {
- resource = ((BeanInterfaceNode) srcObject).get_fqn();
- } else if (srcObject instanceof BeanNode) {
- resource = ((BeanNode) srcObject).getEjbClassQualifiedName();
-
- } else if (srcObject instanceof WebAppProvider) {
- IFile file = ((WebAppProvider) srcObject).getDDFile();
- if (file.isAccessible()){
- resource = file;
- }
- } else if (srcObject instanceof RaGroupContentProvider) {
- IFile file = WorkbenchResourceHelper.getFile((EObject) ((AbstractGroupProvider)srcObject).getJavaEEObject());
- if (file.isAccessible()){
- resource = file;
- }
- } else if (srcObject instanceof GroupAppClientProvider) {
- IFile file = ((GroupAppClientProvider) srcObject).getDDFile();
- if (file.isAccessible()){
- resource = file;
- }
- } else if (srcObject instanceof GroupEJBProvider) {
- IFile file = WorkbenchResourceHelper.getFile((EObject)((GroupEJBProvider)srcObject).getEjbJar());
- if (file.isAccessible()){
- resource = file;
- }
- } else if (srcObject instanceof GroupEARProvider) {
- IFile file = ((GroupEARProvider) srcObject).getDDFile();
- if (file.isAccessible()){
- resource = file;
- }
- }
-
- if (!(resource instanceof IFile))
- return;
-
- // Create a menu.
- IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getActivePage();
- IMenuManager submenu= new MenuManager(WorkbenchNavigatorMessages.OpenActionProvider_OpenWithMenu_label,
- ICommonMenuConstants.GROUP_OPEN_WITH);
- submenu.add(new OpenWithMenu(page, (IFile) resource));
-
- // Add the submenu.
- menu.appendToGroup(ICommonMenuConstants.GROUP_OPEN, submenu);
- }
-
- private IResource openEObject(EObject _srcObject) {
-// EObject ro = _srcObject;
-// IResource resource = WorkbenchResourceHelper
-// .getFile(_srcObject);
-// if (resource != null) {
-// return resource;
-// }
-// ModuleFile moduleFile = ArchiveUtil.getModuleFile(ro);
-// if (moduleFile != null) {
-// ArchiveOptions options = moduleFile.getOptions();
-// if (options instanceof ComponentArchiveOptions) {
-// IVirtualComponent component = ((ComponentArchiveOptions) options)
-// .getComponent();
-//// openAppropriateEditor(component);
-// }
-// } else {
-// IArchive archive = JavaEEArchiveUtilities.findArchive(ro);
-// if(archive != null){
-// IVirtualComponent component = JavaEEArchiveUtilities.findComponent(archive);
-// if(component != null){
-//// openAppropriateEditor(component);
-// }
-// }
-// }
-
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/JndiRefNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/JndiRefNode.java
deleted file mode 100644
index b19a53a..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/JndiRefNode.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Deployment Descriptor node that contains information about JNDI references.
- * Like: Ejb reference, Ejb Local Reference, Resource Reference, Resource Environment Reference,
- * Environment Entry, Service Reference
- *
- * @author Dimitar Giormov
- *
- */
-public class JndiRefNode extends AbstractDDNode {
-
- private final int kind;
-
- public class KINDS {
- public static final int EJBLOCALREF = 0;
- public static final int EJBREF = 1;
- public static final int ENVENTRY = 2;
- public static final int RESENVENTY = 3;
- public static final int RESREF = 4;
- public static final int SERVICEREF = 5;
- }
-
- public JndiRefNode(Object adapterNode, int kind) {
- super(adapterNode);
- this.kind = kind;
-
- }
-
- public int getKind() {
- return kind;
- }
-
- @Override
- public List getChildren() {
- return (List) adapterNode;
- }
-
- @Override
- public String getText() {
- switch (kind) {
- case KINDS.EJBLOCALREF:
- return Messages.EJBLOCAL_REFERENCES;
-
- case KINDS.EJBREF:
- return Messages.EJB_REFERENCES;
- case KINDS.ENVENTRY:
- return Messages.ENVIROMENT_ENTRIES;
- case KINDS.RESENVENTY:
- return Messages.RESOURCE_ENVIROMENT_ENTRIES;
- case KINDS.RESREF:
- return Messages.RESOURCE_REFERENCES;
- case KINDS.SERVICEREF:
- return Messages.SERVICE_REFERENCES;
-
- default:
- break;
- }
- return super.getText();
- }
-
- @Override
- public Image getImage() {
- switch (kind) {
- case KINDS.EJBLOCALREF:{
- URL url = (URL) J2EEPlugin.getPlugin().getImage("ejbRef_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
- case KINDS.EJBREF:{
- URL url = (URL) J2EEPlugin.getPlugin().getImage("ejbRef_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
-
- case KINDS.ENVENTRY:
- {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("resourceRef_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
- case KINDS.RESENVENTY:
- {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("resourceRef_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
- case KINDS.RESREF:
- {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("resourceRef_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
- case KINDS.SERVICEREF:
- {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("resourceRef_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
-
- default:
- break;
- }
- return super.getImage();
- }
-
-
- @Override
- public boolean hasChildren() {
-
- return true;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/OpenJEEResourceAction.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/OpenJEEResourceAction.java
deleted file mode 100644
index 6a87b0b..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/OpenJEEResourceAction.java
+++ /dev/null
@@ -1,557 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.actions.AbstractOpenAction;
-import org.eclipse.jst.j2ee.internal.actions.ComponentEditorInput;
-import org.eclipse.jst.j2ee.internal.archive.JavaEEArchiveUtilities;
-import org.eclipse.jst.j2ee.internal.componentcore.ComponentArchiveOptions;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.javaee.core.EjbLocalRef;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.core.Listener;
-import org.eclipse.jst.javaee.core.ResourceRef;
-import org.eclipse.jst.javaee.core.internal.impl.EjbLocalRefImpl;
-import org.eclipse.jst.javaee.core.internal.impl.ResourceRefImpl;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EntityBean;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.javaee.web.Filter;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.jee.archive.IArchive;
-import org.eclipse.jst.jee.ui.internal.navigator.appclient.GroupAppClientProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanInterfaceNode;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.ra.RaGroupContentProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.WebArtifactNode;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * Open Action for Deployment descriptor tree nodes.
- *
- * @author Dimitar Giormov
- *
- */
-public class OpenJEEResourceAction extends AbstractOpenAction {
-
- public static final String ID = "com.sap.ide.j2ee.ui.actions.OpenJEEResourceAction"; //$NON-NLS-1$
- public static final String JAVA_EDITOR_ID = "org.eclipse.jst.j2ee.internal.internal.ejb.ui.java.EnterpriseBeanJavaEditor"; //$NON-NLS-1$
- public static final String BASE_JAVA_EDITOR_ID = "org.eclipse.jdt.ui.CompilationUnitEditor"; //$NON-NLS-1$
-
- protected static IEditorDescriptor javaEditorDescriptor;
- protected static IEditorDescriptor baseJavaEditorDescriptor;
-
- /**
- * Create an instance of this class
- */
- public OpenJEEResourceAction() {
- super("Open"); //$NON-NLS-1$
- }
-
- /**
- * Returns the action ID.
- */
- public String getID() {
- return ID;
- }
-
- public static IEditorDescriptor getJavaEditorDescriptor() {
- if (javaEditorDescriptor == null)
- javaEditorDescriptor = findEditorDescriptor(JAVA_EDITOR_ID);
- return javaEditorDescriptor;
- }
-
- public static IEditorDescriptor getBaseJavaEditorDescriptor() {
- if (baseJavaEditorDescriptor == null)
- baseJavaEditorDescriptor = findEditorDescriptor(BASE_JAVA_EDITOR_ID);
- return baseJavaEditorDescriptor;
- }
-
- protected void openAppropriateEditor(String c) {
- if(getStructuredSelection() instanceof TreeSelection){
- TreePath path = ((TreeSelection) getStructuredSelection()).getPaths()[0];
- IProject project = null;
-
- while (path != null) {
- Object segment = path.getLastSegment();
- if (segment instanceof IProject) {
- project = (IProject) segment;
- break;
- }
- path = path.getParentPath();
- }
-
- if (project != null) {
- try {
- IType findType = JavaCore.create(project).findType(c);
- if(findType == null){
- return;
- }
- openAppropriateEditor(findType.getResource());
- } catch (JavaModelException e) {
- JEEUIPlugin.logError("Error during open editor", e); //$NON-NLS-1$
- }
- }
- }
- }
-
- protected void openAppropriateEditor(IVirtualComponent c) {
- if (c == null) {
- return;
- }
- IWorkbenchPage page = null;
- IEditorPart editor = null;
- try {
- page = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getActivePage();
- editor = page.openEditor(new ComponentEditorInput(c),
- currentDescriptor.getId());
- if (editor instanceof ISetSelectionTarget)
- ((ISetSelectionTarget) editor)
- .selectReveal(getStructuredSelection());
- } catch (Exception e) {
- MessageDialog
- .openError(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- J2EEUIMessages
- .getResourceString("Problems_Opening_Editor_ERROR_"), e.getMessage()); //$NON-NLS-1$ = "Problems Opening Editor"
- }
- }
-
- protected void openAppropriateEditor(IJavaElement element) {
- if (element == null) {
- return;
- }
- try {
- JavaUI.openInEditor(element);
- } catch (Exception e) {
- MessageDialog
- .openError(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- J2EEUIMessages
- .getResourceString("Problems_Opening_Editor_ERROR_"), e.getMessage()); //$NON-NLS-1$ = "Problems Opening Editor"
- }
- }
-
- /**
- * open the appropriate editor
- */
- protected void openAppropriateEditor(IResource r) {
- if (r == null)
- return;
- IWorkbenchPage page = null;
- IEditorPart editor = null;
- try {
- page = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getActivePage();
- String ID = PlatformUI.getWorkbench().getEditorRegistry().getDefaultEditor(r.getLocation()
- .toPortableString()).getId();
- editor = page.openEditor(new FileEditorInput((IFile) r), ID);
- if (editor instanceof ISetSelectionTarget)
- ((ISetSelectionTarget) editor)
- .selectReveal(getStructuredSelection());
- } catch (Exception e) {
- MessageDialog
- .openError(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- J2EEUIMessages
- .getResourceString("Problems_Opening_Editor_ERROR_"), e.getMessage()); //$NON-NLS-1$ = "Problems Opening Editor"
- }
- }
-
- /**
- * The user has invoked this action
- */
- @Override
- public void run() {
- if (!isEnabled())
- return;
-
- if (srcObject instanceof J2EEJavaClassProviderHelper) {
- ((J2EEJavaClassProviderHelper) srcObject).openInEditor();
- return;
- }
-
- //[Bug 240512] deal with if any of these node types ndo not have an associated class
- if (srcObject instanceof SessionBean ||
- srcObject instanceof MessageDrivenBean ||
- srcObject instanceof EntityBean ||
- srcObject instanceof Servlet ||
- srcObject instanceof Filter ||
- srcObject instanceof Listener){
-
- String name = ""; //$NON-NLS-1$
- if( srcObject instanceof SessionBean ){
- SessionBean bean = (SessionBean)srcObject;
- name = bean.getEjbClass();
- } else if(srcObject instanceof MessageDrivenBean){
- MessageDrivenBean bean = (MessageDrivenBean)srcObject;
- name = bean.getEjbClass();
- } else if(srcObject instanceof EntityBean){
- EntityBean bean = (EntityBean)srcObject;
- name = bean.getEjbClass();
- } else if(srcObject instanceof Servlet){
- Servlet servlet = (Servlet)srcObject;
- name = servlet.getServletClass();
- } else if(srcObject instanceof Filter) {
- Filter filter = (Filter)srcObject;
- name = filter.getFilterClass();
- } else if(srcObject instanceof Listener){
- Listener listener = (Listener)srcObject;
- name = listener.getListenerClass();
- }
-
- IResource resource = WorkbenchResourceHelper.getFile((EObject)srcObject);
- if (resource == null)
- return;
- IProject project = resource.getProject();
- IJavaProject javaProject = JavaCore.create(project);
- if(javaProject.exists()){
- IType type = null;
- try {
- //if name is null then can't get type
- if(name != null) {
- type = javaProject.findType( name );
- }
-
- //if type is null then can't open its editor, so open editor for the resource
- if(type != null) {
- ICompilationUnit cu = type.getCompilationUnit();
- EditorUtility.openInEditor(cu);
- } else{
- openAppropriateEditor(resource);
- }
- } catch (JavaModelException e) {
- JEEUIPlugin.logError(e.getMessage(), e);
- } catch (PartInitException e) {
- JEEUIPlugin.logError(e.getMessage(), e);
- }
- }
- return;
- }
-
-
- if (srcObject instanceof EObject) {
- if(srcObject instanceof EjbLocalRefImpl || srcObject instanceof ResourceRefImpl){
- IResource resource = WorkbenchResourceHelper.getFile((EObject)srcObject);
- if (resource == null)
- {
- openEObject((EObject) srcObject);
- return;
- }
- IProject project = resource.getProject();
-
- EJBJar ejbJar = (EJBJar) ModelProviderManager.getModelProvider(project).getModelObject(new Path(J2EEConstants.EJBJAR_DD_URI));
-
- if(srcObject instanceof EjbLocalRefImpl){
- openEjbLocalRefNode(resource, ejbJar);
- } else if(srcObject instanceof ResourceRefImpl){
- openResourceRefNode(resource, ejbJar);
- }
- } else {
- openEObject((EObject) srcObject);
- }
- } else if (srcObject instanceof BeanInterfaceNode) {
- openAppropriateEditor(((BeanInterfaceNode) srcObject).get_fqn());
- return;
- } else if (srcObject instanceof BeanNode) {
- openAppropriateEditor(((BeanNode) srcObject).getEjbClassQualifiedName());
- return;
- } else if (srcObject instanceof WebAppProvider) {
- IFile file = ((WebAppProvider) srcObject).getDDFile();
- if (file.isAccessible()){
- openAppropriateEditor(file);
- return;
- }
- } else if(srcObject instanceof WebArtifactNode){
- openEObject((EObject) ((WebArtifactNode)srcObject).getJavaEEObject());
-
- } else if (srcObject instanceof GroupEJBProvider) {
- openEObject((EObject) ((GroupEJBProvider)srcObject).getEjbJar());
- } else if (srcObject instanceof GroupEARProvider) {
- IFile file = ((GroupEARProvider) srcObject).getDDFile();
- if (file.isAccessible()){
- openAppropriateEditor(file);
- return;
- }
- } else if (srcObject instanceof GroupAppClientProvider) {
- IFile file = ((GroupAppClientProvider) srcObject).getDDFile();
- if (file.isAccessible()){
- openAppropriateEditor(file);
- return;
- }
- } else if (srcObject instanceof AbstractGroupProvider){
- openEObject((EObject) ((AbstractGroupProvider)srcObject).getJavaEEObject());
- } else if (srcObject instanceof Resource)
- openAppropriateEditor(WorkbenchResourceHelper
- .getFile((Resource) srcObject));
- }
-
- private void openResourceRefNode(IResource resource, EJBJar ejbJar) {
- if (ejbJar.getEnterpriseBeans() != null) {
- List<SessionBean> beans = ejbJar.getEnterpriseBeans().getSessionBeans();
- for (SessionBean bean : beans) {
- for (ResourceRef localref : bean.getResourceRefs()) {
- if (localref.getResRefName().equals(((ResourceRef) srcObject).getResRefName())) {
- openAppropriateEditor(resource);
- return;
- }
- }
- }
- }
- if (((ResourceRefImpl) srcObject).eContainer() instanceof SessionBean) {
- openAppropriateEditor(((SessionBean) (((ResourceRefImpl) srcObject).eContainer())).getEjbClass());
- return;
- }
- }
-
- private void openEjbLocalRefNode(IResource resource, EJBJar ejbJar) {
- if (ejbJar.getEnterpriseBeans() != null) {
- List<SessionBean> beans = ejbJar.getEnterpriseBeans().getSessionBeans();
- for (SessionBean bean : beans) {
- for (EjbLocalRef localref : bean.getEjbLocalRefs()) {
- if (localref.getEjbRefName().equals(((EjbLocalRef) srcObject).getEjbRefName())) {
- openAppropriateEditor(resource);
- return;
- }
- }
- }
- }
- if (((EjbLocalRefImpl) srcObject).eContainer() instanceof SessionBean) {
- openAppropriateEditor(((SessionBean) (((EjbLocalRefImpl) srcObject).eContainer())).getEjbClass());
- return;
- }
- }
-
- private void openEObject(EObject _srcObject) {
- EObject ro = _srcObject;
- IResource resource = WorkbenchResourceHelper
- .getFile(_srcObject);
- if (resource != null) {
- openAppropriateEditor(resource);
- } else {
- ModuleFile moduleFile = ArchiveUtil.getModuleFile(ro);
- if (moduleFile != null) {
- ArchiveOptions options = moduleFile.getOptions();
- if (options instanceof ComponentArchiveOptions) {
- IVirtualComponent component = ((ComponentArchiveOptions) options)
- .getComponent();
- openAppropriateEditor(component);
- }
- } else {
- IArchive archive = JavaEEArchiveUtilities.findArchive(ro);
- if(archive != null){
- IVirtualComponent component = JavaEEArchiveUtilities.findComponent(archive);
- if(component != null){
- openAppropriateEditor(component);
- }
- }
- }
- }
-
- }
-
- /**
- * The structured selection has changed in the workbench. Subclasses should
- * override this method to react to the change. Returns true if the action
- * should be enabled for this selection, and false otherwise.
- *
- * When this method is overridden, the super method must always be invoked.
- * If the super method returns false, this method must also return false.
- *
- * @param sel
- * the new structured selection
- */
- @Override
- public boolean updateSelection(IStructuredSelection s) {
- if (!super.updateSelection(s))
- return false;
-
- // Make sure this is one of the selections we can handle,
- // then set the source object as is. The run() will do the hard stuff.
- Object obj = s.getFirstElement();
- setText("Open"); //$NON-NLS-1$
-
- if (obj instanceof J2EEJavaClassProviderHelper)
- currentDescriptor = getJavaEditorDescriptor();
- else if (obj instanceof BeanLink)
- currentDescriptor = getBaseJavaEditorDescriptor();
- else if (obj instanceof EObject) {
- IEditorRegistry registry = PlatformUI.getWorkbench()
- .getEditorRegistry();
- IFile file = WorkbenchResourceHelper.getFile((EObject) obj);
- if (file != null) {
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(),
- contentType);
- } else {
- if(((EObject) obj).eResource() != null){
- String name = (new Path(((EObject) obj).eResource().getURI()
- .toString())).lastSegment();
- currentDescriptor = registry.getDefaultEditor(name, null);
- }
- }
- } else if (obj instanceof Resource) {
- IEditorRegistry registry = PlatformUI.getWorkbench()
- .getEditorRegistry();
- IFile file = WorkbenchResourceHelper.getFile((Resource) obj);
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(),
- contentType);
- } else if (obj instanceof GroupEARProvider) {
- IFile file = ((GroupEARProvider) obj).getDDFile();
- if (file.isAccessible()){
- IEditorRegistry registry = PlatformUI.getWorkbench()
- .getEditorRegistry();
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(),
- contentType);
- }else{
- currentDescriptor = null;
- return false;
- }
- } else if (obj instanceof GroupEJBProvider) {
- IFile file = WorkbenchResourceHelper.getFile((EObject)((GroupEJBProvider)obj).getEjbJar());
- if (file.isAccessible()){
- IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(),
- contentType);
- }else{
- currentDescriptor = null;
- return false;
- }
- } else if (obj instanceof GroupAppClientProvider) {
- IFile file = ((GroupAppClientProvider) obj).getDDFile();
- if (file.isAccessible()){
- IEditorRegistry registry = PlatformUI.getWorkbench()
- .getEditorRegistry();
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(),
- contentType);
- }else{
- currentDescriptor = null;
- return false;
- }
- } else if (obj instanceof WebAppProvider) {
- IFile file = ((WebAppProvider) obj).getDDFile();
- if (file.isAccessible()){
- IEditorRegistry registry = PlatformUI.getWorkbench()
- .getEditorRegistry();
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(),
- contentType);
- } else{
- currentDescriptor = null;
- return false;
- }
- } else if (obj instanceof RaGroupContentProvider) {
- IFile file = WorkbenchResourceHelper.getFile((EObject) ((AbstractGroupProvider)obj).getJavaEEObject());
- if (file.isAccessible()){
- IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(),
- contentType);
- }else{
- currentDescriptor = null;
- return false;
- }
- } else if (obj instanceof BeanNode) {
-
- IEditorRegistry registry = PlatformUI.getWorkbench()
- .getEditorRegistry();
- JavaEEObject enterpriseBean = ((BeanNode) obj).getEnterpriseBean();
- IFile file = WorkbenchResourceHelper.getFile((EObject)enterpriseBean);
- if (file != null) {
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(),
- contentType);
- } else {
- if(((EObject) enterpriseBean).eResource() != null){
- String name = (new Path(((EObject) enterpriseBean).eResource().getURI()
- .toString())).lastSegment();
- currentDescriptor = registry.getDefaultEditor(name, null);
- }
- }
- } else if (obj instanceof BeanInterfaceNode) {
-
- IEditorRegistry registry = PlatformUI.getWorkbench()
- .getEditorRegistry();
- JavaEEObject beanInterface = (JavaEEObject) ((BeanInterfaceNode) obj).getAdapterNode();
- IFile file = WorkbenchResourceHelper.getFile((EObject)beanInterface);
- if (file != null) {
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(),
- contentType);
- } else {
- if(((EObject) beanInterface).eResource() != null){
- String name = (new Path(((EObject) beanInterface).eResource().getURI().toString())).lastSegment();
- currentDescriptor = registry.getDefaultEditor(name, null);
- } else {
- String fqn = ((BeanInterfaceNode) obj).get_fqn();
- if (fqn != null){
- currentDescriptor = registry.getDefaultEditor(((BeanInterfaceNode) obj).getText(), null);
-// return true;
- } else {
- return false;
- }
-
- }
- }
- }
- setAttributesFromDescriptor();
- srcObject = obj;
- return true;
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Web25ContentProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Web25ContentProvider.java
deleted file mode 100644
index 75bdb28..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Web25ContentProvider.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider;
-
-/**
- * Web 2.5 Content provider is Deployment Descriptor content provider,
- * used for constructing of the descriptor tree in project explorer.
- *
- * @author Dimitar Giormov
- */
-public class Web25ContentProvider extends JEE5ContentProvider {
-
- public Object[] getChildren(Object aParentElement) {
-
- List<Object> children = new ArrayList<Object>();
- IProject project = null;
- if (IProject.class.isInstance(aParentElement)) {
- project = (IProject) aParentElement;
- AbstractGroupProvider cachedContentProvider = getCachedContentProvider(project);
- if (cachedContentProvider != null && cachedContentProvider.isValid()){
- children.add(cachedContentProvider);
- }
- } else if (AbstractGroupProvider.class.isInstance(aParentElement)){
- AbstractGroupProvider abstractGroupProvider = (AbstractGroupProvider) aParentElement;
- if (abstractGroupProvider.hasChildren()){
- children.addAll(abstractGroupProvider.getChildren());
- }
- }
- return children.toArray();
- }
-
-
- public boolean hasChildren(Object element) {
- if (element instanceof WebAppProvider) {
- return ((WebAppProvider)element).isValid();
- } else if (element instanceof AbstractGroupProvider) {
- return ((AbstractGroupProvider) element).hasChildren();
- } else
- return false;
- }
-
- public Object getParent(Object element) {
- return null;
- }
-
- public Object[] getElements(Object inputElement) {
- return getChildren(inputElement);
- }
-
-
- @Override
- protected AbstractGroupProvider getNewContentProviderInstance(IProject project) {
- return new WebAppProvider((WebApp) getCachedModelProvider(project).getModelObject(), project);
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Web25LabelProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Web25LabelProvider.java
deleted file mode 100644
index 40f49d8..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Web25LabelProvider.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider;
-import org.eclipse.jst.javaee.core.Listener;
-import org.eclipse.jst.javaee.core.ParamValue;
-import org.eclipse.jst.javaee.web.ErrorPage;
-import org.eclipse.jst.javaee.web.Filter;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupContextParamsItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupErrorPagesItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupFilterMappingItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupFilterMappingItemProvider.FilterMappingUIWrapper;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupFiltersItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupListenerItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupServletItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupServletMappingItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupServletMappingItemProvider.ServletMappingUIWrapper;
-import org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.WebArtifactNode;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * Web 2.5 Label provider is Deployment Descriptor label provider,
- * used for decorating of the descriptor tree in project explorer.
- *
- * @author Dimitar Giormov
- */
-public class Web25LabelProvider extends J2EELabelProvider {
-
-
-
- @Override
- public Image getImage(Object element) {
- Image ret = null;
- if (element instanceof WebAppProvider) {
- ret = ((WebAppProvider) element).getImage();
- } else if (element instanceof AbstractGroupProvider){
- ret = ((AbstractGroupProvider) element).getImage();
- } else if (element instanceof Servlet){
- ret = GroupServletItemProvider.getServletImage();
- } else if (element instanceof ServletMappingUIWrapper){
- ret = GroupServletMappingItemProvider.getServletMappingImage();
- } else if (element instanceof Filter){
- ret = GroupFiltersItemProvider.getFiltersImage();
- } else if (element instanceof Listener){
- ret = GroupListenerItemProvider.getListenersImage();
- } else if (element instanceof FilterMappingUIWrapper){
- ret = GroupFilterMappingItemProvider.getFilterMappingImage();
- } else if (element instanceof WebArtifactNode){
- ret = ((WebArtifactNode)element).getImage();
- } else if (element instanceof ErrorPage) {
- ret = GroupErrorPagesItemProvider.getErrorPagesImage((ErrorPage)element);
- } else if (element instanceof ParamValue){
- ret = GroupContextParamsItemProvider.getContextParamsImage();
- } else {
- ret = super.getImage(element);
- }
- return ret;
- }
-
- @Override
- public String getText(Object element) {
- String ret = null;
- if (element instanceof WebAppProvider) {
- ret = ((WebAppProvider) element).getText();
- } else if (element instanceof AbstractGroupProvider){
- ret = ((AbstractGroupProvider) element).getText();
- } else if (element instanceof Servlet){
- ret = ((Servlet) element).getServletName();
- } else if (element instanceof ServletMappingUIWrapper) {
- ret = ((ServletMappingUIWrapper) element).getValue();
- } else if (element instanceof Filter){
- ret = ((Filter) element).getFilterName();
- } else if (element instanceof Listener){
- ret = ((Listener) element).getListenerClass();
- } else if (element instanceof FilterMappingUIWrapper) {
- ret = ((FilterMappingUIWrapper) element).getValue();
- } else if (element instanceof WebArtifactNode) {
- ret = ((WebArtifactNode) element).getText();
- } else if (element instanceof ErrorPage ){
- ErrorPage page = ((ErrorPage) element);
- if (page.getErrorCode() == null) {
- ret = page.getExceptionType() + " -> " + page.getLocation(); //$NON-NLS-1$
- } else {
- ret = page.getErrorCode() + " -> " + page.getLocation(); //$NON-NLS-1$
- }
- } else if (element instanceof ParamValue){
- ret = ((ParamValue)element).getParamName() + " = " + ((ParamValue)element).getParamValue();//$NON-NLS-1$
- } else {
- ret = super.getText(element);
- }
- return ret;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/AbstractAppClientGroupProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/AbstractAppClientGroupProvider.java
deleted file mode 100644
index 5910232..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/AbstractAppClientGroupProvider.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.appclient;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider;
-
-public abstract class AbstractAppClientGroupProvider extends
- AbstractGroupProvider {
-
- public AbstractAppClientGroupProvider(JavaEEObject javaee) {
- super(javaee);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java
deleted file mode 100644
index abe0183..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008, 2010 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.appclient;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.javaee.applicationclient.ApplicationClient;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-
-/**
- * Application Client 5.0 Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- * @author Kaloyan Raev
- */
-public class GroupAppClientProvider extends AbstractAppClientGroupProvider implements IAdaptable {
-
-
- private final IProject project;
-
-
- public GroupAppClientProvider(ApplicationClient javaee, IProject project) {
- super(javaee);
- this.project = project;
- }
-
- private static final String PROJECT_RELATIVE_PATH = "META-INF/application-client.xml"; //$NON-NLS-1$
-
- private Image appClient50Image;
- private Image appClient60Image;
-
- private IFile ddFile;
-
- @Override
- public String getText() {
- String result = null;
- if (this.project == null) {
- result = NLS.bind(Messages.DEPLOYMENT_DESCRIPTOR, new Object[] {""}); //$NON-NLS-1$
- } else {
- result = NLS.bind(Messages.DEPLOYMENT_DESCRIPTOR, this.project.getName());
- }
- return result;
- }
-
- @Override
- public List getChildren() {
- List result = new ArrayList();
- if (javaee != null){
- result.addAll(((ApplicationClient) javaee).getEjbRefs());
- //result.addAll(((ApplicationClient) javaee).getEjbLocalRefs());
- result.addAll(((ApplicationClient) javaee).getResourceRefs());
- result.addAll(((ApplicationClient) javaee).getResourceEnvRefs());
- result.addAll(((ApplicationClient) javaee).getEnvEntries());
- result.addAll(((ApplicationClient) javaee).getMessageDestinationRefs());
- //result.addAll(((ApplicationClient) javaee).getPersistenceContextRefs());
- result.addAll(((ApplicationClient) javaee).getPersistenceUnitRefs());
- result.addAll(((ApplicationClient) javaee).getServiceRefs());
- }
- return result;
- }
-
- @Override
- public Image getImage() {
- String version = ((ApplicationClient) javaee).getVersion();
- if (J2EEVersionConstants.VERSION_5_TEXT.equals(version)) {
- return getAppClient50Image();
- } else if (J2EEVersionConstants.VERSION_6_TEXT.equals(version)) {
- return getAppClient60Image();
- }
- return getAppClient50Image();
- }
-
- public IFile getDDFile() {
- if (ddFile != null){
- return ddFile;
- }
- IVirtualFolder virtualFolder = ComponentCore.createComponent(project).getRootFolder();
- ddFile = virtualFolder.getFile(PROJECT_RELATIVE_PATH).getUnderlyingFile();
- return ddFile;
- }
-
- public IProject getProject() {
- return project;
- }
-
- public Object getAdapter(Class adapter) {
- if (IProject.class == adapter){
- return getProject();
- }
- return null;
- }
-
- private Image getAppClient50Image() {
- if (appClient50Image == null) {
- appClient50Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.APP_CLIENT50).createImage();
- }
- return appClient50Image;
- }
-
- private Image getAppClient60Image() {
- if (appClient60Image == null) {
- appClient60Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.APP_CLIENT60).createImage();
- }
- return appClient60Image;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/dnd/AddProjectToEARDropAssistant.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/dnd/AddProjectToEARDropAssistant.java
deleted file mode 100644
index b3047d1..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/dnd/AddProjectToEARDropAssistant.java
+++ /dev/null
@@ -1,622 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- * IBM - bug 281382 clean up
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.dnd;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.internal.core.JarPackageFragmentRoot;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.IAddComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.application.internal.operations.RemoveComponentFromEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualArchiveComponent;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.dialogs.DependencyConflictResolveDialog;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.navigator.internal.plugin.J2EENavigatorPlugin;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.EARFacetUtils;
-import org.eclipse.jst.javaee.application.Application;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.internal.navigator.ear.AbstractEarNode;
-import org.eclipse.jst.jee.ui.internal.navigator.ear.BundledNode;
-import org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.navigator.CommonDropAdapter;
-import org.eclipse.ui.navigator.CommonDropAdapterAssistant;
-import org.eclipse.ui.part.PluginTransfer;
-import org.eclipse.ui.progress.IProgressService;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.RemoveReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * Handles drop of JEE resources on EAR project thus adding them as modules.
- *
- * @author Dimitar Giormov
- *
- */
-public class AddProjectToEARDropAssistant extends CommonDropAdapterAssistant {
-
- private static final Class IPROJECT_CLASS = IProject.class;
- private IVirtualComponent earComponent = null;
- private IProject earProject = null;
- private String libDir = null;
- private boolean resolveConflicts = false;
-
- public AddProjectToEARDropAssistant() {
- super();
- }
-
- @Override
- public boolean isSupportedType(TransferData aTransferType) {
- return LocalSelectionTransfer.getTransfer().isSupportedType(aTransferType);
- }
-
- @Override
- public IStatus handleDrop(CommonDropAdapter aDropAdapter, DropTargetEvent aDropTargetEvent, final Object aTarget) {
- if (LocalSelectionTransfer.getTransfer().isSupportedType(aDropAdapter.getCurrentTransfer())) {
- final IStructuredSelection selection = (IStructuredSelection) LocalSelectionTransfer.getTransfer().getSelection();
- IProgressService service = PlatformUI.getWorkbench().getProgressService();
- resolveConflicts = false;
- for (Iterator selectionIterator = selection.iterator(); selectionIterator.hasNext();) {
- Object sourceObject = selectionIterator.next();
- if (sourceObject instanceof IVirtualReference) {
- IVirtualReference reference = (IVirtualReference) sourceObject;
- /*
- * If a reference is moved from the root to the lib
- * directory check for conflicts with projects referenced by
- * the ear referencing the same lib
- */
- if (libDir.length() > 0 && !libDir.equals(reference.getRuntimePath().toString())) {
- if (hasConflictingProjectInMetaInf(reference)) {
- DependencyConflictResolveDialog dlg = new DependencyConflictResolveDialog(getShell(), DependencyConflictResolveDialog.DLG_TYPE_2);
- if (dlg.open() == DependencyConflictResolveDialog.BTN_ID_CANCEL) {
- return Status.CANCEL_STATUS;
- }
- resolveConflicts = true;
- }
- }
- } else {
- if (libDir.length() > 0){
- IProject projectToAdd = getProject(sourceObject);
- if (hasConflictingProjectInMetaInf(projectToAdd)) {
- DependencyConflictResolveDialog dlg = new DependencyConflictResolveDialog(getShell(), DependencyConflictResolveDialog.DLG_TYPE_2);
- if (dlg.open() == DependencyConflictResolveDialog.BTN_ID_CANCEL) {
- return Status.CANCEL_STATUS;
- }
- resolveConflicts = true;
- }
- }
- }
- }
- Job addProjectToEarJob = new Job(getJobTitle(earComponent)) {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
-
- IStatus status = null;
-
- List<IVirtualComponent> componentsToAdd = new ArrayList<IVirtualComponent>();
- List<IVirtualComponent> componentsToRemove = new ArrayList<IVirtualComponent>();
-
- for (Iterator selectionIterator = selection.iterator(); selectionIterator.hasNext();) {
- Object sourceObject = selectionIterator.next();
-
- if (sourceObject instanceof JarPackageFragmentRoot) {
- JarPackageFragmentRoot jarPackageFragment = (JarPackageFragmentRoot) sourceObject;
-
- String type = VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR;
- IVirtualComponent archive = ComponentCore.createArchiveComponent(earComponent.getProject(), type + jarPackageFragment.getPath().toString());
- componentsToAdd.add(archive);
- } else if (sourceObject instanceof IVirtualReference) {
- IVirtualReference reference = (IVirtualReference) sourceObject;
- if (resolveConflicts) {
- status = resolveConflicts(reference.getReferencedComponent());
- if (!status.isOK()) {
- return status;
- }
- }
- IVirtualComponent archive = reference.getReferencedComponent();
- componentsToRemove.add(archive);
- status = removeComponentsFromEar(componentsToRemove, reference.getRuntimePath().toString());
- if (!status.isOK())
- return status;
- componentsToAdd.add(archive);
- } else {
- IProject projectToAdd = getProject(sourceObject);
- if (resolveConflicts) {
- status = resolveConflicts(ComponentCore.createComponent(projectToAdd));
- if (!status.isOK()) {
- return status;
- }
- }
- componentsToAdd.add(ComponentCore.createComponent(projectToAdd));
- }
- }
-
- if (!componentsToAdd.isEmpty()) {
- status = addComponentsToEar(componentsToAdd, libDir);
- if (!status.isOK())
- return status;
- }
-
- return status;
- }
-
- };
- service.showInDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), addProjectToEarJob);
- addProjectToEarJob.setRule(ResourcesPlugin.getWorkspace().getRoot());
- addProjectToEarJob.schedule();
- }
- return Status.OK_STATUS;
- }
-
- @Override
- public IStatus validateDrop(Object target, int operation, TransferData transferType) {
- libDir = ""; //$NON-NLS-1$
- if (LocalSelectionTransfer.getTransfer().isSupportedType(transferType) || PluginTransfer.getInstance().isSupportedType(transferType)) {
- ISelection selection = LocalSelectionTransfer.getTransfer().getSelection();
- if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection)) {
- IStructuredSelection structuredSelection = (IStructuredSelection) selection;
- earProject = getProject(target);
- if (earProject == null) {
- return Status.CANCEL_STATUS;
- }
- earComponent = ComponentCore.createComponent(earProject);
- int earVersion = getEarVersion(earProject);
- if (target instanceof BundledNode && ((BundledNode) target).getBundledLibsDirectoryNode() == null) {
- libDir = ((Application) ModelProviderManager.getModelProvider(earProject).getModelObject()).getLibraryDirectory();
- if (libDir == null) {
- libDir = J2EEConstants.EAR_DEFAULT_LIB_DIR;
- }
- }
-
- IStatus status = null;
- for (Iterator iterator = structuredSelection.iterator(); iterator.hasNext();) {
- Object next = iterator.next();
-
- //check if library is physically present in the Ear path
- if (IVirtualReference.class.isInstance(next)){
- IVirtualComponent referencedComponent = ((IVirtualReference)next).getReferencedComponent();
- if (referencedComponent.isBinary() && isPhysicallyAdded(referencedComponent)) {
- return Status.CANCEL_STATUS;
- }
- }
-
- if (next instanceof IVirtualReference) {
- return Status.OK_STATUS;
- }
-
- /*
- * Check if we try to add a JarPackageFragment that is
- * already referenced
- */
- if (next instanceof JarPackageFragmentRoot) {
- JarPackageFragmentRoot jar = (JarPackageFragmentRoot) next;
- for (IVirtualReference reference : earComponent.getReferences()) {
- if (reference.getArchiveName().equals(jar.getElementName())) {
- return Status.CANCEL_STATUS;
- }
- }
- return Status.OK_STATUS;
- }
-
- /*
- * Check if we try to add a module that is already
- * referenced by the ear but at the same time allow to
- * change its location from the root to the lib directory
- * and the opposite.
- */
- IProject projectToAdd = getProject(next);
- hasConflictingProjectInMetaInf(ComponentCore.createComponent(projectToAdd));
- try {
- for (IProject referencedProject : earProject.getReferencedProjects()) {
- if (referencedProject == projectToAdd) {
- return Status.CANCEL_STATUS;
- }
- }
- } catch (CoreException e) {
- String msg = e.getMessage() != null ? e.getMessage() : e.toString();
- status = J2EENavigatorPlugin.createErrorStatus(0, msg, e);
- }
-
- if ((status = validateProjectMayBeAdded(earProject, projectToAdd, earVersion)).isOK())
- return status;
- }
- }
-
- }
- return Status.CANCEL_STATUS;
- }
-
- private boolean isPhysicallyAdded(IVirtualComponent component) {
- IFile f = (IFile)component.getAdapter(IFile.class);
- return f == null ? false : true;
- }
-
- /**
- * @param target
- */
- private IStatus validateProjectMayBeAdded(IProject earProject, IProject projectToAdd, int earVersion) {
- if (earProject == null || projectToAdd == null || earVersion < 0)
- return J2EENavigatorPlugin.createErrorStatus(0, Messages.AddProjectToEARDropAssistant_Could_not_add_module_to_Enterprise_, null);
- else if (!earProject.isAccessible()) {
- return J2EENavigatorPlugin.createErrorStatus(0, NLS.bind(Messages.AddProjectToEARDropAssistant_The_project_0_cannot_be_accesse_, earProject.getName()), null);
- } else if (!projectToAdd.isAccessible()) {
- return J2EENavigatorPlugin.createErrorStatus(0, Messages.AddProjectToEARDropAssistant_The_dragged_project_cannot_be_added_, null);
- }
-
- IStatus isValid = validateProjectToAdd(projectToAdd, earVersion);
- if (!isValid.isOK()) {
- return isValid;
- }
-
- return Status.OK_STATUS;
- }
-
- /**
- *
- * @return -1 on error
- */
- protected final int getEarVersion(IProject earProject) {
- int earVersion = -1;
- IFacetedProject facetedProject = null;
- try {
- facetedProject = ProjectFacetsManager.create(earProject);
-
- if (facetedProject != null) {
- double double1 = Double.parseDouble(facetedProject.getProjectFacetVersion(EARFacetUtils.EAR_FACET).getVersionString());
- earVersion = (int) (double1 * 10);
- } else {
- JEEUIPlugin.logError("Could not acquire model elements for project \"" + earProject.getName() + "\".", null); //$NON-NLS-1$ //$NON-NLS-2$
- }
- } catch (CoreException e1) {
- String msg = e1.getMessage() != null ? e1.getMessage() : e1.toString();
- JEEUIPlugin.logError(msg, e1);
- }
-
- return earVersion;
- }
-
- /**
- * @param facetedProject
- * @return
- */
- protected final boolean hasEarFacet(IProject project) {
- IFacetedProject facetedProject = null;
- try {
- facetedProject = ProjectFacetsManager.create(project);
- } catch (CoreException e1) {
- String msg = e1.getMessage() != null ? e1.getMessage() : e1.toString();
- JEEUIPlugin.logError(msg, e1);
- }
- return facetedProject != null && facetedProject.hasProjectFacet(EARFacetUtils.EAR_FACET);
- }
-
- protected final String calculateValidProjectName(final String originalName) {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- String validName = originalName;
- int count = 1;
- while (root.getProject(validName).exists()) {
- validName = originalName + count++;
- }
- return validName;
- }
-
- protected String getJobTitle(IVirtualComponent earComponent) {
- return NLS.bind(Messages.AddModuleToEarDropAssistant_Adding_module_to_ea_, earComponent.getName());
- }
-
- protected IStatus validateProjectToAdd(IProject projectToAdd, int earVersion) {
- IStatus status = null;
- try {
- // check if the project to add is not an EAR itself
- IFacetedProject facetedProject = ProjectFacetsManager.create(projectToAdd);
- if (facetedProject == null) {
- facetedProject = ProjectFacetsManager.create(projectToAdd, true, new NullProgressMonitor());
- IProjectFacetVersion javafacetversion = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_JAVA).getDefaultVersion();
- facetedProject.installProjectFacet(javafacetversion, null, null);
- IProjectFacetVersion utilityfacetversion = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_UTILITY_MODULE).getDefaultVersion();
- facetedProject.installProjectFacet(utilityfacetversion, null, null);
- }
- if (facetedProject.hasProjectFacet(EARFacetUtils.EAR_FACET))
- status = Status.CANCEL_STATUS;
- else
- status = Status.OK_STATUS;
-
- // check if the project to add is with Java EE version equal or
- // lesser than that of the EAR
- String verStr = J2EEProjectUtilities.getJ2EEProjectVersion(projectToAdd);
- if (verStr != null) {
- int version;
- if (JavaEEProjectUtilities.isApplicationClientProject(projectToAdd))
- version = J2EEVersionUtil.convertAppClientVersionStringToJ2EEVersionID(verStr);
- else if (JavaEEProjectUtilities.isEJBProject(projectToAdd))
- version = J2EEVersionUtil.convertEJBVersionStringToJ2EEVersionID(verStr);
- else if (JavaEEProjectUtilities.isDynamicWebProject(projectToAdd))
- version = J2EEVersionUtil.convertWebVersionStringToJ2EEVersionID(verStr);
- else if (JavaEEProjectUtilities.isJCAProject(projectToAdd))
- version = J2EEVersionUtil.convertConnectorVersionStringToJ2EEVersionID(verStr);
- else
- version = J2EEVersionUtil.convertVersionStringToInt(verStr);
-
- if (version > earVersion)
- status = Status.CANCEL_STATUS;
- else
- status = Status.OK_STATUS;
- }
- } catch (CoreException e) {
- String msg = e.getMessage() != null ? e.getMessage() : e.toString();
- status = J2EENavigatorPlugin.createErrorStatus(0, msg, e);
- }
- return status;
-
- }
-
- protected static IProject getProject(Object element) {
- if (element == null)
- return null;
- IProject project = null;
- if (element instanceof IAdaptable)
- project = (IProject) ((IAdaptable) element).getAdapter(IPROJECT_CLASS);
- else
- project = (IProject) Platform.getAdapterManager().getAdapter(element, IPROJECT_CLASS);
-
- if (element instanceof AbstractEarNode) {
- project = ((AbstractEarNode) element).getEarProject();
- }
-
- if (element instanceof GroupEARProvider) {
- project = ((GroupEARProvider) element).getProject();
- }
-
- if (element instanceof IVirtualReference) {
- project = ((IVirtualReference) element).getReferencedComponent().getProject();
- }
-
- if (project == null) {
- if (element instanceof EObject) {
- project = ProjectUtilities.getProject((EObject) element);
- } else if (element instanceof J2EEItemProvider) {
- IFile associatedFile = ((J2EEItemProvider) element).getAssociatedFile();
- if (associatedFile != null)
- project = associatedFile.getProject();
- }
- }
- return project;
- }
-
- protected static String getDefaultURI(IVirtualComponent component) {
- IProject project = component.getProject();
- String name = component.getName();
-
- if (JavaEEProjectUtilities.isDynamicWebProject(project)) {
- name += IJ2EEModuleConstants.WAR_EXT;
- } else if (JavaEEProjectUtilities.isEARProject(project)) {
- name += IJ2EEModuleConstants.EAR_EXT;
- } else if (JavaEEProjectUtilities.isJCAProject(project)) {
- name += IJ2EEModuleConstants.RAR_EXT;
- } else {
- name += IJ2EEModuleConstants.JAR_EXT;
- }
- return name;
- }
-
- private boolean hasConflictingProjectInMetaInf(Object lib) {
- IProject libProj = null;
- if (lib instanceof IProject) {
- libProj = (IProject) lib;
- } else if (lib instanceof IVirtualComponent) {
- libProj = ((IVirtualComponent) lib).getProject();
- } else if (lib instanceof IVirtualReference){
- libProj = ((IVirtualReference) lib).getReferencedComponent().getProject();
- }
- if(libProj == null){
- return false;
- }
- IProject earProject = earComponent.getProject();
- try {
- IProject[] earRefProjects = earProject.getReferencedProjects();
- for (int i = 0; i < earRefProjects.length; i++) {
- if (!JavaEEProjectUtilities.isEARProject(earRefProjects[i]) && !earRefProjects[i].equals(libProj)) {
- IVirtualComponent cmp1 = ComponentCore.createComponent(earRefProjects[i]);
- if (cmp1 == null){
- continue;
- }
- IVirtualReference[] refs = cmp1.getReferences();
- for (int j = 0; j < refs.length; j++) {
- if (refs[j].getReferencedComponent().getProject().equals(libProj))
- return true;
- }
- }
- }
- return false;
- } catch (CoreException ce) {
- }
- return false;
- }
-
- protected IStatus addComponentsToEar(List<IVirtualComponent> components, String libDir) {
- IStatus status = null;
- IDataModel datamodel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
-
- Map componentToURIMap = new HashMap();
- IVirtualComponent moduleComponent = null;
- for (Iterator itr = components.iterator(); itr.hasNext();) {
- moduleComponent = (IVirtualComponent) itr.next();
- componentToURIMap.put(moduleComponent, getDefaultURI(moduleComponent));
- }
- datamodel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComponent);
- datamodel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, components);
- datamodel.setProperty(IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, componentToURIMap);
- datamodel.setProperty(IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, libDir);
- try {
- return datamodel.getDefaultOperation().execute(new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- String msg = e.getMessage() != null ? e.getMessage() : e.toString();
- JEEUIPlugin.logError(msg, e);
- }
- return status;
- }
-
- protected IStatus removeComponentsFromEar(List<IVirtualComponent> components, String libDir) {
- IStatus status = null;
- IDataModel datamodel = DataModelFactory.createDataModel(new RemoveComponentFromEnterpriseApplicationDataModelProvider());
- datamodel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComponent);
- datamodel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, components);
- try {
- status = datamodel.getDefaultOperation().execute(new NullProgressMonitor(), null);
- if (!status.isOK()) {
- return status;
- }
- } catch (ExecutionException e) {
- String msg = e.getMessage() != null ? e.getMessage() : e.toString();
- JEEUIPlugin.logError(msg, e);
- }
- return removeReferences(components, libDir, earComponent);
- }
-
- protected IStatus removeReferences(List<IVirtualComponent> components, String libDir, IVirtualComponent sourceComponent) {
- IVirtualReference[] refs = sourceComponent.getReferences();
- for (IVirtualReference ref : refs) {
- ref.getRuntimePath();
- }
- Map componentToURIMap = new HashMap();
- for (Iterator itr = components.iterator(); itr.hasNext();) {
- IVirtualComponent moduleComponent = (IVirtualComponent) itr.next();
- componentToURIMap.put(moduleComponent, getDefaultURI(moduleComponent));
- }
- final IDataModel model = DataModelFactory.createDataModel(new RemoveReferenceComponentsDataModelProvider());
- model.setProperty(IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, componentToURIMap);
- model.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, sourceComponent);
- model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, components);
- if (libDir.length() > 0) {
- model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, libDir);
- }
- try {
- return model.getDefaultOperation().execute(null, null);
- } catch (ExecutionException e) {
- String msg = e.getMessage() != null ? e.getMessage() : e.toString();
- JEEUIPlugin.logError(msg, e);
- }
- return Status.CANCEL_STATUS;
- }
-
- protected IStatus resolveConflicts(IVirtualComponent component) {
- IProject earProject = earComponent.getProject();
- try {
- IProject[] earRefProjects = earProject.getReferencedProjects();
- for (int i = 0; i < earRefProjects.length; i++) {
- if (!JavaEEProjectUtilities.isEARProject(earRefProjects[i])) {
- IVirtualComponent cmp1 = ComponentCore.createComponent(earRefProjects[i]);
- if(cmp1 == null){
- continue;
- }
- IVirtualReference[] refs = cmp1.getReferences();
- for (int j = 0; j < refs.length; j++) {
- if (refs[j].getReferencedComponent().equals(component)) {
- List<IVirtualComponent> components = new ArrayList<IVirtualComponent>();
- components.add(refs[j].getReferencedComponent());
- IStatus status = removeReferences(components, refs[j].getRuntimePath().toString(), refs[j].getEnclosingComponent());
- if (!status.isOK()) {
- return status;
- }
- try {
- removeManifestDependency(refs[j].getEnclosingComponent(), refs[j].getReferencedComponent());
- } catch (ExecutionException e) {
- String msg = e.getMessage() != null ? e.getMessage() : e.toString();
- JEEUIPlugin.logError(msg, e);
- }
- }
- }
- }
- }
- } catch (CoreException ce) {
- }
- // return false;
- return Status.OK_STATUS;
- }
-
- private void removeManifestDependency(final IVirtualComponent source, final IVirtualComponent target) throws ExecutionException {
- final String sourceProjName = source.getProject().getName();
- String targetProjName;
- if (target instanceof J2EEModuleVirtualArchiveComponent) {
- targetProjName = ((J2EEModuleVirtualArchiveComponent) target).getName();
- String[] pathSegments = targetProjName.split("" + IPath.SEPARATOR); //$NON-NLS-1$
- targetProjName = pathSegments[pathSegments.length - 1];
- } else {
- targetProjName = target.getProject().getName();
- }
- final IProgressMonitor monitor = new NullProgressMonitor();
- final IFile manifestmf = J2EEProjectUtilities.getManifestFile(source.getProject());
- final ArchiveManifest mf = J2EEProjectUtilities.readManifest(source.getProject());
- if (mf == null)
- return;
- final IDataModel updateManifestDataModel = DataModelFactory.createDataModel(new UpdateManifestDataModelProvider());
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.PROJECT_NAME, sourceProjName);
- updateManifestDataModel.setBooleanProperty(UpdateManifestDataModelProperties.MERGE, false);
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.MANIFEST_FILE, manifestmf);
- String[] cp = mf.getClassPathTokenized();
- List cpList = new ArrayList();
- String cpToRemove = (targetProjName.endsWith(IJ2EEModuleConstants.JAR_EXT)) ?
- targetProjName : targetProjName + IJ2EEModuleConstants.JAR_EXT;
- for (int i = 0; i < cp.length; i++) {
- if (!cp[i].equals(cpToRemove)) {
- cpList.add(cp[i]);
- }
- }
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.JAR_LIST, cpList);
- updateManifestDataModel.getDefaultOperation().execute(monitor, null);
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/dnd/IModuleExtensions.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/dnd/IModuleExtensions.java
deleted file mode 100644
index cd9558a..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/dnd/IModuleExtensions.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.dnd;
-
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-
-//@deprecated @see org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants
-
-public interface IModuleExtensions {
-
- public String DOT_WAR = IJ2EEModuleConstants.WAR_EXT;
- public String DOT_JAR = IJ2EEModuleConstants.JAR_EXT;
- public String DOT_RAR = IJ2EEModuleConstants.RAR_EXT;
- public String DOT_EAR = IJ2EEModuleConstants.EAR_EXT;
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/AbstractEarGroupProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/AbstractEarGroupProvider.java
deleted file mode 100644
index fd2e1db..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/AbstractEarGroupProvider.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ear;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider;
-
-public abstract class AbstractEarGroupProvider extends AbstractGroupProvider {
-
- public AbstractEarGroupProvider(JavaEEObject javaee) {
- super(javaee);
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/AbstractEarNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/AbstractEarNode.java
deleted file mode 100644
index d8f9f86..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/AbstractEarNode.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ear;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- * @author gormov
- *
- */
-public abstract class AbstractEarNode {
-
- public static int MODULES_TYPE = 0;
- public static int LIBS_TYPE = 1;
-
- protected int type;
-
- protected static List implicitUtilityReferenceTypes =
- Arrays.asList(new String[] {
- IModuleConstants.JST_APPCLIENT_MODULE,
- IModuleConstants.JST_WEB_MODULE,
- IModuleConstants.JST_EJB_MODULE,
- IModuleConstants.JST_CONNECTOR_MODULE});
-
- private IProject earProject;
-
- public AbstractEarNode(IProject earProject) {
- this.earProject = earProject;
- }
-
- public IProject getEarProject() {
- return earProject;
- }
-
- public abstract List getModules();
-
-
- public int getType() {
- return type;
- }
-
- public abstract String getText();
-
- protected List getComponentReferencesAsList(List componentTypes, IVirtualComponent virtualComponent, IPath runtimePath) {
- List components = new ArrayList();
- IVirtualComponent earComponent = virtualComponent;
- if (earComponent != null ) {
- IVirtualReference[] refComponents = earComponent.getReferences();
- for (int i = 0; i < refComponents.length; i++) {
- IVirtualComponent module = refComponents[i].getReferencedComponent();
- if (module == null) continue;
- // if component types passed in is null then return all components
- if (componentTypes == null || componentTypes.size() == 0) {
- components.add(refComponents[i]);
- } else {
- if (componentTypes.contains(JavaEEProjectUtilities.getJ2EEComponentType(module))) {
- if (runtimePath != null){
- IPath runtimePath2 = getRealRuntimePath(refComponents[i]);
- if (runtimePath2.equals(runtimePath)) {
- components.add(refComponents[i]);
- }
- } else {
- components.add(refComponents[i]);
- }
- }
- }
- }
- }
- return components;
- }
-
- /**
- * This method will return complete list of the binaries contained in the lib dir.
- *
- * @param virtualComponent
- * @param runtimePath
- * @return
- */
- protected List getBinariesInLibDir(IVirtualComponent virtualComponent, IPath runtimePath, List componentTypes) {
- List components = new ArrayList();
- IVirtualComponent earComponent = virtualComponent;
- if (earComponent != null ) {
- IVirtualReference[] refComponents = earComponent.getReferences();
- for (int i = 0; i < refComponents.length; i++) {
- IVirtualComponent module = refComponents[i].getReferencedComponent();
- if (module == null) continue;
- // if component types passed in is null then return all components
- if (module.isBinary() && getRealRuntimePath(refComponents[i]).equals(runtimePath)) {
- if (componentTypes != null && !componentTypes.contains(JavaEEProjectUtilities.getJ2EEComponentType(module)) ) {
- if (!runtimePath.equals(new Path("/"))){//$NON-NLS-1$
- components.add(refComponents[i]);
- }
- } else {
- components.add(refComponents[i]);
- }
-
-
- }
- }
- }
- return components;
- }
-
-
- /**
- * This method will return all the binaries contained in the lib dir.
- * It will not consider modules in lib dir as libraries for that use
- * getBinariesInLibDir(IVirtualComponent virtualComponent, IPath runtimePath, List componentTypes)
- *
- * @param virtualComponent
- * @param runtimePath
- * @return
- * @deprecated since it is not returning the complete list of libraries
- * use: getBinariesInLibDir(IVirtualComponent virtualComponent, IPath runtimePath, List componentTypes)
- */
- protected List getBinariesInLibDir(IVirtualComponent virtualComponent, IPath runtimePath) {
- return getBinariesInLibDir(virtualComponent, runtimePath, null);
- }
-
- protected IPath getRealRuntimePath(IVirtualReference vr){
- IPath runtimePath2 = vr.getRuntimePath();
- if(vr.getArchiveName() != null){
- IPath namePath = new Path (vr.getArchiveName());
- if (namePath.segmentCount()>1 && runtimePath2.segmentCount()==0){
- runtimePath2 = new Path("/"+namePath.removeLastSegments(1).toPortableString()); //$NON-NLS-1$
- }
- }
- return runtimePath2;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/Application5ViewerSorter.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/Application5ViewerSorter.java
deleted file mode 100644
index 4e1d247..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/Application5ViewerSorter.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ear;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.navigator.internal.ApplicationViewerSorter;
-
-public class Application5ViewerSorter extends ApplicationViewerSorter {
-
- @Override
-public int compare(Viewer viewer, Object e1, Object e2) {
- if(e1 instanceof BundledNode){
- return -1;
- } else if(e2 instanceof BundledNode){
- return 1;
- }
- return super.compare(viewer, e1, e2);
-}
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/BundledNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/BundledNode.java
deleted file mode 100644
index 71a80e1..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/BundledNode.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ear;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- *
- * Bundled Libraries node. Sub-node of EAR 5 Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- *
- */
-public class BundledNode extends AbstractEarNode {
-
- private static final List<String> UTILITY = Collections.singletonList(J2EEProjectUtilities.UTILITY);
- private String nodeName;
- private final BundledNode bundledLibsDirectoryNode;
-
- public BundledNode(IProject earProject, String nodeName, BundledNode bundledLibsDirectoryNode) {
- super(earProject);
- this.nodeName = nodeName;
- this.bundledLibsDirectoryNode = bundledLibsDirectoryNode;
- type = LIBS_TYPE;
- }
-
- @Override
- public String toString() {
- return nodeName;
- }
-
- @Override
- public String getText() {
- return nodeName;
- }
-
- public void setText(String label) {
- nodeName = label;
- }
-
- public BundledNode getBundledLibsDirectoryNode() {
- return bundledLibsDirectoryNode;
- }
-
- @Override
- public List getModules() {
- IVirtualComponent projectComponent = ComponentCore.createComponent(getEarProject());
-
- Path libPath = new Path("/"); //$NON-NLS-1$
- if (bundledLibsDirectoryNode == null){
- String modelLibPath = EarUtilities.getEARLibDir(projectComponent);
- String prefix = "/"; //$NON-NLS-1$
- if (modelLibPath.startsWith(prefix)){
- prefix = ""; //$NON-NLS-1$
- }
- libPath = new Path(prefix + modelLibPath);
- }
-
- List libs = getComponentReferencesAsList(UTILITY, projectComponent,
- libPath);
- libs.addAll(getBinariesInLibDir(projectComponent,libPath, UTILITY));
- if(bundledLibsDirectoryNode == null)
- libs.addAll(getComponentReferencesAsList(implicitUtilityReferenceTypes, projectComponent, libPath));
-
- List modules = new ArrayList();
- for (int i = 0; i < libs.size(); i++) {
- IVirtualReference reference = (IVirtualReference) libs.get(i);
-
- IPath runtimePath = getRealRuntimePath(reference);
-
- if (runtimePath != null && runtimePath.segment(0) != null &&
- runtimePath.equals(libPath)) {
- if (bundledLibsDirectoryNode == null){
- modules.add(libs.get(i));
- }
-
- } else {
- if (bundledLibsDirectoryNode != null){
- modules.add(libs.get(i));
- }
- }
- }
- if (bundledLibsDirectoryNode != null){
- modules.add(bundledLibsDirectoryNode);
- }
- return modules;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java
deleted file mode 100644
index 307b045..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008, 2010 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ear;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jst.j2ee.componentcore.util.EARVirtualComponent;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.jst.javaee.application.Application;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * Ear 5 Deployment descriptor node.
- *
- * @author Dimitar Giormov
- * @author Kaloyan Raev
- */
-public class GroupEARProvider extends AbstractEarGroupProvider implements IAdaptable {
-
- private static final String PROJECT_RELATIVE_PATH = "META-INF/application.xml"; //$NON-NLS-1$
- public final static String EAR_DEFAULT_LIB = "lib"; //$NON-NLS-1$
- private static Image ear50Image;
- private static Image ear60Image;
- private EARVirtualComponent earComponent;
- private IFile ddFile;
-
- private BundledNode bundledLibsNode;
- private ModulesNode modulesNode;
-
- public GroupEARProvider(Application application, EARVirtualComponent wtpComponent) {
- super(application);
- earComponent = wtpComponent;
- }
-
- public IProject getProject() {
- return earComponent.getProject();
- }
-
- @Override
- public String getText() {
- return NLS.bind(Messages.DEPLOYMENT_DESCRIPTOR, earComponent.getName());
- }
-
- public EARVirtualComponent getEARVirtualComponent() {
- return this.earComponent;
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- IProject project = getProject();
-
- try {
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- //EE6TODO
- if (facetedProject != null &&
- (facetedProject.hasProjectFacet(
- ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE).getVersion(
- J2EEVersionConstants.VERSION_5_0_TEXT)) || facetedProject.hasProjectFacet(
- ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE).getVersion(
- J2EEVersionConstants.VERSION_6_0_TEXT)))) {
-
- if (bundledLibsNode == null) {
- BundledNode bundledLibsDirectoryNode = new BundledNode(project, Messages.LIBRARY_DIRECTORY + ": " + EarUtilities.getEARLibDir(earComponent), null);//$NON-NLS-1$
- bundledLibsNode = new BundledNode(project, Messages.BUNDLED_LIBRARIES_NODE, bundledLibsDirectoryNode);
- } else {
- bundledLibsNode.getBundledLibsDirectoryNode().setText(Messages.LIBRARY_DIRECTORY + ": " + EarUtilities.getEARLibDir(earComponent));//$NON-NLS-1$
- }
-
- if(modulesNode == null){
- modulesNode = new ModulesNode(project);
- }
-
-
- children.add(modulesNode);
- children.add(bundledLibsNode);
- }
- } catch (CoreException e) {
- String msg = "Error in the JEEContentProvider.getChildren() for parent:" + this; //$NON-NLS-1$
- JEEUIPlugin.logError(msg, e);
- }
- return children;
- }
-
- @Override
- public Image getImage() {
- String version = ((Application) javaee).getVersion();
- if (J2EEVersionConstants.VERSION_5_TEXT.equals(version)) {
- return getEar50Image();
- } else if (J2EEVersionConstants.VERSION_6_TEXT.equals(version)) {
- return getEar60Image();
- }
- return getEar50Image();
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
- public IFile getDDFile() {
- if (ddFile != null){
- return ddFile;
- }
- IVirtualFolder virtualFolder = ComponentCore.createComponent(getProject()).getRootFolder();
- ddFile = virtualFolder.getFile(PROJECT_RELATIVE_PATH).getUnderlyingFile();
- return ddFile;
- }
-
- public Object getAdapter(Class adapter) {
- if (IProject.class == adapter){
- return getProject();
- }
- return null;
- }
-
- private Image getEar50Image() {
- if (ear50Image == null) {
- ear50Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.EAR_IMAGE).createImage();
- }
- return ear50Image;
- }
-
- private Image getEar60Image() {
- if (ear60Image == null) {
- ear60Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.EAR6_IMAGE).createImage();
- }
- return ear60Image;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/ModulesNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/ModulesNode.java
deleted file mode 100644
index ef417a2..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/ModulesNode.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ear;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- *
- * Modules sub-node of EAR Deployment descriptor node Java EE 5
- *
- * @author Dimitar Giormov
- *
- */
-public class ModulesNode extends AbstractEarNode {
-
- public ModulesNode(IProject earProject) {
- super(earProject);
- type = MODULES_TYPE;
- }
-
- @Override
- public String toString() {
- return Messages.EAR_MODULES_NODE;
- }
-
- @Override
- public String getText() {
- return Messages.EAR_MODULES_NODE;
- }
-
- @Override
- public List getModules() {
- IVirtualComponent projectComponent = ComponentCore.createComponent(getEarProject());
- return Arrays.asList(EarUtilities.getJ2EEModuleReferences(projectComponent));
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/ShowDepPropPageAction.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/ShowDepPropPageAction.java
deleted file mode 100644
index 8760010..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/ShowDepPropPageAction.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ear;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.dialogs.PropertyDialog;
-
-public class ShowDepPropPageAction implements IObjectActionDelegate
-{
-
- private ISelection sel;
-
- public void selectionChanged(IAction action, ISelection selection) {
- sel = selection;
- }
-
- public void setActivePart(IAction action, IWorkbenchPart targetPart) {
- }
-
- public void run(IAction action) {
- if (sel == null){
- return;
- }
- Object selectedObject = ((IStructuredSelection) sel).getFirstElement();
- if (selectedObject instanceof ModulesNode) {
- IProject earProject = ((ModulesNode)selectedObject).getEarProject();
- PreferenceDialog dialog = PropertyDialog.createDialogOn(PlatformUI.getWorkbench().getActiveWorkbenchWindow().
- getShell(), "org.eclipse.wst.common.componentcore.ui.DeploymentAssemblyPage", earProject); //$NON-NLS-1$
- if (dialog != null) {
- dialog.open();
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/AbstractEjbGroupProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/AbstractEjbGroupProvider.java
deleted file mode 100644
index ac62cf0..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/AbstractEjbGroupProvider.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ejb;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider;
-
-public abstract class AbstractEjbGroupProvider extends AbstractGroupProvider{
-
- public AbstractEjbGroupProvider(JavaEEObject javaee) {
- super(javaee);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/ActivationConfigProperties.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/ActivationConfigProperties.java
deleted file mode 100644
index d471c9b..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/ActivationConfigProperties.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ejb;
-
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Deployment Descriptor node that contains information about ActivationConfigProperties.
- *
- * @author Dimitar Giormov
- *
- */
-public class ActivationConfigProperties extends AbstractDDNode {
-
- public ActivationConfigProperties(Object adapterNode) {
- super(adapterNode);
- }
-
- @Override
- public List getChildren() {
- return (List) adapterNode;
- }
-
- @Override
- public boolean hasChildren() {
- return true;
- }
-
- @Override
- public String getText() {
- return Messages.ACTIVATION_CONFIG_PROPERTIES;
- }
-
- @Override
- public Image getImage() {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("access_intent_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanDecorator.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanDecorator.java
deleted file mode 100644
index b2ed576..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanDecorator.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ejb;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.jface.viewers.ILightweightLabelDecorator;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-
-public class BeanDecorator extends LabelProvider implements ILightweightLabelDecorator {
-
- public void decorate(Object element, IDecoration decoration) {
- if (element instanceof BeanInterfaceNode){
- BeanInterfaceNode beanInteraceNode = (BeanInterfaceNode) element;
- switch (beanInteraceNode.getKind()) {
- case BeanInterfaceNode.KINDS.BUSSINESS_LOCAL:
- applyDecorator(JEEUIPluginIcons.BUSSINESS_LOCAL, decoration);
- break;
- case BeanInterfaceNode.KINDS.BUSSINESS_REMOTE:
- applyDecorator(JEEUIPluginIcons.BUSSINESS_REMOTE, decoration);
- break;
- case BeanInterfaceNode.KINDS.REMOTE:
- applyDecorator(JEEUIPluginIcons.REMOTE, decoration);
- break;
- case BeanInterfaceNode.KINDS.REMOTE_HOME:
- applyDecorator(JEEUIPluginIcons.REMOTE_HOME, decoration);
- break;
- case BeanInterfaceNode.KINDS.LOCAL:
- applyDecorator(JEEUIPluginIcons.LOCAL, decoration);
- break;
- case BeanInterfaceNode.KINDS.LOCAL_HOME:
- applyDecorator(JEEUIPluginIcons.LOCAL_HOME, decoration);
- break;
- }
- } else if (element instanceof BeanNode){
- decoration.addOverlay(J2EEUIPlugin.getDefault().getImageDescriptor("ejb_module_ovr")); //$NON-NLS-1$
- }
- }
-
- private void applyDecorator(String id, IDecoration decoration) {
- ImageDescriptor imageDescriptor = JEEUIPlugin.getDefault().getImageDescriptor(id);
- decoration.addOverlay(imageDescriptor);
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanInterfaceNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanInterfaceNode.java
deleted file mode 100644
index d3ea465..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanInterfaceNode.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Deployment Descriptor node that contains information about Session or Entity
- * beans interfaces (Business, Component and Local interfaces).
- *
- * @author Dimitar Giormov
- */
-public class BeanInterfaceNode extends AbstractDDNode {
-
- private final int kind;
- private final String _fqn;
-
- public class KINDS {
- public static final int BUSSINESS_LOCAL = 0;
- public static final int BUSSINESS_REMOTE = 1;
- public static final int LOCAL = 2;
- public static final int LOCAL_HOME = 3;
- public static final int REMOTE = 4;
- public static final int REMOTE_HOME = 5;
- }
-
- public BeanInterfaceNode(Object adapterNode, String _fqn, int kind) {
- super(adapterNode);
- this._fqn = _fqn;
- this.kind = kind;
- }
-
- @Override
- public String getText() {
- return Signature.getSimpleName(_fqn);
- }
-
- @Override
- public List getChildren() {
- return new ArrayList();
- }
-
- @Override
- public boolean hasChildren() {
- return false;
- }
-
- @Override
- public Image getImage() {
- return JavaPluginImages.get(JavaPluginImages.IMG_OBJS_CUNIT);
- }
-
- public String get_fqn() {
- return _fqn;
- }
-
- public int getKind() {
- return kind;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanNode.java
deleted file mode 100644
index ea3aaf7..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanNode.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ejb;
-
-import java.util.List;
-
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.ejb.EntityBean;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Deployment Descriptor node that contains information about Enterprise beans.
- *
- *
- * @author Dimitar Giormov
- *
- */
-public class BeanNode extends AbstractDDNode {
-
- public BeanNode(JavaEEObject bean) {
- super(bean);
- image = null;
- String qualified = getEjbClassQualifiedName();
- if (qualified != null) {
- text = Signature.getSimpleName(qualified);
- description = Messages.ENTERPRISE_BEAN_CLASS_DESCRIPTION + qualified;
- }
- }
-
- public String getEjbClassQualifiedName() {
- if (adapterNode instanceof SessionBean){
- return ((SessionBean)adapterNode).getEjbClass();
- } else if (adapterNode instanceof MessageDrivenBean){
- return ((MessageDrivenBean)adapterNode).getEjbClass();
- }else if (adapterNode instanceof EntityBean){
- return ((EntityBean)adapterNode).getEjbClass();
- }
- return null;
- }
-
- public JavaEEObject getEnterpriseBean(){
- return (JavaEEObject) adapterNode;
- }
-
- @Override
- public List getChildren() {
- return null;
- }
-
- @Override
- public boolean hasChildren() {
- return false;
- }
-
- @Override
- public Image getImage() {
- return JavaPluginImages.get(JavaPluginImages.IMG_OBJS_CUNIT);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanNodePropertyTester.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanNodePropertyTester.java
deleted file mode 100644
index 68355cc..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanNodePropertyTester.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ejb;
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-
-public class BeanNodePropertyTester extends PropertyTester {
-
- public static final String BEAN_TYPE = "beanType"; //$NON-NLS-1$
- public static final String IS_SESSION_BEAN = "isSessionBean"; //$NON-NLS-1$
- public static final String IS_MESSAGE_DRIVEN = "isMessageDrivenBean"; //$NON-NLS-1$
-
- public boolean test(Object receiver, String property, Object[] args,
- Object expectedValue) {
-
- if (!(receiver instanceof BeanNode)) {
- return false;
- }
-
- Object adapterNode = ((BeanNode) receiver).getAdapterNode();
-
- String val = (String) expectedValue;
- if (BEAN_TYPE.equals(property)) {
- if (IS_SESSION_BEAN.equals(val)) {
- return isSessionBean(adapterNode);
- } else if (IS_MESSAGE_DRIVEN.equals(val)) {
- return isMessageDrivenBean(adapterNode);
- }
- return false;
- }
- return false;
- }
-
- private boolean isMessageDrivenBean(Object obj) {
- if (obj instanceof MessageDrivenBean) {
- return true;
- }
- return false;
- }
-
- private boolean isSessionBean(Object obj) {
- if (obj instanceof SessionBean)
- return true;
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEJBProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEJBProvider.java
deleted file mode 100644
index 1870fe6..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEJBProvider.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ejb;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-/**
- * Deployment Descriptor root node.
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupEJBProvider extends AbstractEjbGroupProvider implements IAdaptable {
-
- private GroupEjbSession groupEjbSession;
- private GroupEjbMessageDriven groupEjbMessageDriven;
- private GroupEjbEntity groupEjbEntity;
- private String projectName = null;
-
-
- public GroupEJBProvider(EJBJar ejbJar) {
- super(ejbJar);
-
- groupEjbSession = new GroupEjbSession(ejbJar);
- groupEjbMessageDriven = new GroupEjbMessageDriven(ejbJar);
- groupEjbEntity = new GroupEjbEntity(ejbJar);
-
- children.add(groupEjbSession);
- children.add(groupEjbMessageDriven);
- children.add(groupEjbEntity);
- }
-
- @Override
- public List getChildren() {
- return children;
- }
-
- public EJBJar getEjbJar() {
- return (EJBJar) javaee;
- }
-
- @Override
- public String getText() {
- return NLS.bind(Messages.DEPLOYMENT_DESCRIPTOR, projectName);
- }
-
- public String getProjectName() {
- return projectName;
- }
-
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
-
- @Override
- public Image getImage() {
- return null;
- }
-
- @Override
- public void reinit(JavaEEObject modelObject) {
- super.reinit(modelObject);
- groupEjbSession.reinit(modelObject);
- groupEjbMessageDriven.reinit(modelObject);
- groupEjbEntity.reinit(modelObject);
- }
-
- public Object getAdapter(Class adapter) {
- if (IProject.class == adapter){
- return ResourcesPlugin.getWorkspace().getRoot().getProject(getProjectName());
- }
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbEntity.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbEntity.java
deleted file mode 100644
index 598c93a..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbEntity.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ejb;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Entity Beans group Deployment Descriptor node that has a number of sub nodes
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupEjbEntity extends AbstractDDNode {
-
- public GroupEjbEntity(EJBJar parent) {
- super(parent);
- image = null;
- text = Messages.ENTITY_BEANS;
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- List entities = null;
- EnterpriseBeans enterpriseBeans = ((EJBJar) adapterNode).getEnterpriseBeans();
- if (enterpriseBeans != null)
- entities = enterpriseBeans.getEntityBeans();
- if (entities != null && entities.size() >0){
- children.addAll(entities);
- }
- return children;
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
- @Override
- public Image getImage() {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("cmpEntity_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbMessageDriven.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbMessageDriven.java
deleted file mode 100644
index d0f8846..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbMessageDriven.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ejb;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode;
-import org.eclipse.swt.graphics.Image;
-/**
- * Message Driven Beans group Deployment Descriptor node that has a number of sub nodes
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupEjbMessageDriven extends AbstractDDNode {
-
- public GroupEjbMessageDriven(EJBJar parent) {
- super(parent);
- image = null;
- text = Messages.MESSAGE_DRIVEN_BEANS;
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- List msgBeans = null;
- EnterpriseBeans enterpriseBeans = ((EJBJar) adapterNode).getEnterpriseBeans();
- if (enterpriseBeans != null)
- msgBeans = enterpriseBeans.getMessageDrivenBeans();
- if (msgBeans != null && msgBeans.size()>0){
- children.addAll(msgBeans);
- }
- return children;
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
- @Override
- public Image getImage() {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("message_bean_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbSession.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbSession.java
deleted file mode 100644
index de7d7fa..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbSession.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ejb;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * Session Beans group Deployment Descriptor node that has a number of sub nodes
- *
- * @author Dimitar Giormov
- */
-public class GroupEjbSession extends AbstractDDNode {
-
- public GroupEjbSession(EJBJar parent) {
- super(parent);
- image = null;
- text = Messages.SESSION_BEANS;
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- List sessionBeans = null;
- EnterpriseBeans enterpriseBeans = ((EJBJar) adapterNode).getEnterpriseBeans();
- if (enterpriseBeans != null)
- sessionBeans = enterpriseBeans.getSessionBeans();
-
- if (sessionBeans != null && sessionBeans.size()>0){
- children.addAll(sessionBeans);
- }
- return children;
- }
-
- @Override
- public boolean hasChildren() {
- return !this.getChildren().isEmpty();
- }
-
- @Override
- public Image getImage() {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("sessionBean_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/AbstractConnectorGroupProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/AbstractConnectorGroupProvider.java
deleted file mode 100644
index f2e1add..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/AbstractConnectorGroupProvider.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ra;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider;
-
-public abstract class AbstractConnectorGroupProvider extends AbstractGroupProvider {
-
- public AbstractConnectorGroupProvider(JavaEEObject javaee) {
- super(javaee);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/ActicationSpecNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/ActicationSpecNode.java
deleted file mode 100644
index b8b6c87..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/ActicationSpecNode.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ra;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.jca.ActivationSpec;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.swt.graphics.Image;
-
-public class ActicationSpecNode extends AbstractConnectorGroupProvider {
-
- public ActicationSpecNode(JavaEEObject javaee) {
- super(javaee);
- }
-
- @Override
- public String getText() {
- return Messages.ActicationSpecNode_ActivationSpec + (((ActivationSpec)javaee).getActivationspecClass() != null ? ((ActivationSpec)javaee).getActivationspecClass() :""); //$NON-NLS-1$
- }
-
- @Override
- public boolean hasChildren() {
- return ((ActivationSpec)javaee).getRequiredConfigProperty() != null && ((ActivationSpec)javaee).getRequiredConfigProperty().size() > 0;
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- children.addAll(((ActivationSpec)javaee).getRequiredConfigProperty());
- return children;
- }
-
- @Override
- public Image getImage() {
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/AdminObjectNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/AdminObjectNode.java
deleted file mode 100644
index 24d6e29..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/AdminObjectNode.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ra;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.jca.AdminObject;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.swt.graphics.Image;
-
-public class AdminObjectNode extends AbstractConnectorGroupProvider {
-
- public AdminObjectNode(JavaEEObject javaee) {
- super(javaee);
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
-// children.addAll(((AdminObject)javaee).getConfigProperty());
- return children;
- }
-
-
-
- @Override
- public boolean hasChildren() {
- return false;
- }
-
- @Override
- public Image getImage() {
- return null;
- }
-
- @Override
- public String getText() {
- return Messages.ConnectorLabelProvider_ADMIN_OBJECT + (((AdminObject)javaee).getAdminobjectInterface() != null ? ((AdminObject)javaee).getAdminobjectInterface() :""); //$NON-NLS-1$
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/GroupRaContentProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/GroupRaContentProvider.java
deleted file mode 100644
index b5ee3aa..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/GroupRaContentProvider.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ra;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.jca.Connector;
-import org.eclipse.jst.javaee.jca.ResourceAdapter;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-public class GroupRaContentProvider extends AbstractConnectorGroupProvider {
-
-
- private Image RA_IMAGE;
-
- public GroupRaContentProvider(JavaEEObject javaee1) {
- super(javaee1);
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- Connector connector = (Connector) javaee;
- ResourceAdapter ra = connector.getResourceadapter();
- if (ra == null){
- return children;
- }
- if (ra.getAdminobject() != null){
- for (Object object : ra.getAdminobject() ) {
- children.add(new AdminObjectNode((JavaEEObject) object));
- }
- }
- if (ra.getConfigProperty() != null){
- children.addAll(ra.getConfigProperty());
- }
-
- if (ra.getSecurityPermission() != null){
- children.addAll(ra.getSecurityPermission());
- }
- if (ra.getInboundResourceadapter() != null){
- children.add(new InboundRaNode(ra.getInboundResourceadapter()));
- }
- if (ra.getOutboundResourceadapter()!= null){
- children.add(new OutboundRaNode(ra.getOutboundResourceadapter()));
-
- }
- return children;
- }
-
- @Override
- public Image getImage() {
- if (RA_IMAGE == null) {
- RA_IMAGE = JEEUIPlugin.getDefault().getImage(JEEUIPluginIcons.IMG_RESOURCE_ADAPTER);
- }
- return RA_IMAGE;
- }
-
- @Override
- public String getText() {
- return Messages.GroupRaContentProvider_RESOURCE_ADAPTER;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/InboundRaNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/InboundRaNode.java
deleted file mode 100644
index 7007967..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/InboundRaNode.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ra;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.jca.InboundResourceAdapter;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.swt.graphics.Image;
-
-public class InboundRaNode extends AbstractConnectorGroupProvider {
-
- public InboundRaNode(JavaEEObject javaee) {
- super(javaee);
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- children.add(new MessageAdapterNode(((InboundResourceAdapter)javaee).getMessageadapter()));
- return children;
- }
-
- @Override
- public Image getImage() {
- return null;
- }
-
- @Override
- public String getText() {
- return Messages.InboundRaNode_Inbound_Resource_adapter;
- }
-
- @Override
- public boolean hasChildren() {
- return ((InboundResourceAdapter)javaee).getMessageadapter() != null;
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/MessageAdapterNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/MessageAdapterNode.java
deleted file mode 100644
index 9398db4..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/MessageAdapterNode.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ra;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.jca.MessageAdapter;
-import org.eclipse.jst.javaee.jca.MessageListener;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.swt.graphics.Image;
-
-public class MessageAdapterNode extends AbstractConnectorGroupProvider {
-
- public MessageAdapterNode(JavaEEObject javaee) {
- super(javaee);
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- List<MessageListener> messagelistener = ((MessageAdapter)javaee).getMessagelistener();
- for (MessageListener messageListener2 : messagelistener) {
- children.add(new MessageListenerNode(messageListener2));
- }
- return children;
- }
-
- @Override
- public Image getImage() {
- return null;
- }
-
- @Override
- public String getText() {
- return Messages.MessageAdapterNode_MESSAGE_ADAPTER;
- }
-
- @Override
- public boolean hasChildren() {
- List<MessageListener> messagelistener = ((MessageAdapter)javaee).getMessagelistener();
- return messagelistener != null && messagelistener.size()>0;
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/MessageListenerNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/MessageListenerNode.java
deleted file mode 100644
index dc6b2ec..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/MessageListenerNode.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ra;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.jca.MessageListener;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.swt.graphics.Image;
-
-public class MessageListenerNode extends AbstractConnectorGroupProvider {
-
- public MessageListenerNode(JavaEEObject javaee) {
- super(javaee);
- }
-
-
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- children.add(new ActicationSpecNode(((MessageListener)javaee).getActivationspec()));
- return children;
- }
-
-
-
- @Override
- public boolean hasChildren() {
- return ((MessageListener)javaee).getActivationspec() != null;
- }
-
- @Override
- public Image getImage() {
- return null;
- }
-
- @Override
- public String getText() {
- return Messages.MessageListenerNode_MessageListener + (((MessageListener)javaee).getMessagelistenerType() != null ? ((MessageListener)javaee).getMessagelistenerType() :""); //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/OutboundRaNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/OutboundRaNode.java
deleted file mode 100644
index e65d4db..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/OutboundRaNode.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ra;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.jca.OutboundResourceAdapter;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.swt.graphics.Image;
-
-public class OutboundRaNode extends AbstractConnectorGroupProvider {
-
- public OutboundRaNode(JavaEEObject javaee) {
- super(javaee);
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- children.addAll(((OutboundResourceAdapter)javaee).getConnectionDefinition());
- return children;
- }
- @Override
- public Image getImage() {
- return null;
- }
-
- @Override
- public boolean hasChildren() {
- return ((OutboundResourceAdapter)javaee).getConnectionDefinition() != null && ((OutboundResourceAdapter)javaee).getConnectionDefinition().size() >0;
- }
-
- @Override
- public String getText() {
- return Messages.OutboundRaNode_OutboundResourceAdapter;
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/RaGroupContentProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/RaGroupContentProvider.java
deleted file mode 100644
index 56172ad..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/RaGroupContentProvider.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ra;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.jca.Connector;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-
-public class RaGroupContentProvider extends AbstractConnectorGroupProvider {
-
- private IProject project;
- private Image CONNECTOR_IMAGE;
-
- public RaGroupContentProvider(JavaEEObject javaee, IProject project) {
- super(javaee);
- this.project = project;
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- children.add(new GroupRaContentProvider(javaee));
- if(((Connector)javaee).getLicense() != null){
- children.add(((Connector)javaee).getLicense());
- }
- return children;
- }
-
- @Override
- public Image getImage() {
- if (CONNECTOR_IMAGE == null) {
- CONNECTOR_IMAGE = JEEUIPlugin.getDefault().getImage(JEEUIPluginIcons.IMG_CONNECTOR);
- }
- return CONNECTOR_IMAGE;
- }
-
-
- @Override
- public String getText() {
- return NLS.bind(Messages.DEPLOYMENT_DESCRIPTOR, project.getName());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/AbstractWebGroupProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/AbstractWebGroupProvider.java
deleted file mode 100644
index 16f020b..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/AbstractWebGroupProvider.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider;
-
-public abstract class AbstractWebGroupProvider extends AbstractGroupProvider {
-
- public AbstractWebGroupProvider(JavaEEObject javaee) {
- super(javaee);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupContextParamsItemProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupContextParamsItemProvider.java
deleted file mode 100644
index 6a8aa77..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupContextParamsItemProvider.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Context Parameters group in Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupContextParamsItemProvider extends AbstractWebGroupProvider{
-
- private static Image CONTEXT_PARAM_IMAGE;
-
- public GroupContextParamsItemProvider(WebApp webApp) {
- super(webApp);
- text = Messages.CONTEXT_PARAMS_ITEM_PROVIDER;
- }
-
- @Override
- public List getChildren() {
- if (javaee != null){
- return ((WebApp) javaee).getContextParams();
- }
- return null;
- }
-
- @Override
- public Image getImage() {
- return getContextParamsImage();
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
- public static Image getContextParamsImage() {
- if (CONTEXT_PARAM_IMAGE == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.GROUP_CONTEXT_PARAM);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- CONTEXT_PARAM_IMAGE = imageDescriptor.createImage();
- }
- return CONTEXT_PARAM_IMAGE;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupErrorPagesItemProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupErrorPagesItemProvider.java
deleted file mode 100644
index fd504a5..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupErrorPagesItemProvider.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.web.ErrorPage;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Error pages group in Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupErrorPagesItemProvider extends AbstractWebGroupProvider{
-
- private static Image ERROR_PAGES;
- private static Image EXCEPTION_ERROR_PAGES;
-
- public GroupErrorPagesItemProvider(WebApp webApp) {
- super(webApp);
- text = Messages.ERROR_PAGES_ITEM_PROVIDER;
- }
-
- @Override
- public List getChildren() {
- if (javaee != null){
- return ((WebApp) javaee).getErrorPages();
- }
- return null;
- }
-
- @Override
- public Image getImage() {
- return getErrorPagesImage();
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
- public static Image getErrorPagesImage() {
- if (ERROR_PAGES == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.GROUP_ERROR_PAGE);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- ERROR_PAGES = imageDescriptor.createImage();
- }
- return ERROR_PAGES;
- }
-
- public static Image getErrorPagesImage(ErrorPage element) {
- if (element.getErrorCode() != null){
-
- }
- if (EXCEPTION_ERROR_PAGES == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.GROUP_ERROR_PAGE);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- EXCEPTION_ERROR_PAGES = imageDescriptor.createImage();
- }
- return EXCEPTION_ERROR_PAGES;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupFilterMappingItemProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupFilterMappingItemProvider.java
deleted file mode 100644
index 35c131d..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupFilterMappingItemProvider.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-import org.eclipse.jst.javaee.web.FilterMapping;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Filter mappings group in Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupFilterMappingItemProvider extends AbstractWebGroupProvider {
-
- private static Image FILTER_MAPPING;
-
- public GroupFilterMappingItemProvider(WebApp webApp) {
- super(webApp);
- text = Messages.FILTER_MAPPING_ITEM_PROVIDER;
- }
-
- @Override
- public List<?> getChildren() {
- if (javaee != null){
- return flattenMapping(((WebApp) javaee).getFilterMappings());
- }
- return null;
- }
-
- private List<?> flattenMapping(List<FilterMapping> filterMappings) {
- List<FilterMappingUIWrapper> result = new ArrayList<FilterMappingUIWrapper>();
- if (filterMappings != null && filterMappings.size() > 0){
- for (FilterMapping filterMapping : filterMappings) {
- result.addAll(getFilterMappingDisplay(filterMapping));
- }
- }
- return result;
- }
-
- @Override
- public Image getImage() {
- return getFilterMappingImage();
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
- public static Image getFilterMappingImage() {
- if (FILTER_MAPPING == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.GROUP_FILTER_MAPPING);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- FILTER_MAPPING = imageDescriptor.createImage();
- }
- return FILTER_MAPPING;
- }
-
- private List<FilterMappingUIWrapper> getFilterMappingDisplay(FilterMapping element) {
- List<FilterMappingUIWrapper> result = new ArrayList<FilterMappingUIWrapper>();
- String value = null;
- if (element.getUrlPatterns().size() > 0){
- for (UrlPatternType pattern : element.getUrlPatterns()) {
- value = pattern.getValue();
- result.add(new FilterMappingUIWrapper(value + " -> " + element.getFilterName())); //$NON-NLS-1$
- }
-
- }
- return result;
- }
-
- public class FilterMappingUIWrapper {
- private String value;
-
- public String getValue() {
- return value;
- }
-
- public FilterMappingUIWrapper(String value) {
- super();
- this.value = value;
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupFiltersItemProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupFiltersItemProvider.java
deleted file mode 100644
index 20f107c..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupFiltersItemProvider.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Filters group in Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupFiltersItemProvider extends AbstractWebGroupProvider{
-
- private static Image FILTER;
-
- public GroupFiltersItemProvider(WebApp webApp) {
- super(webApp);
- text = Messages.FILTERS_ITEM_PROVIDER;
- }
-
- @Override
- public List getChildren() {
- if (javaee != null){
- return ((WebApp) javaee).getFilters();
- }
- return null;
- }
-
- @Override
- public Image getImage() {
- return getFiltersImage();
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
- public static Image getFiltersImage() {
- if (FILTER == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.FILTER_MAPPING);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- FILTER = imageDescriptor.createImage();
- }
- return FILTER;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupListenerItemProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupListenerItemProvider.java
deleted file mode 100644
index d99360e..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupListenerItemProvider.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Listener group in Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupListenerItemProvider extends AbstractWebGroupProvider{
-
- private static Image LISTENER;
-
- public GroupListenerItemProvider(WebApp webApp) {
- super(webApp);
- text = Messages.LISTENER_ITEM_PROVIDER;
- }
-
- @Override
- public List getChildren() {
- if (javaee != null){
- return ((WebApp) javaee).getListeners();
- }
- return null;
- }
-
- @Override
- public Image getImage() {
- return getListenersImage();
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
- public static Image getListenersImage() {
- if (LISTENER == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.GROUP_LISTENER);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- LISTENER = imageDescriptor.createImage();
- }
- return LISTENER;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupReferenceItemProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupReferenceItemProvider.java
deleted file mode 100644
index 103add5..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupReferenceItemProvider.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * JNDI References group in Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupReferenceItemProvider extends AbstractWebGroupProvider{
-
- private static Image REFERENCES;
-
- public GroupReferenceItemProvider(WebApp webApp) {
- super(webApp);
- text = Messages.REFERENCES;
- }
-
-
- @Override
- public List getChildren() {
- List result = new ArrayList();
- if (javaee != null){
- result.addAll(((WebApp) javaee).getEjbRefs());
- result.addAll(((WebApp) javaee).getEjbLocalRefs());
- result.addAll(((WebApp) javaee).getResourceRefs());
- result.addAll(((WebApp) javaee).getResourceEnvRefs());
- result.addAll(((WebApp) javaee).getEnvEntries());
- result.addAll(((WebApp) javaee).getMessageDestinationRefs());
- result.addAll(((WebApp) javaee).getPersistenceContextRefs());
- result.addAll(((WebApp) javaee).getPersistenceUnitRefs());
- result.addAll(((WebApp) javaee).getServiceRefs());
- return result;
- }
- return null;
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
-
- @Override
- public Image getImage() {
- return getReferencesImage();
- }
-
-
- public static Image getReferencesImage() {
- if (REFERENCES == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.RESOURCE_REFERENCE_OBJ);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- REFERENCES = imageDescriptor.createImage();
- }
- return REFERENCES;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupServletItemProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupServletItemProvider.java
deleted file mode 100644
index b737d31..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupServletItemProvider.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Servlets group in Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupServletItemProvider extends AbstractWebGroupProvider{
-
- private static Image SERVLET;
-
- public GroupServletItemProvider(WebApp webApp) {
- super(webApp);
- text = Messages.SERVLET_ITEM_PROVIDER;
- }
-
-
- @Override
- public List getChildren() {
- if (javaee != null){
- return ((WebApp) javaee).getServlets();
- }
- return null;
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
-
- @Override
- public Image getImage() {
- return getServletImage();
- }
-
-
- public static Image getServletImage() {
- if (SERVLET == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.GROUP_SERVLET);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- SERVLET = imageDescriptor.createImage();
- }
- return SERVLET;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupServletMappingItemProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupServletMappingItemProvider.java
deleted file mode 100644
index 66d5af5..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupServletMappingItemProvider.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-import org.eclipse.jst.javaee.web.ServletMapping;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Servlet Mappings group in Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupServletMappingItemProvider extends AbstractWebGroupProvider{
-
- private static Image SERVLETMAPPING;
-
- public GroupServletMappingItemProvider(WebApp webApp) {
- super(webApp);
- text = Messages.SERVLET_MAPPING_ITEM_PROVIDER;
- }
-
- @Override
- public List getChildren() {
- if (javaee != null){
- return flattenMapping(((WebApp) javaee).getServletMappings());
- }
- return null;
- }
-
- @Override
- public Image getImage() {
- return getServletMappingImage();
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
- public static Image getServletMappingImage() {
- if (SERVLETMAPPING == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.SERVLET_MAPPING);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- SERVLETMAPPING = imageDescriptor.createImage();
- }
- return SERVLETMAPPING;
- }
-
- private List<?> flattenMapping(List<ServletMapping> servletMappings) {
- List<ServletMappingUIWrapper> result = new ArrayList<ServletMappingUIWrapper>();
- if (servletMappings != null && servletMappings.size() > 0){
- for (ServletMapping filterMapping : servletMappings) {
- result.addAll(getServletMappingDisplay(filterMapping));
- }
- }
- return result;
- }
-
-
- private List<ServletMappingUIWrapper> getServletMappingDisplay(ServletMapping element) {
- List<ServletMappingUIWrapper> result = new ArrayList<ServletMappingUIWrapper>();
- String value = null;
- if (element.getUrlPatterns().size() > 0){
- for (UrlPatternType pattern : element.getUrlPatterns()) {
- value = pattern.getValue();
- result.add(new ServletMappingUIWrapper(value + " -> " + element.getServletName())); //$NON-NLS-1$
- }
-
- }
- return result;
- }
-
- public class ServletMappingUIWrapper{
- private String value;
-
- public String getValue() {
- return value;
- }
-
- public ServletMappingUIWrapper(String value) {
- super();
- this.value = value;
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupWelcomePagesItemProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupWelcomePagesItemProvider.java
deleted file mode 100644
index da8bfac..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupWelcomePagesItemProvider.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.javaee.web.WelcomeFileList;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Welcome pages group in Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupWelcomePagesItemProvider extends AbstractWebGroupProvider{
-
- private static Image WELCOME_PAGES;
-
- private static Image WELCOME_PAGE;
-
- public GroupWelcomePagesItemProvider(WebApp webApp) {
- super(webApp);
- text = Messages.WELCOME_PAGES_ITEM_PROVIDER;
- }
-
- @Override
- public List getChildren() {
-// if (children != null){
-// return children;
-// }
- children.clear();
- if (javaee != null){
- List welcomeFileLists = ((WebApp) javaee).getWelcomeFileLists();
- if (welcomeFileLists.size()>0){
- children = new ArrayList();
- for (Object object : welcomeFileLists) {
- List welcomeFiles = ((WelcomeFileList)object).getWelcomeFiles();
- for (Object object2 : welcomeFiles) {
- if(object2 != null && !"".equals( ((String)object2).trim())){ //$NON-NLS-1$
- children.add(new WebArtifactNode((WebApp)javaee, (String) object2, getWelcomePageImage()));
- }
- }
- }
- return children;
- }
- return null;
- }
- return null;
- }
-
- @Override
- public Image getImage() {
- return getWelcomePagesImage();
- }
-
- @Override
- public boolean hasChildren() {
- List children2 = getChildren();
- return children2 != null && !children2.isEmpty();
- }
-
- public static Image getWelcomePagesImage() {
- if (WELCOME_PAGES == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.GROUP_WELCOME_PAGES);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- WELCOME_PAGES = imageDescriptor.createImage();
- }
- return WELCOME_PAGES;
- }
-
- public static Image getWelcomePageImage() {
- if (WELCOME_PAGE == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.GROUP_WELCOME_PAGE);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- WELCOME_PAGE = imageDescriptor.createImage();
- }
- return WELCOME_PAGE;
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java
deleted file mode 100644
index 72af775..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008, 2010 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-
-/**
- * Content and Label Provider helper class for WebApp element.
- *
- * @author Dimitar Giormov
- * @author Kaloyan Raev
- */
-public class WebAppProvider extends AbstractWebGroupProvider implements IAdaptable {
-
- private static final String PROJECT_RELATIVE_PATH = "WEB-INF/web.xml"; //$NON-NLS-1$
-
- private GroupErrorPagesItemProvider errors;
- private GroupServletItemProvider servlets;
- private GroupFiltersItemProvider filters;
- private GroupListenerItemProvider listeners;
- private GroupServletMappingItemProvider servletMapping;
- private GroupFilterMappingItemProvider filterMapping;
- private GroupReferenceItemProvider references;
- private GroupWelcomePagesItemProvider welcome;
- private GroupContextParamsItemProvider contextParams;
-
- private List<Object> children = new ArrayList<Object>();
-
- private String text;
-
- private Image web25Image;
- private Image web30Image;
-
- private IProject prjct = null;
- private IFile ddFile = null;
-
- public WebAppProvider(WebApp webApp, IProject project) {
- super(webApp);
- text = NLS.bind(Messages.DEPLOYMENT_DESCRIPTOR, project.getName());
- contextParams = new GroupContextParamsItemProvider(webApp);
- errors = new GroupErrorPagesItemProvider(webApp);
- servlets = new GroupServletItemProvider(webApp);
- servletMapping = new GroupServletMappingItemProvider(webApp);
- filters = new GroupFiltersItemProvider(webApp);
- filterMapping = new GroupFilterMappingItemProvider(webApp);
- listeners = new GroupListenerItemProvider(webApp);
- references = new GroupReferenceItemProvider(webApp);
- welcome = new GroupWelcomePagesItemProvider(webApp);
- children.add(contextParams);
- children.add(errors);
- children.add(servlets);
- children.add(filters);
- children.add(listeners);
- children.add(servletMapping);
- children.add(filterMapping);
- children.add(references);
- children.add(welcome);
- prjct = project;
- }
-
- @Override
- public List getChildren(){
- return children;
- }
-
- @Override
- public String getText(){
- return text;
- }
-
- @Override
- public Image getImage() {
- String version = ((WebApp) javaee).getVersion().getLiteral();
- if (J2EEVersionConstants.VERSION_2_5_TEXT.equals(version)) {
- return getWeb25Image();
- } else if (J2EEVersionConstants.VERSION_3_0_TEXT.equals(version)) {
- return getWeb30Image();
- }
- return getWeb25Image();
- }
-
- public IProject getProject(){
- return prjct;
- }
-
- public IFile getDDFile() {
- if (ddFile != null){
- return ddFile;
- }
-
- IVirtualFolder virtualFolder = ComponentCore.createComponent(getProject()).getRootFolder();
- return virtualFolder.getFile(PROJECT_RELATIVE_PATH).getUnderlyingFile();
- }
-
- @Override
- public void reinit(JavaEEObject modelObject) {
- super.reinit(modelObject);
- for (Object child : children) {
- ((AbstractGroupProvider)child).reinit(modelObject);
- }
- }
-
- public Object getAdapter(Class adapter) {
- if (IProject.class == adapter){
- return getProject();
- }
- return null;
- }
-
- private Image getWeb25Image() {
- if (web25Image == null) {
- web25Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.IMG_WEBEEMODEL).createImage();
- }
- return web25Image;
- }
-
- private Image getWeb30Image() {
- if (web30Image == null) {
- web30Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.IMG_WEBEE6MODEL).createImage();
- }
- return web30Image;
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebArtifactNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebArtifactNode.java
deleted file mode 100644
index c95c779..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebArtifactNode.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.swt.graphics.Image;
-
-/**
- *
- * Wrapper node for representing string values of the model in Deployment descriptor tree.
- * (e.g. Welcome Files)
- *
- * @author Dimitar Giormov
- *
- */
-public class WebArtifactNode implements JavaEEObject{
-
- private Image image;
- private String text;
- private JavaEEObject javaee;
-
- public WebArtifactNode(JavaEEObject javaee, String text, Image image) {
- super();
- this.javaee = javaee;
- this.text = text;
- this.image = image;
- }
-
-
- public Image getImage() {
- return image;
- }
-
- public String getText() {
- return text;
- }
-
- public JavaEEObject getJavaEEObject() {
- return javaee;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPlugin.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPlugin.java
deleted file mode 100644
index 91d30e2..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPlugin.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.ui.plugin;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class JEEUIPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.jee.ui"; //$NON-NLS-1$
-
- // The shared instance
- private static JEEUIPlugin plugin;
-
- /**
- * The constructor
- */
- public JEEUIPlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static JEEUIPlugin getDefault() {
- return plugin;
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- public ImageDescriptor getImageDescriptor(String key) {
- ImageDescriptor imageDescriptor = null;
- URL gifImageURL = getImageURL(key);
- if (gifImageURL != null)
- imageDescriptor = ImageDescriptor.createFromURL(gifImageURL);
- return imageDescriptor;
- }
-
- /**
- * @param key
- * @return
- */
- private URL getImageURL(String key) {
- return J2EEPlugin.getImageURL(key, getBundle());
- }
-
- /**
- *
- * Record a message against this plugin's log.
- *
- * @param severity
- * @param aCode
- * @param aMessage
- * @param exception
- */
- public static void log(int severity, int aCode, String aMessage,
- Throwable exception) {
- log(createStatus(severity, aCode, aMessage, exception));
- }
-
- /**
- * Create a status associated with this plugin.
- *
- * @param severity
- * @param aCode
- * @param aMessage
- * @param exception
- * @return A status configured with this plugin's id and the given parameters.
- */
- public static IStatus createStatus(int severity, int aCode,
- String aMessage, Throwable exception) {
- return new Status(severity, PLUGIN_ID, aCode,
- aMessage != null ? aMessage : "No message.", exception); //$NON-NLS-1$
- }
-
- /**
- *
- * Record a status against this plugin's log.
- *
- * @param aStatus
- */
- public static void log(IStatus aStatus) {
- getDefault().getLog().log(aStatus);
- }
-
- public static void logError(String message, Exception e) {
- log(IStatus.ERROR, IStatus.ERROR,message,e);
- }
-
- public static IStatus createStatus(int severity, String message, Throwable exception) {
- return new Status(severity, PLUGIN_ID, message, exception);
- }
-
- public static IStatus createStatus(int severity, String message) {
- return createStatus(severity, message, null);
- }
-
- public static void logError(Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception));
- }
-
- public static void logError(CoreException exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
- }
-
- public Image getImage(String key){
- return getImageDescriptor(key).createImage();
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPluginIcons.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPluginIcons.java
deleted file mode 100644
index 40cbac1..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPluginIcons.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008, 2010 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.plugin;
-
-public class JEEUIPluginIcons {
-
- public static String IMG_EJBEEMODEL = "30_ejbjar_obj"; //$NON-NLS-1$
- public static String IMG_EJBEE6MODEL = "31_ejbjar_obj"; //$NON-NLS-1$
- public static String IMG_WEBEEMODEL = "webapp_25"; //$NON-NLS-1$
- public static String IMG_WEBEE6MODEL = "webapp_30"; //$NON-NLS-1$
- public static String IMG_CONNECTOR = "connection"; //$NON-NLS-1$
- public static String IMG_CONFIG_PROP = "config_prop_obj"; //$NON-NLS-1$
- public static String IMG_LICENSE = "license_obj"; //$NON-NLS-1$
- public static String IMG_RESOURCE_ADAPTER = "resource_adapter_obj"; //$NON-NLS-1$
-
- public static String SERVLET_MAPPING = "webuiIcons/servlet_mapping"; //$NON-NLS-1$
- public static String FILTER_MAPPING = "webuiIcons/filter"; //$NON-NLS-1$
- public static String GROUP_FILTER_MAPPING = "webuiIcons/filter_mapping"; //$NON-NLS-1$
- public static String GROUP_LISTENER = "webuiIcons/listener"; //$NON-NLS-1$
- public static String GROUP_SERVLET = "webuiIcons/servlet"; //$NON-NLS-1$
- public static String GROUP_ERROR_PAGE = "webuiIcons/error_page"; //$NON-NLS-1$
- public static String GROUP_CONTEXT_PARAM = "webuiIcons/initializ_parameter_context"; //$NON-NLS-1$
- public static String GROUP_WELCOME_PAGES = "webuiIcons/welcome_list"; //$NON-NLS-1$
- public static String GROUP_WELCOME_PAGE = "webuiIcons/welcome_file"; //$NON-NLS-1$
- public static String RESOURCE_REFERENCE_OBJ = "resourceRef_obj"; //$NON-NLS-1$
-
- public static String BUSSINESS_LOCAL = "ovr/business_local_ovr"; //$NON-NLS-1$
- public static String BUSSINESS_REMOTE = "ovr/business_remote_ovr"; //$NON-NLS-1$
- public static String REMOTE = "ovr/remote_ovr"; //$NON-NLS-1$
- public static String REMOTE_HOME = "ovr/home_ovr"; //$NON-NLS-1$
- public static String LOCAL = "ovr/local_ovr"; //$NON-NLS-1$
- public static String LOCAL_HOME = "ovr/local_home_ovr"; //$NON-NLS-1$
- public static String EAR_IMAGE = "ear_50"; //$NON-NLS-1$
- public static String EAR6_IMAGE = "ear_60"; //$NON-NLS-1$
- public static String APP_CLIENT50 = "appclient_50"; //$NON-NLS-1$
- public static String APP_CLIENT60 = "appclient_60"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/EarJavaEEFacetInstallPage.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/EarJavaEEFacetInstallPage.java
deleted file mode 100644
index a5249bb..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/EarJavaEEFacetInstallPage.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.jst.jee.ui.project.facet;
-
-/***************************************************************************************************
- /***************************************************************************************************
- * Copyright (c) 2007 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-/**
- * @deprecated - For consistency with other FacetInstallPage classes this class should be removed. Please use {@link org.eclipse.jst.j2ee.ui.project.facet.EarFacetInstallPage}
- */
-public class EarJavaEEFacetInstallPage extends
- org.eclipse.jst.j2ee.ui.project.facet.EarFacetInstallPage {
-
- public EarJavaEEFacetInstallPage() {
- super();
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/Messages.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/Messages.java
deleted file mode 100644
index 61ee08d..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/Messages.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.ui.project.facet;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jst.jee.ui.project.facet.messages"; //$NON-NLS-1$
- public static String EarJavaEEFacetInstallPage_0;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/messages.properties b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/messages.properties
deleted file mode 100644
index 2383078..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/messages.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-EarJavaEEFacetInstallPage_0=Generate Deployment Descriptor
diff --git a/plugins/org.eclipse.jst.servlet.ui/.project b/plugins/org.eclipse.jst.servlet.ui/.project
deleted file mode 100644
index c209be8..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.servlet.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.ibm.etools.ctc.javaprojectnature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.servlet.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.servlet.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 037a4e5..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Mon Jun 08 15:35:45 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=error
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index aeb96ee..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,48 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.servlet.ui; singleton:=true
-Bundle-Version: 1.1.403.qualifier
-Bundle-Activator: org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin
-Bundle-Vendor: %pluginVendor
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.servlet.ui,
- org.eclipse.jst.servlet.ui.internal.actions;x-internal:=true,
- org.eclipse.jst.servlet.ui.internal.deployables;x-internal:=true,
- org.eclipse.jst.servlet.ui.internal.plugin;x-internal:=true,
- org.eclipse.jst.servlet.ui.internal.wizard;x-internal:=true,
- org.eclipse.jst.servlet.ui.project.facet
-Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.workbench;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.wst.web.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jst.jee.ui;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.common.modulecore.ui;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.jst.common.ui;bundle-version="[1.0.0,1.1.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.servlet.ui/build.properties b/plugins/org.eclipse.jst.servlet.ui/build.properties
deleted file mode 100644
index 0d63d85..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = servlet_ui/,\
- property_files/
-output.. = bin/
-bin.includes = plugin.xml,\
- .,\
- plugin.properties,\
- icons/,\
- META-INF/,\
- about.html
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/folder.gif b/plugins/org.eclipse.jst.servlet.ui/icons/folder.gif
deleted file mode 100644
index c91b267..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/folder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/exportwar_wiz.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/exportwar_wiz.gif
deleted file mode 100644
index ced859d..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/exportwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/importwar_wiz.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/importwar_wiz.gif
deleted file mode 100644
index 432c066..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/importwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newWebFragmentProject.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newWebFragmentProject.gif
deleted file mode 100644
index 9bebd32..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newWebFragmentProject.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newfilter_wiz.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newfilter_wiz.gif
deleted file mode 100644
index 06cafc3..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newfilter_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newlistener_wiz.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newlistener_wiz.gif
deleted file mode 100644
index 09f2a89..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newlistener_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newservlet_wiz.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newservlet_wiz.gif
deleted file mode 100644
index f45eadc..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newservlet_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newwar_wiz.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newwar_wiz.gif
deleted file mode 100644
index b9ac6be..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-banner.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-banner.gif
deleted file mode 100644
index 72944e9..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-banner.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-icon.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-icon.gif
deleted file mode 100644
index b9ac6be..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-icon.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/webfragment_wizban.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/webfragment_wizban.gif
deleted file mode 100644
index 27f1d1f..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/webfragment_wizban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/webjava-icon.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/webjava-icon.gif
deleted file mode 100644
index 37cb4e7..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/webjava-icon.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/prj_obj.gif b/plugins/org.eclipse.jst.servlet.ui/icons/prj_obj.gif
deleted file mode 100644
index a4ea580..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/prj_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/war.gif b/plugins/org.eclipse.jst.servlet.ui/icons/war.gif
deleted file mode 100644
index 31ecb7a..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/war.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/plugin.properties b/plugins/org.eclipse.jst.servlet.ui/plugin.properties
deleted file mode 100644
index dfc2d82..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/plugin.properties
+++ /dev/null
@@ -1,54 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName=WTP Servlet UI Plug-in
-pluginVendor=Eclipse Web Tools Platform
-create.web.module_ui_=Create a J2EE Web Module
-create.web.project_ui_=Create a J2EE Web module
-web.actions.description_ui_=Actions for J2EE Web Development
-create_servlet_ui_=Create Java Servlet file
-war.import.description_ui_=Import an external WAR file into an Web project
-war.import.action.description_ui_=Import WAR File...
-war.export.description_ui_=Export a Web project into a WAR file
-war.export.action.description_ui_=Export WAR File...
-WarexportWizard.name=WAR file
-WarexportWizard.description=Export a Web Module into an external WAR file
-WarImportWizard.name=WAR file
-WarImportWizard.description=Import an external WAR file into a Web Project
-web.category_ui_=Web
-web.project_ui_=Dynamic Web Project
-static.web.project_ui_=Static Web Project
-new.web.project.description_ui_=Create a Dynamic Web project
-ConvertWebProjectType=Convert Web Project
-convertWebProjectTypeAction.label=Convert to a Dynamic Web project...
-ConvertWebProjectTypeAction.tooltip=Web Module Conversion Wizard
-convertToDynamic=Convert to Web Module...
-ServletWebRegionWizard.name=Servlet
-ServletWebRegionWizard.description=Create a new Servlet
-ServletWebRegionWizard.title=New Servlet
-Servlet_UI_=Servlet...
-FilterWebRegionWizard.name=Filter
-FilterWebRegionWizard.description=Create a new Filter
-servletAnnotationDecorator=Servlet Annotation Decorator
-servletAnnotationDecorator.description=Adds a decorator to an annotated servlet.
-web-project-wizard-name = Web Project
-web-project-wizard-description = Create a Web project
-webAppLibrariesContainerName = Web App Libraries
-
-ListenerWebRegionWizard.name=Listener
-ListenerWebRegionWizard.description=Create a new Application Lifecycle Listener
-
-enhanced.java.for.web.name=Enhanced Java Rendering for Web
-j2ee=Java EE
-j2ee.actions.description_ui_=Actions for J2EE Development
-webFragmentProjectUI=Web Fragment Project
-webFragmentProjectUI_desc=Create a new Web Fragment Project
-Project=Project
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/plugin.xml b/plugins/org.eclipse.jst.servlet.ui/plugin.xml
deleted file mode 100644
index cd8ef39..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/plugin.xml
+++ /dev/null
@@ -1,494 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <!-- Create Java EE Projects drop down toolbar button -->
- <extension
- point="org.eclipse.ui.actionSets">
- <actionSet
- label="%j2ee"
- description="%j2ee.actions.description_ui_"
- visible="false"
- id="org.eclipse.jst.j2ee.J2eeMainActionSet">
- <action
- id="org.eclipse.jst.j2ee.internal.actions.NewJavaEEArtifact"
- toolbarPath="J2EEMain"
- class="org.eclipse.jst.j2ee.internal.actions.NewJavaEEArtifactDropDownAction"
- icon="icons/full/ctool16/newservlet_wiz.gif"
- label="%ServletWebRegionWizard.name"
- style="pulldown"
- tooltip="%ServletWebRegionWizard.description" />
- <action
- id="org.eclipse.jst.j2ee.internal.actions.NewJavaEEProject"
- toolbarPath="J2EEMain"
- class="org.eclipse.jst.j2ee.internal.actions.NewJavaEEProjectDropDownAction"
- icon="icons/full/ctool16/newwar_wiz.gif"
- label="%web.project_ui_"
- style="pulldown"
- tooltip="%new.web.project.description_ui_" />
- </actionSet>
- </extension>
-
- <extension
- id="J2EEUIProjectWizards"
- point="org.eclipse.ui.newWizards">
- <category
- name="%web.category_ui_"
- id="org.eclipse.wst.web.ui">
- </category>
- <wizard
- name="%webFragmentProjectUI"
- icon="icons/full/ctool16/newWebFragmentProject.gif"
- category="org.eclipse.wst.web.ui"
- project="true"
- finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
- id="org.eclipse.jst.servlet.ui.project.facet.WebFragmentProjectWizard">
- <class class="org.eclipse.jst.servlet.ui.project.facet.WebFragmentProjectWizard">
- <parameter name="javaeeproject" value="true"/>
- <parameter name="menuIndex" value="15" />
- </class>
- <description>
- %webFragmentProjectUI_desc
- </description>
- <selection
- class="org.eclipse.core.resources.IResource" />
- </wizard>
- </extension>
-
- <!-- Web Module Wizard -->
- <extension
- id="J2EEUIProjectWizards"
- point="org.eclipse.ui.newWizards">
- <category
- name="%web.category_ui_"
- id="org.eclipse.wst.web.ui">
- </category>
- <wizard
- name="%web.project_ui_"
- icon="icons/full/ctool16/newwar_wiz.gif"
- category="org.eclipse.wst.web.ui"
- project="true"
- finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
- id="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard">
- <class class="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard">
- <parameter name="javaeeproject" value="true"/>
- <parameter name="menuIndex" value="10" />
- </class>
- <description>
- %new.web.project.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource" />
- </wizard>
-
- <!--new servlet contribution-->
- <wizard
- name="%ServletWebRegionWizard.name"
- icon="icons/full/ctool16/newservlet_wiz.gif"
- category="org.eclipse.wst.web.ui"
- id="org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard">
- <class class="org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard">
- <parameter name="javaeeartifact" value="true"/>
- <parameter name="menuIndex" value="10" />
- </class>
- <description>
- %ServletWebRegionWizard.description
- </description>
- </wizard>
-
- <!--new filter contribution-->
- <wizard
- category="org.eclipse.wst.web.ui"
- icon="icons/full/ctool16/newfilter_wiz.gif"
- id="org.eclipse.jst.servlet.ui.internal.wizard.AddFilterWizard"
- name="%FilterWebRegionWizard.name">
- <class class="org.eclipse.jst.servlet.ui.internal.wizard.AddFilterWizard">
- <parameter name="javaeeartifact" value="true"/>
- <parameter name="menuIndex" value="20" />
- </class>
- <description>
- %FilterWebRegionWizard.description
- </description>
- </wizard>
-
- <!--new listener contribution-->
- <wizard
- name="%ListenerWebRegionWizard.name"
- icon="icons/full/ctool16/newlistener_wiz.gif"
- category="org.eclipse.wst.web.ui"
- id="org.eclipse.jst.servlet.ui.internal.wizard.AddListenerWizard">
- <class class="org.eclipse.jst.servlet.ui.internal.wizard.AddListenerWizard">
- <parameter name="javaeeartifact" value="true"/>
- <parameter name="menuIndex" value="30" />
- </class>
- <description>
- %ListenerWebRegionWizard.description
- </description>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.ui.importWizards">
- <category
- name="%web.category_ui_"
- id="org.eclipse.wst.web.ui">
- </category>
- <wizard
- name="%WarImportWizard.name"
- icon="icons/full/ctool16/importwar_wiz.gif"
- class="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentImportWizard"
- category="org.eclipse.wst.web.ui"
- id="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentImportWizard">
- <description>
- %WarImportWizard.description
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
-
- </extension>
-
- <extension
- point="org.eclipse.ui.exportWizards">
- <category
- name="%web.category_ui_"
- id="org.eclipse.wst.web.ui">
- </category>
- <wizard
- name="%WarexportWizard.name"
- icon="icons/full/ctool16/exportwar_wiz.gif"
- class="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentExportWizard"
- category="org.eclipse.wst.web.ui"
- id="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentExportWizard">
- <description>
- %WarexportWizard.description
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.frameworks.ui.extendableWizard">
- <extendableWizard
- id="org.eclipse.jst.servlet.ui.WebModuleCreationWizard">
- </extendableWizard>
- </extension>
-
-
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.core.resources.IProject"
- adaptable="true"
- id = "convertToWebModuleTypeAction">
- <menu
- label="%static.web.project_ui_"
- path="additions"
- id="ConvertWebProjectType">
- <separator
- name="ConvertWebProjectType">
- </separator>
- </menu>
- <action
- label="%convertWebProjectTypeAction.label"
- tooltip="%ConvertWebProjectTypeAction.tooltip"
- menubarPath="org.eclipse.ui.projectConfigure/additions"
- class="org.eclipse.jst.servlet.ui.internal.actions.ConvertToWebModuleTypeAction"
- enablesFor="1"
- id="convertToWebModuleTypeAction">
- </action>
- <enablement>
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="wst.web" />
- </adapt>
- </enablement>
- </objectContribution>
- </extension>
-
- <!-- ==================================================================== -->
-<!-- Extension point: org.eclipse.etools.server.core.moduleObjectAdapters -->
-<!-- Purpose: Define adapters for Web resources -->
-<!-- ==================================================================== -->
- <extension point="org.eclipse.wst.server.core.moduleArtifactAdapters">
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.web.server.webresource"
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.j2ee.webapplication.WebApp"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.web.server.webresource2"
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.server.core.Servlet"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.web.server.webresource3"
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web:2.4]" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.web.server.webresource4"
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IFile">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web:2.4]" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.web.server.webresource5"
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
-
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jdt.core.ICompilationUnit">
- <test forcePluginActivation="true"
- property="org.eclipse.jst.j2ee.common.projectFacet"
- value="jst.web:2.4]" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- </extension>
-
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IProject">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jdt.core.ICompilationUnit">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IFile">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.j2ee.webapplication.Servlet">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.j2ee.webapplication.WebApp">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.server.core.Servlet">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
-
- </extension>
-
-<!-- ====================================================== -->
-<!-- Label Decorators -->
-<!-- ====================================================== -->
-
- <extension
- point="org.eclipse.ui.decorators">
- <decorator
- lightweight="true"
- adaptable="true"
- label="%servletAnnotationDecorator"
- class="org.eclipse.jst.j2ee.internal.ui.util.AnnotationIconDecorator"
- state="true"
- location="TOP_LEFT"
- id="org.eclipse.jst.j2ee.internal.ui.util.AnnotationIconDecorator_servlet">
- <description>
- %servletAnnotationDecorator.description
- </description>
- <enablement>
- <objectClass
- name="org.eclipse.jst.j2ee.webapplication.Servlet">
- </objectClass>
- </enablement>
- </decorator>
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages">
- <wizard-pages action="jst.web.install">
- <page class="org.eclipse.jst.servlet.ui.project.facet.WebFacetInstallPage"/>
- </wizard-pages>
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.ui.images">
- <image facet="jst.web" path="icons/war.gif"/>
- </extension>
-
- <extension
- point="org.eclipse.jdt.ui.classpathContainerPage">
- <classpathContainerPage
- name="%webAppLibrariesContainerName"
- class="org.eclipse.jst.servlet.ui.internal.wizard.WebAppLibrariesContainerPage"
- id="org.eclipse.jst.j2ee.internal.web.container">
- </classpathContainerPage>
- </extension>
- <extension
- point="org.eclipse.ui.navigator.navigatorContent">
- <navigatorContent
- activeByDefault="true"
- contentProvider="org.eclipse.jst.servlet.ui.internal.navigator.WebJavaContentProvider"
- icon="icons/full/ctool16/webjava-icon.gif"
- id="org.eclipse.jst.servlet.ui.EnhancedJavaRendering"
- labelProvider="org.eclipse.jst.servlet.ui.internal.navigator.WebJavaLabelProvider"
- name="%enhanced.java.for.web.name"
- priority="higher">
- <override
- policy="InvokeOnlyIfSuppressedExtAlsoVisibleAndActive"
- suppressedExtensionId="org.eclipse.jdt.java.ui.javaContent"/>
- <triggerPoints>
- <or>
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web" />
- </or>
- </adapt>
- </and>
- <instanceof value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
- </or>
- </triggerPoints>
- <possibleChildren>
- <or>
- <instanceof value="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaProject"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
- <instanceof value="org.eclipse.core.resources.IFolder"/>
- <instanceof value="org.eclipse.jdt.internal.ui.packageview.ClassPathContainer"/>
- <instanceof value="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaLibraries"/>
- </or>
- </possibleChildren>
- <actionProvider
- class="org.eclipse.ui.internal.navigator.resources.actions.NewActionProvider"
- id="org.eclipse.jst.servlet.ui.EnhancedJavaRendering.actions.NewActionProvider">
- <enablement>
- <instanceof
- value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
- </enablement>
- </actionProvider>
- <commonSorter
- class="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaSorter"
- id="org.eclipse.jst.servlet.ui.EnhancedJavaRendering.sorter">
- <parentExpression>
- <instanceof value="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaProject"/>
- </parentExpression>
- </commonSorter>
-
- <commonWizard
- type="new"
- wizardId="org.eclipse.jdt.ui.wizards.NewPackageCreationWizard">
- <enablement>
- <instanceof
- value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
- </enablement>
- </commonWizard>
- <commonWizard
- type="new"
- wizardId="org.eclipse.jdt.ui.wizards.NewClassCreationWizard">
- <enablement>
- <instanceof
- value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
- </enablement>
- </commonWizard>
-
- <commonWizard
- type="new"
- wizardId="org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard">
- <enablement>
- <instanceof
- value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
- </enablement>
- </commonWizard>
- <commonWizard
- type="new"
- wizardId="org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard">
- <enablement>
- <instanceof
- value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
- </enablement>
- </commonWizard>
- </navigatorContent>
- </extension>
- <extension
- point="org.eclipse.ui.navigator.viewer">
- <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
- <includes>
- <contentExtension pattern="org.eclipse.jst.servlet.ui.EnhancedJavaRendering"/>
- </includes>
- </viewerContentBinding>
- </extension>
- <extension
- point="org.eclipse.core.runtime.adapters">
- <factory
- adaptableType="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaProject"
- class="org.eclipse.jst.servlet.ui.internal.navigator.CompressedNodeAdapterFactory">
- <adapter type="org.eclipse.jdt.core.IJavaProject"/>
- <adapter type="org.eclipse.jdt.core.IJavaElement"/>
- </factory>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.modulecore.ui.moduleDependencyPropertyPage">
- <dependencyPage
- class="org.eclipse.jst.servlet.ui.internal.WebModuleDependencyPageProvider"
- id="org.eclipse.jst.servlet.ui.internal.WebModuleDependencyPageProvider">
- </dependencyPage>
- </extension>
- <extension
- point="org.eclipse.wst.common.modulecore.ui.referenceWizardFragment">
- <referenceFragment
- class="org.eclipse.jst.servlet.ui.internal.CustomWebProjectReferenceWizardFragment"
- hidden="true"
- icon="icons/prj_obj.gif"
- id="org.eclipse.jst.servlet.ui.internal.CustomWebProjectReferenceWizardFragment"
- name="%Project">
- </referenceFragment>
- </extension>
-
- <extension point="org.eclipse.core.expressions.propertyTesters">
- <propertyTester
- id="org.eclipse.jst.servlet.ui.internal.navigator.FacetedProjectPropertyTester"
- type="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode"
- namespace="org.eclipse.jst.servlet.ui.navigator"
- properties="projectFacet"
- class="org.eclipse.jst.servlet.ui.internal.navigator.FacetedProjectPropertyTester">
- </propertyTester>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.servlet.ui/property_files/web_ui.properties b/plugins/org.eclipse.jst.servlet.ui/property_files/web_ui.properties
deleted file mode 100644
index 9939c53..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/property_files/web_ui.properties
+++ /dev/null
@@ -1,159 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-_0=Failed to find the image "{0}".
-_1=New Dynamic Web Project
-_2=Servlet version:
-_3=Dynamic Web Project
-_4=Create a standalone Dynamic Web project or add it to a new or existing Enterprise Application.
-_5=Web &project:
-_6=WAR file:
-_7=Import a WAR file from the file system
-_8=WAR Import
-_9=WAR Export
-_10=Export Web project to the local file system.
-_11=Context root:
-_12=Convert Simple Web to Web Module
-_13=Convert Simple Web to Web Module.
-_14=WAR Import: Web libraries
-_15=Select the web library jars from the list below to be imported as web library projects. Unselected web libraries will be imported as jars in the WEB-INF/lib directory.
-_16=Select All
-_17=Deselect All
-_18=New Web Fragment Project
-ADD_SERVLET_WIZARD_WINDOW_TITLE=Create Servlet
-ADD_SERVLET_WIZARD_PAGE_TITLE=Create Servlet
-ADD_SERVLET_WIZARD_PAGE_DESC=Enter servlet deployment descriptor specific information.
-
-ADD_FILTER_WIZARD_WINDOW_TITLE=Create Filter
-ADD_FILTER_WIZARD_PAGE_TITLE=Create Filter
-ADD_FILTER_WIZARD_PAGE_DESC=Enter servlet filter deployment descriptor specific information.
-
-ADD_LISTENER_WIZARD_WINDOW_TITLE=Create Listener
-ADD_LISTENER_WIZARD_PAGE_TITLE=Create Listener
-ADD_LISTENER_WIZARD_PAGE_DESC=Select the application lifecycle events to listen to.
-
-DISPATCHER_REQUEST=&REQUEST
-DISPATCHER_FORWARD=&FORWARD
-DISPATCHER_INCLUDE=&INCLUDE
-DISPATCHER_ERROR=&ERROR
-
-DEFAULT_PACKAGE=(default package)
-SELECT_CLASS_TITLE=Select Class
-MAP_CLASS_NAME_TO_CLASS_ERROR_MSG=IWAE0060E Could not uniquely map the class name to a class.
-EMPTY_LIST_MSG=Empty List
-ADD_LABEL=Add
-USE_EXISTING_SERVLET_CLASS=&Use an existing Servlet class or JSP
-USE_EXISTING_FILTER_CLASS=&Use existing Filter class
-USE_EXISTING_LISTENER_CLASS=&Use existing Listener class
-INIT_PARAM_TITLE=Initialization Parameters
-INIT_PARAM_LABEL=Initialization ¶meters:
-URL_MAPPINGS_TITLE=URL Mappings
-URL_MAPPINGS_LABEL=&URL mappings:
-CHOOSE_SERVLET_CLASS=&Choose a JSP file:
-
-NEW_SERVLET_WIZARD_WINDOW_TITLE=New Servlet
-NEW_SERVLET_WIZARD_PAGE_TITLE=Servlet
-NEW_SERVLET_WIZARD_PAGE_DESC=Create a new servlet.
-SERVLET_PACKAGE_LABEL=Java package:
-SERVLET_NAME_LABEL=Servlet name:
-
-NEW_FILTER_WIZARD_WINDOW_TITLE=New Filter
-CHOOSE_FILTER_CLASS=Choose a filter class
-SERVLET_MAPPINGS_LABEL=Servlet mappings:
-FILTER_MAPPINGS_LABEL=Fi<er mappings:
-
-ADD_LISTENER_WIZARD_SERVLET_CONTEXT_EVENTS=Servlet context events
-ADD_LISTENER_WIZARD_HTTP_SESSION_EVENTS=HTTP session events
-ADD_LISTENER_WIZARD_SERVLET_REQUEST_EVENTS=Servlet request events
-ADD_LISTENER_WIZARD_LIFECYCLE=Lifecycle
-ADD_LISTENER_WIZARD_LIFECYCLE_L=&Lifecycle
-ADD_LISTENER_WIZARD_LIFECYCLE_I=L&ifecycle
-ADD_LISTENER_WIZARD_LIFECYCLE_Y=Lifec&ycle
-ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES=Changes to attributes
-ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_C=&Changes to attributes
-ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_H=C&hanges to attributes
-ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_G=Chan&ges to attributes
-ADD_LISTENER_WIZARD_SESSION_MIGRATION=Session &migration
-ADD_LISTENER_WIZARD_OBJECT_BINDING=&Object binding
-
-ADD_BUTTON_LABEL=Add...
-ADD_BUTTON_LABEL_A=&Add...
-ADD_BUTTON_LABEL_D=A&dd...
-EDIT_BUTTON_LABEL=Edit...
-EDIT_BUTTON_LABEL_E=&Edit...
-EDIT_BUTTON_LABEL_T=Edi&t...
-REMOVE_BUTTON_LABEL=Remove
-REMOVE_BUTTON_LABEL_R=&Remove
-REMOVE_BUTTON_LABEL_V=Remo&ve
-URL_PATTERN_TITLE=URL Patterns
-URL_PATTERN_LABEL=&Pattern:
-FOLDER_LABEL=Folder:
-JAVA_PACKAGE_LABEL=Java package:
-CLASS_NAME_LABEL=Class na&me:
-SUPERCLASS_LABEL=&Superclass:
-CONTAINER_SELECTION_DIALOG_TITLE=Container Selection
-CONTAINER_SELECTION_DIALOG_DESC=Choose a Container:
-CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG=Choose the Web Content Folder or its subfolder
-PACKAGE_SELECTION_DIALOG_TITLE=Package Selection
-PACKAGE_SELECTION_DIALOG_DESC=Choose a package:
-PACKAGE_SELECTION_DIALOG_MSG_NONE=No packages to choose from
-SUPERCLASS_SELECTION_DIALOG_TITLE=Superclass Selection
-SUPERCLASS_SELECTION_DIALOG_DESC=Choose a superclass:
-INTERFACE_SELECTION_DIALOG_TITLE=Interface Selection
-INTERFACE_SELECTION_DIALOG_DESC=Choose interfaces:
-INTERFACE_SELECTION_DIALOG_MSG_NONE=''{0}'' added.
-JAVA_CLASS_MODIFIERS_LABEL=Modifiers:
-JAVA_CLASS_PUBLIC_CHECKBOX_LABEL=&Public
-JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL=Abs&tract
-JAVA_CLASS_FINAL_CHECKBOX_LABEL=fina&l
-JAVA_CLASS_INTERFACES_LABEL=&Interfaces:
-JAVA_CLASS_METHOD_STUBS_LABEL=Which method stubs would you like to create?
-JAVA_CLASS_MAIN_CHECKBOX_LABEL=public static void main(String[] args)
-JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL=&Constructors from superclass
-JAVA_CLASS_INHERIT_CHECKBOX_LABEL=In&herited abstract methods
-JAVA_CLASS_BROWER_DIALOG_TITLE=Java Class Browser
-JAVA_CLASS_BROWER_DIALOG_MESSAGE=Browse for a Java class
-
-NAME_TITLE=Name
-NAME_LABEL=Na&me:
-DESCRIPTION_TITLE=Description
-DESCRIPTION_LABEL=De&scription:
-VALUE_TITLE=Value
-VALUE_LABEL=&Value:
-URL_SERVLET_LABEL=URL Pattern / Servlet Name
-DISPATCHERS_LABEL=Dispatchers
-
-BROWSE_BUTTON_LABEL=Bro&wse...
-REMOVE_BUTTON=Remove
-SELECT_ALL_BUTTON=&Select All
-CLEAR_BUTTON=&Deselect All
-
-NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC=Specify class file destination.
-NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC=Specify modifiers, interfaces to implement, and method stubs to generate.
-
-ImportWARAction_UI_=Import Web Module...
-ExportWARAction_UI_=Export WAR file...
-
-NO_WEB_PROJECTS=No Web Projects
-
-SERVLETS =Servlets
-
-WEB_CONT_NAME = WebAppContainerPage
-WEB_CONT_PAGE_TITLE = Web App Libraries Container
-WEB_CONT_PAGE_DESCRIPTION = This container dynamically populates classpath entries from the WEB-INF/lib and WEB-INF/classes directories of a web app.
-WEB_CONT_PAGE_COMP_LABEL = Component:
-WEBCONTENT=Web Content folder:
-
-
-Compressed_Libraries= Libraries
-Compressed_JavaResources= Java Resources{0}
-
-ConvertToWebTitle=Convert to Dynamic Web Project
-SelectWebVersion=Select a Dynamic Web module version:
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/IWebUIContextIds.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/IWebUIContextIds.java
deleted file mode 100644
index caba816..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/IWebUIContextIds.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui;
-
-public interface IWebUIContextIds {
-
-public static final String PLUGIN_SERVLET_UI = "org.eclipse.jst.servlet.ui."; //$NON-NLS-1$
-
- public static final String NEW_DYNAMIC_WEB_PROJECT_PAGE1 = PLUGIN_SERVLET_UI + "webw1000"; //$NON-NLS-1$
- public static final String NEW_DYNAMIC_WEB_PROJECT_PAGE2 = PLUGIN_SERVLET_UI + "webw1100"; //$NON-NLS-1$
- public static final String NEW_DYNAMIC_WEB_PROJECT_PAGE3 = PLUGIN_SERVLET_UI + "webw1200"; //$NON-NLS-1$
-
- public static final String WAR_IMPORT_PAGE1 = PLUGIN_SERVLET_UI + "webi1000"; //$NON-NLS-1$
- public static final String WAR_IMPORT_PAGE2 = PLUGIN_SERVLET_UI + "webi1100"; //$NON-NLS-1$
-
- public static final String WAR_EXPORT_PAGE1 = PLUGIN_SERVLET_UI + "webe1000"; //$NON-NLS-1$
-
- public static final String WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_1 = PLUGIN_SERVLET_UI + "srvw1050"; //$NON-NLS-1$
- public static final String WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_2 = PLUGIN_SERVLET_UI + "srvw1100"; //$NON-NLS-1$
- public static final String WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_3 = PLUGIN_SERVLET_UI + "srvw1200"; //$NON-NLS-1$
-
- public static final String WEBEDITOR_LISTENER_PAGE_ADD_LISTENER_WIZARD_1 = PLUGIN_SERVLET_UI + "lstw1050"; //$NON-NLS-1$
- public static final String WEBEDITOR_LISTENER_PAGE_ADD_LISTENER_WIZARD_2 = PLUGIN_SERVLET_UI + "lstw1100"; //$NON-NLS-1$
- public static final String WEBEDITOR_LISTENER_PAGE_ADD_LISTENER_WIZARD_3 = PLUGIN_SERVLET_UI + "lstw1200"; //$NON-NLS-1$
-
- public static final String WEBEDITOR_FILTER_PAGE_ADD_FILTER_WIZARD_1 = PLUGIN_SERVLET_UI + "fltw1050"; //$NON-NLS-1$
- public static final String WEBEDITOR_FILTER_PAGE_ADD_FILTER_WIZARD_2 = PLUGIN_SERVLET_UI + "fltw1100"; //$NON-NLS-1$
- public static final String WEBEDITOR_FILTER_PAGE_ADD_FILTER_WIZARD_3 = PLUGIN_SERVLET_UI + "fltw1200"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/CustomWebProjectReferenceWizardFragment.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/CustomWebProjectReferenceWizardFragment.java
deleted file mode 100644
index 347ec9b..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/CustomWebProjectReferenceWizardFragment.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 Red Hat and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- * Chuck Bridgham - Ongoing improvements
- * Konstantin Komissarchik - misc. UI cleanup
- ******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.ProjectReferenceWizardFragment;
-import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.IWizardHandle;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants;
-
-public class CustomWebProjectReferenceWizardFragment extends ProjectReferenceWizardFragment {
-
- public CustomWebProjectReferenceWizardFragment() {
- super();
- }
-
- private boolean isWebLib = true;
- private Button button;
-
- @Override
- public Composite createComposite(Composite parent, IWizardHandle handle) {
-
- Composite c = new Composite(parent, SWT.NONE);
-
- final GridLayout gl = new GridLayout();
- gl.marginWidth = 0;
- gl.marginHeight = 0;
-
- c.setLayout(gl);
-
- Composite tableComp = super.createComposite(c, handle);
- tableComp.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- // make button
- button = new Button(c, SWT.CHECK);
- button.setText(Messages.CustomWebProjectReferenceWizardFragment);
-
- final GridData gd = new GridData();
- gd.horizontalIndent = 5;
- button.setLayoutData(gd);
-
- button.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- public void widgetSelected(SelectionEvent e) {
- handleEdit();
- }
- });
- button.setSelection(true);
-
- return c;
- }
-
- public Composite createTableColumnComposite(Composite parent) {
- Composite aButtonColumn = new Composite(parent, SWT.NONE);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- aButtonColumn.setLayout(layout);
- GridData data = new GridData(GridData.FILL_BOTH);
- //data.minimumHeight = 500;
- //data.minimumWidth = 400;
- aButtonColumn.setLayoutData(data);
- return aButtonColumn;
- }
-
- protected void handleEdit() {
- isWebLib = button.getSelection();
- }
-
- @Override
- protected String getArchiveName(IProject proj, IVirtualComponent comp) {
- return super.getArchiveName(proj, comp);
- }
-
- @Override
- public void performFinish(IProgressMonitor monitor) throws CoreException {
- for (int i = 0; i < selected.length; i++) {
- IProject proj = selected[i];
- if(JavaEEProjectUtilities.getJ2EEProjectType(proj).equals("")) //$NON-NLS-1$
- J2EEProjectUtilities.createFlexJavaProjectForProjectOperation(proj).execute(monitor, null);
- }
- String location = "/"; //$NON-NLS-1$
- if(isWebLib) location += J2EEConstants.WEB_INF_LIB;
- getTaskModel().putObject(IReferenceWizardConstants.DEFAULT_LIBRARY_LOCATION, location);
- super.performFinish(monitor);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/Messages.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/Messages.java
deleted file mode 100644
index 4add98c..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/Messages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.jst.servlet.ui.internal;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jst.servlet.ui.internal.messages"; //$NON-NLS-1$
- public static String DeploymentAssembly;
- public static String WebDeploymentAssembly;
- public static String ManifestEntries;
- public static String CustomWebProjectReferenceWizardFragment;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
- private Messages() {
- }
-
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebDependencyPropertyPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebDependencyPropertyPage.java
deleted file mode 100644
index c53e02f..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebDependencyPropertyPage.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 Red Hat and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- * Konstantin Komissarchik - misc. UI cleanup
- ******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.ui.J2EEModuleDependenciesPropertyPage;
-import org.eclipse.jst.j2ee.internal.ui.preferences.Messages;
-import org.eclipse.wst.common.componentcore.internal.impl.TaskModel;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.DependencyPageExtensionManager;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.DependencyPageExtensionManager.ReferenceExtension;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants;
-import org.eclipse.wst.common.componentcore.ui.propertypage.ModuleAssemblyRootPage;
-
-public class WebDependencyPropertyPage extends J2EEModuleDependenciesPropertyPage {
-
- public WebDependencyPropertyPage(IProject project,
- ModuleAssemblyRootPage page) {
- super(project, page);
- }
-
-
- @Override
- protected void createPushButtons() {
- super.createPushButtons();
- }
-
- @Override
- protected void setCustomReferenceWizardProperties(TaskModel model) {
- model.putObject(IReferenceWizardConstants.DEFAULT_LIBRARY_LOCATION, J2EEConstants.WEB_INF_LIB);
- }
-
- @Override
- protected String getModuleAssemblyRootPageDescription() {
- return Messages.WebDependencyPropertyPage_1;
- }
-
- @Override
- protected void filterReferenceTypes( final List<ReferenceExtension> extensions )
- {
- // Replace the default one with our own custom one, in class CustomWebProjectReferenceWizardFragment
-
- for( int i = 0, n = extensions.size(); i < n; i++ )
- {
- final ReferenceExtension ext = extensions.get( i );
-
- if( ext.getId().equals( "org.eclipse.wst.common.componentcore.ui.newProjectReference" ) ) //$NON-NLS-1$
- {
- extensions.set( i, DependencyPageExtensionManager.getManager().findReferenceExtension( "org.eclipse.jst.servlet.ui.internal.CustomWebProjectReferenceWizardFragment" ) ); //$NON-NLS-1$
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebModuleDependencyPageProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebModuleDependencyPageProvider.java
deleted file mode 100644
index 05e08da..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebModuleDependencyPageProvider.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 Red Hat and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- * Chuck Bridgham - Additional support
- * Konstantin Komissarchik - misc. UI cleanup
- ******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.common.internal.modulecore.util.JavaModuleComponentUtility;
-import org.eclipse.jst.common.ui.internal.assembly.wizard.ManifestModuleDependencyControl;
-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.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IDependencyPageProvider;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IModuleDependenciesControl;
-import org.eclipse.wst.common.componentcore.ui.propertypage.ModuleAssemblyRootPage;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class WebModuleDependencyPageProvider implements IDependencyPageProvider {
-
- private IModuleDependenciesControl[] controls;
-
- public boolean canHandle(IFacetedProject project) {
- boolean isWeb = project.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_WEB_MODULE));
- return isWeb;
- }
-
- /*
- * This now allows extenders to say whether this project is standalone or not
- */
- protected boolean isStandalone(IProject project) {
- return JavaModuleComponentUtility.findParentProjects(project).length == 0;
- }
-
- public IModuleDependenciesControl[] createPages(IFacetedProject project,
- ModuleAssemblyRootPage parent) {
-
- if( isStandalone(project.getProject()))
- return new IModuleDependenciesControl[] {
- new WebDependencyPropertyPage(project.getProject(), parent)};
-
- return new IModuleDependenciesControl[] {
- new WebDependencyPropertyPage(project.getProject(), parent),
- new ManifestModuleDependencyControl(project.getProject(), parent)
- };
- }
-
- public Composite createRootControl(IFacetedProject project,IModuleDependenciesControl[] pages,
- Composite parent) {
-
- if( isStandalone(project.getProject()))
- return pages[0].createContents(parent);
-
- final TabFolder folder = new TabFolder(parent, SWT.LEFT);
- folder.setLayoutData(new GridData(GridData.FILL_BOTH));
- folder.setFont(parent.getFont());
-
- // Create the two tabs
- controls = new IModuleDependenciesControl[2];
- controls[0] = pages[0];
- controls[1] = pages[1];
-
- TabItem tab = new TabItem(folder, SWT.NONE);
- tab.setControl(create(controls[0],folder));
- tab.setText(Messages.DeploymentAssembly);
- tab = new TabItem(folder, SWT.NONE);
- tab.setControl(create(controls[1],folder));
- tab.setText(Messages.ManifestEntries);
-
- folder.setSelection(0);
- return folder;
- }
-
- private static Control create( final IModuleDependenciesControl control,
- final Composite parent )
- {
- final Composite composite = new Composite( parent, SWT.NONE );
- composite.setLayout( new GridLayout() );
- final Composite inner = control.createContents( composite );
- inner.setLayoutData( new GridData( GridData.FILL_BOTH ) );
-
- return composite;
- }
-
- public String getPageTitle(IProject project) {
- return Messages.WebDeploymentAssembly;
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java
deleted file mode 100644
index fdf1f51..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.eclipse.jst.servlet.ui.internal.actions;
-
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IConvertStaticWebToDyamnicDataModelProperties;
-import org.eclipse.jst.servlet.ui.internal.wizard.ConvertToWebModuleTypeDialog;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.web.ui.internal.Logger;
-
-/**
- * Convert a simple static web project to a J2EE Dynamic Web Project
- */
-public class ConvertToWebModuleTypeAction extends Action implements IWorkbenchWindowActionDelegate {
-
- IStructuredSelection fSelection = null;
- IProject project = null;
- IWorkbenchWindow fWindow;
-
- /**
- * ConvertLinksDialog constructor comment.
- */
- public ConvertToWebModuleTypeAction() {
- super();
- }
-
- /**
- * make sure a web project is selected.
- */
- protected boolean isValidProject(IProject aProject) {
- return JavaEEProjectUtilities.isStaticWebProject(aProject);
- }
-
- /**
- * selectionChanged method comment.
- */
- public void selectionChanged(IAction action, ISelection selection) {
- boolean bEnable = false;
- if (selection instanceof IStructuredSelection) {
- fSelection = (IStructuredSelection) selection;
- bEnable = validateSelected(fSelection);
- }
- ((Action) action).setEnabled(bEnable);
- }
-
- /**
- * selectionChanged method comment.
- */
- protected boolean validateSelected(ISelection selection) {
- if (!(selection instanceof IStructuredSelection))
- return false;
-
- fSelection = (IStructuredSelection) selection;
-
- Object selectedProject = fSelection.getFirstElement();
- if (!(selectedProject instanceof IProject))
- return false;
-
- project = (IProject) selectedProject;
- return isValidProject(project);
- }
-
- public void dispose() {
- // Default
- }
-
- public void init(IWorkbenchWindow window) {
- // Default
- }
-
- public void run(IAction action) {
- try {
- IWorkbenchWindow window = PlatformUI.getWorkbench().getWorkbenchWindows()[0];
- ConvertToWebModuleTypeDialog dialog = new ConvertToWebModuleTypeDialog(window.getShell());
- dialog.open();
- if (dialog.getReturnCode() == Window.CANCEL)
- return;
-
- doConvert(ConvertToWebModuleTypeDialog.getSelectedVersion());
-
- } catch (Exception e) {
- Logger.logException(e);
- }
- }
-
- protected void doConvert(String selectedVersion) throws Exception {
-
- IDataModel model = DataModelFactory.createDataModel(IConvertStaticWebToDyamnicDataModelProperties.class);
- model.setProperty(IConvertStaticWebToDyamnicDataModelProperties.PROJECT, project);
- model.setStringProperty(IConvertStaticWebToDyamnicDataModelProperties.CONVERT_TO_WEB_VERSION, ConvertToWebModuleTypeDialog.getSelectedVersion());
- model.getDefaultOperation().execute(new NullProgressMonitor(), null);
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/NewWebComponentAction.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/NewWebComponentAction.java
deleted file mode 100644
index 61d934a..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/NewWebComponentAction.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.actions;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.j2ee.internal.actions.AbstractOpenWizardWorkbenchAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard;
-import org.eclipse.ui.IWorkbench;
-
-public class NewWebComponentAction extends AbstractOpenWizardWorkbenchAction {
-
- public static String LABEL = WEBUIMessages.WEB_MODULE_WIZ_TITLE;
- private static final String ICON = "war_wiz"; //$NON-NLS-1$
-
- public NewWebComponentAction() {
- super();
- setText(LABEL);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- public NewWebComponentAction(IWorkbench workbench, String label, Class[] activatedOnTypes, boolean acceptEmptySelection) {
- super(workbench, label, activatedOnTypes, acceptEmptySelection);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- public NewWebComponentAction(IWorkbench workbench, String label, boolean acceptEmptySelection) {
- super(workbench, label, acceptEmptySelection);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- @Override
- protected Wizard createWizard() {
- return new WebProjectWizard();
- }
-
- @Override
- protected boolean shouldAcceptElement(Object obj) {
- return true; /* NewGroup.isOnBuildPath(obj) && !NewGroup.isInArchive(obj); */
- }
- @Override
- protected String getDialogText() {
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java
deleted file mode 100644
index cccad87..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.jst.j2ee.internal.web.deployables.WebDeployableArtifactUtil;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
-
-public class WebDeployableArtifactAdapterFactory extends ModuleArtifactAdapterDelegate implements IAdapterFactory {
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[]{ILaunchable.class};
- }
-
-
- @Override
- public IModuleArtifact getModuleArtifact(Object obj) {
- return WebDeployableArtifactUtil.getModuleObject(obj);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/messages.properties b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/messages.properties
deleted file mode 100644
index 7c20ede..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/messages.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-CustomWebProjectReferenceWizardFragment=Assemble projects into the &WEB-INF/lib folder of the web application
-DeploymentAssembly=Deployment Assembly
-WebDeploymentAssembly=Web Deployment Assembly
-ManifestEntries=Manifest Entries
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaLibraries.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaLibraries.java
deleted file mode 100644
index 5363803..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaLibraries.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.navigator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-public class CompressedJavaLibraries implements ICompressedNode {
-
-
- private CompressedJavaProject compressedProject;
- private Image image;
-
- public CompressedJavaLibraries(CompressedJavaProject compressedProject) {
- this.compressedProject = compressedProject;
- }
-
- public Image getImage() {
- if(image == null) {
- image = JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_LIBRARY);
- }
- return image;
- }
-
- public String getLabel() {
- return WEBUIMessages.Compressed_Libraries;
- }
-
- public Object[] getChildren(ITreeContentProvider delegateContentProvider) {
-
- List classpathContainers = new ArrayList();
- Object[] delegateChildren = delegateContentProvider.getChildren(compressedProject.getProject());
- for (int i = 0; i < delegateChildren.length; i++) {
- if (delegateChildren[i] instanceof IPackageFragmentRoot) {
- try {
- IClasspathEntry rawClasspathEntry = ((IPackageFragmentRoot) delegateChildren[i]).getRawClasspathEntry();
- if (rawClasspathEntry.getEntryKind() != IClasspathEntry.CPE_CONTAINER &&
- rawClasspathEntry.getEntryKind() != IClasspathEntry.CPE_SOURCE)
- classpathContainers.add(delegateChildren[i]);
- } catch (JavaModelException e) {
-
- }
- } else if (!(delegateChildren[i] instanceof IJavaElement) && !(delegateChildren[i] instanceof IResource)) {
- classpathContainers.add(delegateChildren[i]);
- }
- }
- return classpathContainers.toArray();
- }
-
- public CompressedJavaProject getCompressedProject() {
- return compressedProject;
- }
-
- public IJavaElement getJavaElement() {
- return null;
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java
deleted file mode 100644
index 94f025d..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.navigator;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-
-public class CompressedJavaProject implements ICompressedNode, IAdaptable {
-
- private IProject project;
- private CompressedJavaLibraries compressedLibraries;
- private Image image;
-
- public CompressedJavaProject(StructuredViewer viewer, IProject project) {
- this.project = project;
-
- }
-
- public Image getImage() {
- if(image == null)
- image = JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKFRAG_ROOT);
- return image;
- }
-
- public String getLabel() {
- return determineLabel();
-
- }
-
- public boolean isFlatteningSourceFolder() {
- return getNonExternalSourceFolders().size() == 1;
- }
-
- private String determineLabel() {
- List nonextSourceFolders = getNonExternalSourceFolders();
- IPackageFragmentRoot singleRoot = null;
- if (nonextSourceFolders.size() == 1) {
- singleRoot = (IPackageFragmentRoot) nonextSourceFolders.get(0);
- }
- return NLS.bind(WEBUIMessages.Compressed_JavaResources, ((singleRoot != null) ? ": " + singleRoot.getElementName() : "")); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- public IProject getProject() {
- return project;
- }
-
- public Object[] getChildren(ITreeContentProvider delegateContentProvider) {
-
- List nonExternalSourceFolders = getNonExternalSourceFolders();
- if (nonExternalSourceFolders.size() == 1) {
- Object[] sourceFolderChildren = delegateContentProvider.getChildren(nonExternalSourceFolders.get(0));
- nonExternalSourceFolders.clear();
- nonExternalSourceFolders.addAll(Arrays.asList(sourceFolderChildren));
- }
- nonExternalSourceFolders.add(getCompressedJavaLibraries());
- return nonExternalSourceFolders.toArray();
- }
-
- public List getNonExternalSourceFolders() {
- List nonExternalSourceFolders = null;
- IPackageFragmentRoot[] sourceFolders;
- try {
- IJavaProject jProject = JavaCore.create(project);
- sourceFolders = jProject.getPackageFragmentRoots();
- nonExternalSourceFolders = new ArrayList(Arrays.asList(sourceFolders));
- for (Iterator iter = nonExternalSourceFolders.iterator(); iter.hasNext();) {
- IPackageFragmentRoot root = (IPackageFragmentRoot) iter.next();
- if (root.isExternal() || root.isArchive() || root.getKind()==IPackageFragmentRoot.K_BINARY)
- iter.remove();
- }
- } catch (JavaModelException e) {
- ServletUIPlugin.log(e);
- }
- return nonExternalSourceFolders != null ? nonExternalSourceFolders : Collections.EMPTY_LIST;
- }
-
- public CompressedJavaLibraries getCompressedJavaLibraries() {
- if(compressedLibraries == null)
- compressedLibraries = new CompressedJavaLibraries(this);
- return compressedLibraries;
-
- }
-
- public Object getAdapter(Class adapter) {
- return Platform.getAdapterManager().getAdapter(this, adapter);
- }
-
- public IJavaElement getJavaElement() {
- List nonExternalSourceFolders = getNonExternalSourceFolders();
- if (nonExternalSourceFolders.size() == 1) {
- return (IJavaElement) nonExternalSourceFolders.get(0);
- }
- return JavaCore.create(project);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaSorter.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaSorter.java
deleted file mode 100644
index 4ee9c12..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaSorter.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.navigator;
-
-import org.eclipse.jdt.ui.JavaElementSorter;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-
-public class CompressedJavaSorter extends ViewerSorter {
-
- private JavaElementSorter sorter = new JavaElementSorter();
-
- @Override
- public int category(Object element) {
- if(element instanceof CompressedJavaLibraries)
- return 1;
- return 0;
- }
-
- @Override
- public int compare(Viewer viewer, Object e1, Object e2) {
- if(e1 instanceof CompressedJavaLibraries)
- return 1;
- else if(e2 instanceof CompressedJavaLibraries)
- return -1;
-
- return sorter.compare(viewer, e1, e2);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedNodeAdapterFactory.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedNodeAdapterFactory.java
deleted file mode 100644
index a73b085..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedNodeAdapterFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.navigator;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-
-//
-public class CompressedNodeAdapterFactory implements IAdapterFactory {
-
- private static final Class IJAVA_PROJECT_CLASS = IJavaProject.class;
- private static final Class IJAVA_ELEMENT_CLASS = IJavaElement.class;
-
- private static final Class[] ADAPTER_LIST = new Class[] { IJAVA_PROJECT_CLASS };
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if(adaptableObject instanceof CompressedJavaProject) {
- if(adapterType == IJAVA_PROJECT_CLASS) {
- return ((CompressedJavaProject)adaptableObject).getProject();
- } else if (adapterType == IJAVA_ELEMENT_CLASS) {
- return ((CompressedJavaProject)adaptableObject).getJavaElement();
- }
- }
- return null;
- }
-
- public Class[] getAdapterList() {
- return ADAPTER_LIST;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/FacetedProjectPropertyTester.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/FacetedProjectPropertyTester.java
deleted file mode 100644
index 7acbd73..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/FacetedProjectPropertyTester.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.navigator;
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-
-public class FacetedProjectPropertyTester extends PropertyTester
-
-{
- public boolean test( final Object receiver,
- final String property,
- final Object[] args,
- final Object value )
- {
- try
- {
- if( ! ( receiver instanceof ICompressedNode ) )
- {
- return false;
- }
-
- IProject pj = null;
- if (receiver instanceof CompressedJavaProject) {
- pj = ((CompressedJavaProject) receiver).getProject();
- } else if (receiver instanceof CompressedJavaLibraries) {
- pj = ((CompressedJavaLibraries) receiver).getCompressedProject().getProject();
- }
-
- if( pj == null )
- {
- return false;
- }
-
- final String val = (String) value;
- final int colon = val.indexOf( ':' );
-
- final String fid;
- final String vexpr;
-
- if( colon == -1 || colon == val.length() - 1 )
- {
- fid = val;
- vexpr = null;
- }
- else
- {
- fid = val.substring( 0, colon );
- vexpr = val.substring( colon + 1 );
- }
-
- return FacetedProjectFramework.hasProjectFacet( pj, fid, vexpr );
- }
- catch( CoreException e )
- {
- //
- }
-
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/ICompressedNode.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/ICompressedNode.java
deleted file mode 100644
index 7d1bb73..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/ICompressedNode.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.navigator;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.swt.graphics.Image;
-
-/**
- *
- * Provides a simple interface that is used to manipulate the rendering of Java elements to a format
- * that is friendlier for Web Projects.
- *
- */
-public interface ICompressedNode {
- /**
- *
- * @return The image to display for this node.
- */
- public Image getImage();
-
- /**
- *
- * @return The text label to display for this node.
- */
- public String getLabel();
-
- /**
- *
- * @param delegateContentProvider
- * The content provider that should used for any children that I cannot provide
- * children for.
- * @return The children either from me or the delegateContentProvider.
- */
- public Object[] getChildren(ITreeContentProvider delegateContentProvider);
-
- /**
- *
- * @return The Java element associated with this node, if any.
- */
- public IJavaElement getJavaElement();
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaContentProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaContentProvider.java
deleted file mode 100644
index 5a76c85..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaContentProvider.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.navigator;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-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.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.navigator.CommonViewer;
-import org.eclipse.ui.navigator.ICommonContentExtensionSite;
-import org.eclipse.ui.navigator.INavigatorContentExtension;
-import org.eclipse.ui.navigator.INavigatorContentService;
-import org.eclipse.ui.navigator.IPipelinedTreeContentProvider;
-import org.eclipse.ui.navigator.PipelinedShapeModification;
-import org.eclipse.ui.navigator.PipelinedViewerUpdate;
-
-public class WebJavaContentProvider implements IPipelinedTreeContentProvider {
-
- private static final Object[] NO_CHILDREN = new Object[0];
- private static final String JAVA_EXTENSION_ID = "org.eclipse.jdt.java.ui.javaContent"; //$NON-NLS-1$
-
- /*
- * JDT likes to make it interesting so just one of their viewer types is made internal To avoid
- * the dependency, we use some reflection here to filter the type.
- */
-
- private static Class INTERNAL_CONTAINER_CLASS;
- static {
- try {
- INTERNAL_CONTAINER_CLASS = Class.forName("org.eclipse.jdt.internal.ui.packageview.ClassPathContainer"); //$NON-NLS-1$
- } catch (Throwable t) {
- // ignore if the class has been removed or renamed.
- INTERNAL_CONTAINER_CLASS = null;
- }
- }
-
-
- private CommonViewer commonViewer;
- private ITreeContentProvider delegateContentProvider;
- private final Map compressedNodes = new HashMap();
-
- public void getPipelinedChildren(Object aParent, Set theCurrentChildren) {
- try {
- if (aParent instanceof IProject && ((IProject)aParent).hasNature(JavaCore.NATURE_ID) && JavaEEProjectUtilities.isDynamicWebProject((IProject)aParent)) {
- cleanJavaContribution(theCurrentChildren);
- theCurrentChildren.add(getCompressedNode((IProject)aParent));
- }
- } catch (CoreException e) {
- ServletUIPlugin.log(e);
- }
- }
-
- private void cleanJavaContribution(Set theCurrentChildren) {
- IJavaElement element = null;
- for (Iterator iter = theCurrentChildren.iterator(); iter.hasNext();) {
- Object child = iter.next();
- if (child instanceof IResource && ((element = JavaCore.create((IResource) child)) != null) && element.exists())
- iter.remove();
- else if (child instanceof IJavaElement)
- iter.remove();
- else if (INTERNAL_CONTAINER_CLASS != null && INTERNAL_CONTAINER_CLASS.isInstance(child))
- iter.remove();
- }
- }
-
- private CompressedJavaProject getCompressedNode(IProject project) {
- if (!JavaEEProjectUtilities.isDynamicWebProject(project))
- return null;
- CompressedJavaProject result = (CompressedJavaProject) compressedNodes.get(project);
- if (result == null) {
- compressedNodes.put(project, result = new CompressedJavaProject(commonViewer, project));
- }
- return result;
- }
-
- public void getPipelinedElements(Object anInput, Set theCurrentElements) {
-
- }
-
- public Object getPipelinedParent(Object anObject, Object aSuggestedParent) {
-
- try {
- if (anObject instanceof IPackageFragmentRoot) {
- IPackageFragmentRoot root = (IPackageFragmentRoot) anObject;
- if (!root.isExternal()) {
- if( aSuggestedParent instanceof IJavaProject ) {
- return getCompressedNode( ((IJavaProject) aSuggestedParent).getProject() );
- } else if ( aSuggestedParent instanceof IProject && ((IProject)aSuggestedParent).hasNature(JavaCore.NATURE_ID) && JavaEEProjectUtilities.isDynamicWebProject((IProject)aSuggestedParent) ){
- return getCompressedNode( ((IProject) aSuggestedParent) );
- }
- }
- } else if(INTERNAL_CONTAINER_CLASS.isInstance(anObject)) {
- if( aSuggestedParent instanceof IJavaProject ) {
- return getCompressedNode( ((IJavaProject) aSuggestedParent).getProject() ).getCompressedJavaLibraries();
- } else if ( aSuggestedParent instanceof IProject && ((IProject)aSuggestedParent).hasNature(JavaCore.NATURE_ID) && JavaEEProjectUtilities.isDynamicWebProject((IProject)aSuggestedParent)){
- return getCompressedNode( ((IProject) aSuggestedParent) ).getCompressedJavaLibraries();
- }
- }
- } catch (CoreException e) {
- ServletUIPlugin.log(e);
- }
-
- return null;
- }
-
- public PipelinedShapeModification interceptAdd(PipelinedShapeModification anAddModification) {
- Object parent = anAddModification.getParent();
-
- if (parent instanceof IPackageFragmentRoot) {
- IPackageFragmentRoot sourceFolder = (IPackageFragmentRoot) parent;
- if (JavaEEProjectUtilities.isDynamicWebProject(sourceFolder.getJavaProject().getProject())) {
- CompressedJavaProject compressedNode = getCompressedNode(sourceFolder.getJavaProject().getProject());
- if(compressedNode.isFlatteningSourceFolder()) {
- anAddModification.setParent(compressedNode);
- }
- }
- }
-
- return anAddModification;
- }
-
-
- public PipelinedShapeModification interceptRemove(PipelinedShapeModification aRemoveModification) {
-
- Object parent = aRemoveModification.getParent();
-
- Set children = aRemoveModification.getChildren();
-
- for (Object child : children) {
- if (child instanceof IFolder){
- try {
- IPackageFragment locatePackageFragment = locatePackageFragment((IFolder)child);
- if(locatePackageFragment != null){
- aRemoveModification.getChildren().remove(child);
- aRemoveModification.getChildren().add(locatePackageFragment);
-
- return aRemoveModification;
- }
- } catch (JavaModelException e) {
- }
- }
- }
-
- if (parent instanceof IPackageFragmentRoot) {
- IPackageFragmentRoot sourceFolder = (IPackageFragmentRoot) parent;
- if (JavaEEProjectUtilities.isDynamicWebProject(sourceFolder.getJavaProject().getProject())) {
- CompressedJavaProject compressedNode = getCompressedNode(sourceFolder.getJavaProject().getProject());
- if(compressedNode.isFlatteningSourceFolder()) {
- aRemoveModification.setParent(compressedNode);
- }
- }
-
- }
-
- return aRemoveModification;
- }
-
- private IPackageFragment locatePackageFragment(IFolder child) throws JavaModelException {
- IJavaElement elem = JavaCore.create(child);
- if (elem instanceof IPackageFragment) {
- IPackageFragment packageFragment = (IPackageFragment)elem;
- for (IJavaElement javaElem = packageFragment ; javaElem != null ; javaElem = javaElem.getParent()) {
- if (javaElem instanceof IPackageFragmentRoot) {
- IPackageFragmentRoot fragmentRoot = (IPackageFragmentRoot)javaElem;
- if (!fragmentRoot.isReadOnly() && !fragmentRoot.isExternal()) {
- return packageFragment;
- }
- }
- }
- }
- return null;
- }
-
- public boolean interceptRefresh(PipelinedViewerUpdate aRefreshSynchronization) {
-
- Set refreshTargets = aRefreshSynchronization.getRefreshTargets();
- for (Iterator iter = refreshTargets.iterator(); iter.hasNext();) {
- Object refreshTarget = iter.next();
- if (refreshTarget instanceof IPackageFragmentRoot) {
- IPackageFragmentRoot sourceFolder = (IPackageFragmentRoot) refreshTarget;
- if (JavaEEProjectUtilities.isDynamicWebProject(sourceFolder.getJavaProject().getProject())) {
- CompressedJavaProject compressedNode = getCompressedNode(sourceFolder.getJavaProject().getProject());
- if(compressedNode.isFlatteningSourceFolder()) {
- iter.remove(); // voids the iter but is okay because we're done with it
- refreshTargets.add(compressedNode);
- return true;
- }
- }
-
- }
- }
-
- return false;
- }
-
-
- public boolean interceptUpdate(PipelinedViewerUpdate anUpdateSynchronization) {
- Set refreshTargets = anUpdateSynchronization.getRefreshTargets();
- for (Iterator iter = refreshTargets.iterator(); iter.hasNext();) {
- Object refreshTarget = iter.next();
- if (refreshTarget instanceof IPackageFragmentRoot) {
- IPackageFragmentRoot sourceFolder = (IPackageFragmentRoot) refreshTarget;
- if (sourceFolder.getJavaProject()!=null && sourceFolder.getJavaProject().exists() && sourceFolder.getJavaProject().isOpen() && JavaEEProjectUtilities.isDynamicWebProject(sourceFolder.getJavaProject().getProject())) {
- CompressedJavaProject compressedNode = getCompressedNode(sourceFolder.getJavaProject().getProject());
- if(compressedNode.isFlatteningSourceFolder()) {
- iter.remove(); // voids the iterator; but is okay because we're done with it
- refreshTargets.add(compressedNode);
- return true;
- }
- }
- }
- }
-
- return false;
- }
-
- public void init(ICommonContentExtensionSite aSite) {
- }
-
- public Object[] getChildren(Object parentElement) {
- if (delegateContentProvider != null) {
- if (parentElement instanceof CompressedJavaProject) {
- return ((CompressedJavaProject)parentElement).getChildren(delegateContentProvider);
- } else if (parentElement instanceof CompressedJavaLibraries) {
- return ((CompressedJavaLibraries)parentElement).getChildren(delegateContentProvider);
- }
- }
- return NO_CHILDREN;
- }
-
- public Object getParent(Object element) {
- if (element instanceof CompressedJavaProject)
- return ((CompressedJavaProject) element).getProject();
- if (element instanceof CompressedJavaLibraries)
- return ((CompressedJavaLibraries) element).getCompressedProject();
- return null;
- }
-
- public boolean hasChildren(Object element) {
- return (element instanceof CompressedJavaProject || element instanceof CompressedJavaLibraries);
- }
-
- public Object[] getElements(Object inputElement) {
- return NO_CHILDREN;
- }
-
- public void dispose() {
- compressedNodes.clear();
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- if (viewer instanceof CommonViewer) {
- commonViewer = (CommonViewer) viewer;
- INavigatorContentService service = commonViewer.getNavigatorContentService();
- INavigatorContentExtension javaext = service.getContentExtensionById(JAVA_EXTENSION_ID);
- if (javaext != null)
- delegateContentProvider = javaext.getContentProvider();
- compressedNodes.clear();
- }
-
- }
-
- public void restoreState(IMemento aMemento) {
-
- }
-
- public void saveState(IMemento aMemento) {
-
- }
-
- public boolean isClasspathContainer(Object o) {
- return INTERNAL_CONTAINER_CLASS != null && INTERNAL_CONTAINER_CLASS.isInstance(o);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaLabelProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaLabelProvider.java
deleted file mode 100644
index f87ed5d..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaLabelProvider.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.navigator;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.ui.ProblemsLabelDecorator;
-import org.eclipse.jface.viewers.ILabelDecorator;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.swt.graphics.Image;
-
-public class WebJavaLabelProvider implements ILabelProvider {
-
- private ILabelDecorator decorator = new ProblemsLabelDecorator();
-
- public Image getImage(Object element) {
- Image image = null;
- if(element instanceof ICompressedNode)
- image = ((ICompressedNode)element).getImage();
-
- IJavaElement javaElement = null;
- if(image != null && ( javaElement = ((ICompressedNode)element).getJavaElement()) != null ) {
- image = decorator.decorateImage(image, javaElement);
- }
- return image;
- }
-
- public String getText(Object element) {
- String text = null;
- if(element instanceof ICompressedNode)
- text = ((ICompressedNode)element).getLabel();
-
- IJavaElement javaElement = null;
- if(text != null && ( javaElement = ((ICompressedNode)element).getJavaElement()) != null ) {
- text = decorator.decorateText(text, javaElement);
- }
- return text;
- }
-
- public void addListener(ILabelProviderListener listener) {
-
- }
-
- public void dispose() {
- decorator.dispose();
- }
-
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- public void removeListener(ILabelProviderListener listener) {
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/ServletUIPlugin.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/ServletUIPlugin.java
deleted file mode 100644
index bae2970..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/ServletUIPlugin.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.plugin;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.core.runtime.Platform;
-import java.lang.Throwable;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * @author jlanuti
- *
- */
-public class ServletUIPlugin extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "org.eclipse.jst.servlet.ui"; //$NON-NLS-1$
- // The shared instance.
- private static ServletUIPlugin plugin;
-
- /**
- * The constructor.
- */
- public ServletUIPlugin() {
- super();
- plugin = this;
- }
-
-
- /**
- * Returns the shared instance.
- */
- public static ServletUIPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- public static void log( final Exception e )
- {
- final String msg = e.getMessage() + ""; //$NON-NLS-1$
- log( new Status( IStatus.ERROR, PLUGIN_ID, IStatus.OK, msg, e ) );
- }
-
- public static void log( final IStatus status )
- {
- getDefault().getLog().log( status );
- }
-
-
- public static IStatus createStatus(int severity, String message, Throwable exception) {
- return new Status(severity, PLUGIN_ID, message, exception);
- }
-
-
- public static IStatus createStatus(int severity, String message) {
- return createStatus(severity, message, null);
- }
-
-
- public static void logError(Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception));
- }
-
-
- public static void logError(CoreException exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java
deleted file mode 100644
index 11626e3..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.plugin;
-
-import org.eclipse.osgi.util.NLS;
-
-
-public class WEBUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "web_ui";//$NON-NLS-1$
-
- private WEBUIMessages() {
- // Do not instantiate
- }
-
- public static String NEW_SERVLET_WIZARD_PAGE_TITLE;
- public static String FOLDER_LABEL;
- public static String URL_MAPPINGS_TITLE;
- public static String URL_MAPPINGS_LABEL;
- public static String SERVLET_MAPPINGS_LABEL;
- public static String FILTER_MAPPINGS_LABEL;
- public static String URL_SERVLET_LABEL;
- public static String DISPATCHERS_LABEL;
- public static String JAVA_CLASS_MODIFIERS_LABEL;
- public static String SUPERCLASS_LABEL;
- public static String WEB_CONT_PAGE_TITLE;
- public static String SERVLET_PACKAGE_LABEL;
- public static String PACKAGE_SELECTION_DIALOG_MSG_NONE;
- public static String JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL;
- public static String ADD_SERVLET_WIZARD_WINDOW_TITLE;
- public static String ADD_SERVLET_WIZARD_PAGE_TITLE;
- public static String ADD_FILTER_WIZARD_WINDOW_TITLE;
- public static String ADD_FILTER_WIZARD_PAGE_TITLE;
- public static String JAVA_CLASS_MAIN_CHECKBOX_LABEL;
- public static String EMPTY_LIST_MSG;
- public static String ExportWARAction_UI_;
- public static String NO_WEB_PROJECTS;
- public static String INTERFACE_SELECTION_DIALOG_MSG_NONE;
- public static String SUPERCLASS_SELECTION_DIALOG_TITLE;
- public static String PACKAGE_SELECTION_DIALOG_DESC;
- public static String JAVA_CLASS_BROWER_DIALOG_TITLE;
- public static String CONTAINER_SELECTION_DIALOG_DESC;
- public static String NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC;
- public static String JAVA_CLASS_PUBLIC_CHECKBOX_LABEL;
- public static String URL_PATTERN_LABEL;
- public static String CONTAINER_SELECTION_DIALOG_TITLE;
- public static String WEB_CONT_NAME;
- public static String URL_PATTERN_TITLE;
- public static String CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG;
- public static String DESCRIPTION_TITLE;
- public static String DESCRIPTION_LABEL;
- public static String USE_EXISTING_SERVLET_CLASS;
- public static String USE_EXISTING_FILTER_CLASS;
- public static String USE_EXISTING_LISTENER_CLASS;
- public static String JAVA_CLASS_FINAL_CHECKBOX_LABEL;
- public static String INTERFACE_SELECTION_DIALOG_DESC;
- public static String ADD_LABEL;
- public static String ADD_SERVLET_WIZARD_PAGE_DESC;
- public static String ADD_FILTER_WIZARD_PAGE_DESC;
- public static String SELECT_CLASS_TITLE;
- public static String JAVA_CLASS_BROWER_DIALOG_MESSAGE;
- public static String ImportWARAction_UI_;
- public static String _9;
- public static String JAVA_CLASS_METHOD_STUBS_LABEL;
- public static String _8;
- public static String JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL;
- public static String _7;
- public static String SERVLETS;
- public static String _6;
- public static String DEFAULT_PACKAGE;
- public static String _5;
- public static String MAP_CLASS_NAME_TO_CLASS_ERROR_MSG;
- public static String BROWSE_BUTTON_LABEL;
- public static String _4;
- public static String REMOVE_BUTTON;
- public static String _3;
- public static String _2;
- public static String _1;
- public static String INIT_PARAM_TITLE;
- public static String INIT_PARAM_LABEL;
- public static String SERVLET_NAME_LABEL;
- public static String _0;
- public static String CLASS_NAME_LABEL;
- public static String _17;
- public static String _16;
- public static String JAVA_PACKAGE_LABEL;
- public static String _15;
- public static String _14;
- public static String _13;
- public static String PACKAGE_SELECTION_DIALOG_TITLE;
- public static String _12;
- public static String ADD_BUTTON_LABEL;
- public static String ADD_BUTTON_LABEL_A;
- public static String ADD_BUTTON_LABEL_D;
- public static String EDIT_BUTTON_LABEL;
- public static String EDIT_BUTTON_LABEL_E;
- public static String EDIT_BUTTON_LABEL_T;
- public static String _11;
- public static String _10;
- public static String SUPERCLASS_SELECTION_DIALOG_DESC;
- public static String NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC;
- public static String REMOVE_BUTTON_LABEL;
- public static String REMOVE_BUTTON_LABEL_R;
- public static String REMOVE_BUTTON_LABEL_V;
- public static String NEW_SERVLET_WIZARD_WINDOW_TITLE;
- public static String NEW_FILTER_WIZARD_WINDOW_TITLE;
- public static String INTERFACE_SELECTION_DIALOG_TITLE;
- public static String NAME_TITLE;
- public static String NAME_LABEL;
- public static String VALUE_TITLE;
- public static String VALUE_LABEL;
- public static String WEB_CONT_PAGE_COMP_LABEL;
- public static String CHOOSE_SERVLET_CLASS;
- public static String CHOOSE_FILTER_CLASS;
- public static String NEW_SERVLET_WIZARD_PAGE_DESC;
- public static String JAVA_CLASS_INHERIT_CHECKBOX_LABEL;
- public static String WEB_CONT_PAGE_DESCRIPTION;
- public static String JAVA_CLASS_INTERFACES_LABEL;
- public static String WEBCONTENT;
- public static String SELECT_ALL_BUTTON;
- public static String CLEAR_BUTTON;
-
- public static String Compressed_Libraries;
- public static String Compressed_JavaResources;
-
- public static String ConvertToWebTitle;
- public static String SelectWebVersion;
-
- public static String ADD_LISTENER_WIZARD_WINDOW_TITLE;
- public static String ADD_LISTENER_WIZARD_PAGE_TITLE;
- public static String ADD_LISTENER_WIZARD_PAGE_DESC;
- public static String ADD_LISTENER_WIZARD_SERVLET_CONTEXT_EVENTS;
- public static String ADD_LISTENER_WIZARD_HTTP_SESSION_EVENTS;
- public static String ADD_LISTENER_WIZARD_SERVLET_REQUEST_EVENTS;
- public static String ADD_LISTENER_WIZARD_LIFECYCLE;
- public static String ADD_LISTENER_WIZARD_LIFECYCLE_L;
- public static String ADD_LISTENER_WIZARD_LIFECYCLE_I;
- public static String ADD_LISTENER_WIZARD_LIFECYCLE_Y;
- public static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES;
- public static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_C;
- public static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_H;
- public static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_G;
- public static String ADD_LISTENER_WIZARD_SESSION_MIGRATION;
- public static String ADD_LISTENER_WIZARD_OBJECT_BINDING;
-
- public static String DISPATCHER_REQUEST;
- public static String DISPATCHER_FORWARD;
- public static String DISPATCHER_INCLUDE;
- public static String DISPATCHER_ERROR;
- public static String _18;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, WEBUIMessages.class);
- }
-
- public static final String IMAGE_LOAD_ERROR = _0;
- public static final String WEB_MODULE_WIZ_TITLE = _1;
- public static final String WEB_VERSION_LBL = _2;
- public static final String WEB_PROJECT_MAIN_PG_TITLE = _3;
- public static final String WEB_PROJECT_MAIN_PG_DESC = _4;
- public static final String WEB_PROJECT_LBL = _5;
- public static final String WEB_FILE_LBL = _6;
- public static final String WEB_IMPORT_MAIN_PG_DESC = _7;
- public static final String WEB_IMPORT_MAIN_PG_TITLE = _8;
- public static final String WEB_EXPORT_MAIN_PG_TITLE = _9;
- public static final String WEB_EXPORT_MAIN_PG_DESC = _10;
- public static final String WEB_IMPORT_CONTEXT_ROOT = _11;
- public static final String WEB_CONVERT_MAIN_PG_DESC = _12;
- public static final String WEB_CONVERT_MAIN_PG_TITLE = _13;
- public static final String WEB_IMPORT_WEB_LIB_PG_TITLE = _14;
- public static final String WEB_IMPORT_WEB_LIB_PG_DESC = _15;
- public static final String WAR_IMPORT_SELECT_ALL_LIBS_BUTTON = _16;
- public static final String WAR_IMPORT_DESELECT_ALL_LIBS_BUTTON = _17;
- public static final String WEBFRAGMENT_MODULE_WIZ_TITLE = _18;
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java
deleted file mode 100644
index 8ff4e39..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java
+++ /dev/null
@@ -1,617 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ERROR;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.FORWARD;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.INCLUDE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.REQUEST;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.URL_PATTERN_LABEL;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.j2ee.internal.dialogs.TwoArrayQuickSorter;
-import org.eclipse.jst.j2ee.internal.web.operations.FilterMappingItem;
-import org.eclipse.jst.j2ee.internal.web.operations.IFilterMappingItem;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.SelectionStatusDialog;
-import org.eclipse.ui.internal.layout.CellLayout;
-import org.eclipse.ui.part.PageBook;
-
-/**
- * Insert the type's description here.
- * Creation date: (7/30/2001 11:16:36 AM)
- */
-public class AddEditFilterMappingDialog extends SelectionStatusDialog implements SelectionListener {
-
- private static class TypeRenderer extends LabelProvider {
- private final Image SERVLET_ICON =
- ImageDescriptor.createFromURL((URL) WebPlugin.getDefault().getImage("servlet")).createImage(); //$NON-NLS-1$
-
- @Override
- public String getText(Object element) {
- return ((String) element);
- }
-
- @Override
- public Image getImage(Object element) {
- return SERVLET_ICON;
- }
-
- }
-
- public final static int SERVLET = 0;
- public final static int URL_PATTERN = 1;
- protected Button fServletButton;
- protected Button fURLPatternButton;
- protected int fSelection = -1;
- protected PageBook fPageBook = null;
- protected Control fURLPatternControl = null;
- protected Control fServletControl = null;
- protected Composite fChild = null;
- // construction parameters
- protected IRunnableContext fRunnableContext;
- protected ILabelProvider fElementRenderer;
- private Object[] fElements;
- private boolean fIgnoreCase = true;
- private String fUpperListLabel;
-
- // SWT widgets
- private Table fUpperList;
- protected Text fURLText;
- private String[] fServletNames;
- private String[] fRenderedStrings;
- private int dispatchers;
- private Button fRequest;
- private Button fForward;
- private Button fInclude;
- private Button fErorr;
- private IFilterMappingItem selectedItem;
-
- /**
- * MultiSelectFilteredFileSelectionDialog constructor comment.
- * @param parent Shell
- * @param title String
- * @param message String
- * @parent extensions String[]
- * @param allowMultiple boolean
- */
- public AddEditFilterMappingDialog(Shell parent, String title, IProject project,
- List<IFilterMappingItem> elements, IFilterMappingItem item) {
- super(parent);
- selectedItem = item;
- setShellStyle(SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL | SWT.RESIZE);
-
- if (title == null)
- setTitle(WebAppEditResourceHandler.getString("File_Selection_UI_")); //$NON-NLS-1$
- else setTitle(title);
-
- Status currStatus = new Status(Status.OK, ServletUIPlugin.PLUGIN_ID, Status.OK, "", null); //$NON-NLS-1$
-
- updateStatus(currStatus);
- fElementRenderer = new TypeRenderer();
- fRunnableContext = ServletUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
- try {
- IModelProvider provider = ModelProviderManager.getModelProvider(project);
- Object mObj = provider.getModelObject();
- ArrayList<String> servletsList = new ArrayList<String>();
- if (mObj instanceof org.eclipse.jst.j2ee.webapplication.WebApp) {
- org.eclipse.jst.j2ee.webapplication.WebApp webApp = (org.eclipse.jst.j2ee.webapplication.WebApp) mObj;
- List<Servlet> servlets = webApp.getServlets();
- for (Servlet servlet : servlets) {
- String servletName = servlet.getServletName();
- if (!servletName.equals(item != null ? item.getName() : null) &&
- isAlreadyAdded(servletName, elements)) continue;
- servletsList.add(servletName);
- }
- } else if (mObj instanceof org.eclipse.jst.javaee.web.WebApp) {
- org.eclipse.jst.javaee.web.WebApp webApp= (org.eclipse.jst.javaee.web.WebApp) mObj;
- List<org.eclipse.jst.javaee.web.Servlet> servlets = webApp.getServlets();
- for (org.eclipse.jst.javaee.web.Servlet servlet : servlets) {
- String servletName = servlet.getServletName();
- if (!servletName.equals(item != null ? item.getName() : null) &&
- isAlreadyAdded(servletName, elements)) continue;
- servletsList.add(servletName);
- }
- }
-
- fServletNames = servletsList.toArray(new String[servletsList.size()]);
- servletsList = null;
- } catch (Exception e) {
- ServletUIPlugin.log(e);
- }
- }
-
- private boolean isAlreadyAdded(String servlet, List<IFilterMappingItem> elements) {
- for (Iterator iterator = elements.iterator(); iterator.hasNext();) {
- IFilterMappingItem item = (IFilterMappingItem) iterator.next();
- if (item.isServletNameType() && item.getName().equals(servlet))
- return true;
- }
- return false;
- }
-
- /**
- * @private
- */
- @Override
- protected void computeResult() {
- if (fSelection == URL_PATTERN) {
- java.util.List result = new ArrayList(1);
- dispatchers = getDispatchers();
- FilterMappingItem mappingItem =
- new FilterMappingItem(FilterMappingItem.URL_PATTERN, fURLText.getText().trim(),
- dispatchers);
- result.add(mappingItem);
- setResult(result);
- } else {
- String servletName = (String) getWidgetSelection();
- if (servletName == null) {
-// String title = WebAppEditResourceHandler.getString("Select_Class_UI_"); //$NON-NLS-1$ = "Select Class"
-// String message = WebAppEditResourceHandler.getString("Could_not_uniquely_map_the_ERROR_"); //$NON-NLS-1$ = "Could not uniquely map the class name to a class."
-// MessageDialog.openError(getShell(), title, message);
- setResult(null);
- } else {
- dispatchers = getDispatchers();
- java.util.List result = new ArrayList(1);
- FilterMappingItem mappingItem =
- new FilterMappingItem(FilterMappingItem.SERVLET_NAME, servletName, dispatchers);
- result.add(mappingItem);
- setResult(result);
- }
- }
- }
-
- private int getDispatchers() {
- int dispatchers = 0;
- if (fRequest.getSelection()) {
- dispatchers |= IFilterMappingItem.REQUEST;
- }
- if (fForward.getSelection()) {
- dispatchers |= IFilterMappingItem.FORWARD;
- }
- if (fInclude.getSelection()) {
- dispatchers |= IFilterMappingItem.INCLUDE;
- }
- if (fErorr.getSelection()) {
- dispatchers |= IFilterMappingItem.ERROR;
- }
- return dispatchers;
- }
-
- @Override
- public void create() {
- super.create();
- if (selectedItem == null && (fServletNames != null && fServletNames.length > 0)) fSelection = SERVLET;
- updateOkState();
- }
-
- /**
- * Creates and returns the contents of this dialog's
- * button bar.
- * <p>
- * The <code>Dialog</code> implementation of this framework method
- * lays out a button bar and calls the <code>createButtonsForButtonBar</code>
- * framework method to populate it. Subclasses may override.
- * </p>
- *
- * @param parent the parent composite to contain the button bar
- * @return the button bar control
- */
- @Override
- protected Control createButtonBar(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
-
- layout.numColumns = 2;
-
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Composite composite2 = new Composite(composite, SWT.NONE);
-
- // create a layout with spacing and margins appropriate for the font size.
- layout = new GridLayout();
- layout.numColumns = 0; // this is incremented by createButton
- layout.makeColumnsEqualWidth = true;
- layout.marginWidth = convertHorizontalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.HORIZONTAL_MARGIN);
- layout.marginHeight = convertVerticalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.VERTICAL_MARGIN);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.HORIZONTAL_SPACING);
- layout.verticalSpacing = convertVerticalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.VERTICAL_SPACING);
-
- composite2.setLayout(layout);
-
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.VERTICAL_ALIGN_CENTER);
- composite2.setLayoutData(data);
-
- composite2.setFont(parent.getFont());
-
- // Add the buttons to the button bar.
- super.createButtonsForButtonBar(composite2);
-
- return composite;
- }
-
- /*
- * @private
- */
- @Override
- protected Control createDialogArea(Composite parent) {
- GridData gd = new GridData();
-
- fChild = new Composite(parent, SWT.NONE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(fChild, "com.ibm.etools.webapplicationedit.webx2010"); //$NON-NLS-1$
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- gl.marginHeight = 0;
- fChild.setLayout(gl);
-
- gd.verticalAlignment = GridData.FILL;
- gd.grabExcessVerticalSpace = true;
- fChild.setLayoutData(gd);
-
- // Create the Web Type radio buttons and text fields.
- fServletButton = new Button(fChild, SWT.RADIO);
- fServletButton.setText(WebAppEditResourceHandler.getString("Servlet_UI_")); //$NON-NLS-1$ = Servlet
- gd = new GridData();
- fServletButton.setLayoutData(gd);
- fServletButton.addSelectionListener(this);
-
- fURLPatternButton = new Button(fChild, SWT.RADIO);
- fURLPatternButton.setText(WebAppEditResourceHandler.getString("URL_pattern_UI_")); //$NON-NLS-1$
- gd = new GridData();
- fURLPatternButton.setLayoutData(gd);
- fURLPatternButton.addSelectionListener(this);
-
- //Create URL Pattern page
- fPageBook = new PageBook(fChild, SWT.NONE);
- gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.verticalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = true;
- gd.grabExcessVerticalSpace = true;
- gd.horizontalSpan = 2;
- fPageBook.setLayoutData(gd);
-
- Composite composite = new Composite(fPageBook, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
-
- Label messageLabel = new Label(composite, SWT.NONE);
- gd = new GridData();
- messageLabel.setLayoutData(gd);
- messageLabel.setText(URL_PATTERN_LABEL);
-
- fURLText = new Text(composite, SWT.BORDER);
- GridData spec = new GridData();
- spec.grabExcessVerticalSpace = false;
- spec.grabExcessHorizontalSpace = true;
- spec.horizontalAlignment = GridData.FILL;
- spec.verticalAlignment = GridData.BEGINNING;
- fURLText.setLayoutData(spec);
- Listener l = new Listener() {
- public void handleEvent(Event evt) {
- updateOkState();
- }
- };
- fURLText.addListener(SWT.Modify, l);
- fURLPatternControl = composite;
-
- //Create Servlet page
- composite = new Composite(fPageBook, SWT.NONE);
- layout = new GridLayout();
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
-
- messageLabel = new Label(composite, SWT.NONE);
- gd = new GridData();
- messageLabel.setLayoutData(gd);
- messageLabel.setText(WebAppEditResourceHandler.getString("Choose_a_servlet__1")); //$NON-NLS-1$
-
- fUpperList = createUpperList(composite);
-
- fServletControl = composite;
-
- //Create Dispatchers control
- Group dispatchers = new Group(fChild, SWT.SHADOW_IN);
- dispatchers.setText(WebAppEditResourceHandler.getString("Select_Dispatchers_UI_")); //$NON-NLS-1$
- dispatchers.setLayout(new CellLayout(2).setMargins(10,10).setSpacing(5,5));
- GridData gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = 2;
- dispatchers.setLayoutData(gridData);
- fRequest = new Button(dispatchers, SWT.CHECK);
- fRequest.setText(REQUEST);
- fForward = new Button(dispatchers, SWT.CHECK);
- fForward.setText(FORWARD);
- fInclude = new Button(dispatchers, SWT.CHECK);
- fInclude.setText(INCLUDE);
- fErorr = new Button(dispatchers, SWT.CHECK);
- fErorr.setText(ERROR);
-
- if (selectedItem != null) {
- if (selectedItem.isUrlPatternType()) {
- fSelection = URL_PATTERN;
- } else {
- fSelection = SERVLET;
- }
- } else {
- if (fServletNames == null || fServletNames.length == 0) {
- fSelection = URL_PATTERN;
- }
- }
- updateUpperListWidget();
-
- fServletButton.setEnabled(true);
- if (fSelection == URL_PATTERN) {
- fURLPatternButton.setSelection(true);
- fPageBook.showPage(fURLPatternControl);
- fServletButton.setSelection(false);
- if (fServletNames == null || fServletNames.length == 0) {
- fServletButton.setEnabled(false);
- }
- if (selectedItem != null) {
- fURLText.setText(selectedItem.getName());
- setDispatchers(selectedItem.getDispatchers());
- }
- } else {
- fServletButton.setSelection(true);
- fPageBook.showPage(fServletControl);
- if (selectedItem != null) {
- fUpperList.setSelection(getServletIndex(fUpperList, selectedItem.getName()));
- setDispatchers(selectedItem.getDispatchers());
- }
- }
- updateOkState();
- return parent;
- }
-
- private int getServletIndex(Table list, String name) {
- TableItem[] items = list.getItems();
- for (int i = 0; i < items.length; i++) {
- TableItem tableItem = items[i];
- if (tableItem.getText().equals(name)) return i;
- }
- return -1;
- }
-
- private void setDispatchers(int dispatchers) {
- if ((dispatchers & IFilterMappingItem.REQUEST) > 0) {
- fRequest.setSelection(true);
- }
- if ((dispatchers & IFilterMappingItem.FORWARD) > 0) {
- fForward.setSelection(true);
- }
- if ((dispatchers & IFilterMappingItem.INCLUDE) > 0) {
- fInclude.setSelection(true);
- }
- if ((dispatchers & IFilterMappingItem.ERROR) > 0) {
- fErorr.setSelection(true);
- }
- }
-
- /**
- * Creates the list widget and sets layout data.
- * @return org.eclipse.swt.widgets.List
- */
- private Table createUpperList(Composite parent) {
- if (fUpperListLabel != null)
- (new Label(parent, SWT.NONE)).setText(fUpperListLabel);
-
- Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-// list.addListener(SWT.Selection, new Listener() {
-// public void handleEvent(Event evt) {
-// handleUpperSelectionChanged();
-// }
-// });
- list.addListener(SWT.MouseDoubleClick, new Listener() {
- public void handleEvent(Event evt) {
- handleUpperDoubleClick();
- }
- });
- list.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- fElementRenderer.dispose();
- }
- });
- GridData spec = new GridData();
- spec.widthHint = convertWidthInCharsToPixels(50);
- spec.heightHint = convertHeightInCharsToPixels(4);
- spec.grabExcessVerticalSpace = true;
- spec.grabExcessHorizontalSpace = true;
- spec.horizontalAlignment = GridData.FILL;
- spec.verticalAlignment = GridData.FILL;
- list.setLayoutData(spec);
- return list;
- }
-
- /**
- * @return the ID of the button that is 'pressed' on doubleClick in the lists.
- * By default it is the OK button.
- * Override to change this setting.
- */
- protected int getDefaultButtonID() {
- return IDialogConstants.OK_ID;
- }
-
- public int getSelectedItem() {
- return fSelection;
- }
-
- protected Object getWidgetSelection() {
- int index = fUpperList.getSelectionIndex();
- return index >= 0 ? fElements[index] : null;
- }
-
- protected final void handleLowerDoubleClick() {
- if (getWidgetSelection() != null)
- buttonPressed(getDefaultButtonID());
- }
-
- protected final void handleLowerSelectionChanged() {
- updateOkState();
- }
-
- protected final void handleUpperDoubleClick() {
- if (getWidgetSelection() != null)
- buttonPressed(getDefaultButtonID());
- }
-
- @Override
- public int open() {
- if (fServletNames == null || fServletNames.length == 0) {
- fSelection = URL_PATTERN;
- }
-
- setElements(fServletNames);
- setInitialSelections(new Object[] { "" }); //$NON-NLS-1$
- return super.open();
- }
-
- /**
- *
- * @return java.lang.String[]
- * @param p org.eclipse.jface.elements.IIndexedProperty
- */
- private String[] renderStrings(Object[] p) {
- String[] strings = new String[p.length];
- int size = strings.length;
- for (int i = 0; i < size; i++) {
- strings[i] = fElementRenderer.getText(p[i]);
- }
- new TwoArrayQuickSorter(fIgnoreCase).sort(strings, p);
- return strings;
- }
-
- public void setElements(Object[] elements) {
- Object [] innerElements = elements;
- if (innerElements == null){
- innerElements = new Object[0];
- }
- fElements = innerElements;
- fRenderedStrings = renderStrings(fElements);
- }
-
- public void setSelectedItem(int newSelection) {
- fSelection = newSelection;
- }
-
- private void updateOkState() {
- Button okButton = getOkButton();
- if (okButton != null)
- if (fSelection == SERVLET) {
- okButton.setEnabled(getWidgetSelection() != null);
- } else {
- String result = fURLText.getText().trim();
- okButton.setEnabled(result.length() > 0);
- }
- }
-
- private void updateUpperListWidget() {
- fUpperList.setRedraw(false);
- fUpperList.clearAll();
- for (int i = 0; i < fRenderedStrings.length; i++) {
- TableItem ti = new TableItem(fUpperList, SWT.NONE);
- ti.setText(fRenderedStrings[i]);
- // XXX: 1G65LDG: JFUIF:WIN2000 - ILabelProvider used outside a viewer
- Image img = fElementRenderer.getImage(fRenderedStrings[i]);
- ti.setImage(img);
- }
- if (fUpperList.getItemCount() > 0) {
- fUpperList.setSelection(0);
- }
- fUpperList.setRedraw(true);
- }
-
- /**
- * Sent when default selection occurs in the control.
- * <p>
- * For example, on some platforms default selection occurs
- * in a List when the user double-clicks an item or types
- * return in a Text.
- * </p>
- *
- * @param e an event containing information about the default selection
- */
- public void widgetDefaultSelected(SelectionEvent e) {
- // Do nothing
- }
-
- /**
- * Sent when selection occurs in the control.
- * <p>
- * For example, on some platforms selection occurs in
- * a List when the user selects an item or items.
- * </p>
- *
- * @param e an event containing information about the selection
- */
- public void widgetSelected(SelectionEvent e) {
- if (e.widget == fURLPatternButton) {
- fSelection = URL_PATTERN;
- fPageBook.showPage(fURLPatternControl);
- updateOkState();
- } else if (e.widget == fServletButton) {
- fSelection = SERVLET;
- fPageBook.showPage(fServletControl);
- getShell().pack();
- updateOkState();
- } else
- fSelection = -1;
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizard.java
deleted file mode 100644
index d87fed9..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizard.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_FILTER_WIZARD_PAGE_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_FILTER_WIZARD_WINDOW_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.operations.NewFilterClassDataModelProvider;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * New servlet filter wizard
- */
-public class AddFilterWizard extends NewWebArtifactWizard {
-
- public AddFilterWizard() {
- this(null);
- }
-
- public AddFilterWizard(IDataModel model) {
- super(model);
- }
-
- @Override
- protected String getTitle() {
- return ADD_FILTER_WIZARD_WINDOW_TITLE;
- }
-
- @Override
- protected ImageDescriptor getImage() {
- return getImageFromJ2EEPlugin("newfilter_wiz"); //$NON-NLS-1$
- }
-
- @Override
- public void doAddPages() {
- NewFilterClassWizardPage page1 = new NewFilterClassWizardPage(
- getDataModel(),
- PAGE_ONE,
- NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC,
- ADD_FILTER_WIZARD_PAGE_TITLE,
- J2EEProjectUtilities.DYNAMIC_WEB);
- page1.setInfopopID(IWebUIContextIds.WEBEDITOR_FILTER_PAGE_ADD_FILTER_WIZARD_1);
- addPage(page1);
-
- AddFilterWizardPage page2 = new AddFilterWizardPage(getDataModel(), PAGE_TWO);
- page2.setInfopopID(IWebUIContextIds.WEBEDITOR_FILTER_PAGE_ADD_FILTER_WIZARD_2);
- addPage(page2);
-
- NewFilterClassOptionsWizardPage page3 = new NewFilterClassOptionsWizardPage(
- getDataModel(),
- PAGE_THREE,
- NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC,
- ADD_FILTER_WIZARD_PAGE_TITLE);
- page3.setInfopopID(IWebUIContextIds.WEBEDITOR_FILTER_PAGE_ADD_FILTER_WIZARD_3);
- addPage(page3);
- }
-
- @Override
- protected IDataModelProvider getDefaultProvider() {
- return new NewFilterClassDataModelProvider();
- }
-
- @Override
- protected void postPerformFinish() throws InvocationTargetException {
- //open new filter class in java editor
- openJavaClass();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java
deleted file mode 100644
index 79ca1ae..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.FILTER_MAPPINGS;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.INIT_PARAM;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DESCRIPTION;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DISPLAY_NAME;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_BUTTON_LABEL_A;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_FILTER_WIZARD_PAGE_DESC;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_FILTER_WIZARD_PAGE_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DESCRIPTION_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DESCRIPTION_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.EDIT_BUTTON_LABEL_E;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.INIT_PARAM_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.INIT_PARAM_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NAME_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NAME_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NO_WEB_PROJECTS;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.REMOVE_BUTTON_LABEL_R;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.VALUE_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.VALUE_TITLE;
-import static org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties.PROJECT_NAME;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.j2ee.internal.wizard.StringArrayTableWizardSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * Filter Wizard Setting Page
- */
-public class AddFilterWizardPage extends DataModelWizardPage {
-
- final static String[] FILTEREXTENSIONS = {"java"}; //$NON-NLS-1$
-
- private Text displayNameText;
-
- FilterMappingsArrayTableWizardSection mappingSection;
-
- public AddFilterWizardPage(IDataModel model, String pageName) {
- super(model, pageName);
- setDescription(ADD_FILTER_WIZARD_PAGE_DESC);
- setTitle(ADD_FILTER_WIZARD_PAGE_TITLE);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[] { DISPLAY_NAME,
- INIT_PARAM,
- FILTER_MAPPINGS };
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- composite.setLayout(new GridLayout());
- GridData data = new GridData(GridData.FILL_BOTH);
- data.widthHint = 300;
- composite.setLayoutData(data);
-
- createNameDescription(composite);
-
- StringArrayTableWizardSectionCallback callback = new StringArrayTableWizardSectionCallback();
- StringArrayTableWizardSection initSection = new StringArrayTableWizardSection(
- composite,
- INIT_PARAM_LABEL,
- INIT_PARAM_TITLE,
- ADD_BUTTON_LABEL_A,
- EDIT_BUTTON_LABEL_E,
- REMOVE_BUTTON_LABEL_R,
- new String[] { NAME_TITLE, VALUE_TITLE, DESCRIPTION_TITLE },
- new String[] { NAME_LABEL, VALUE_LABEL, DESCRIPTION_LABEL },
- null,// WebPlugin.getDefault().getImage("initializ_parameter"),
- model,
- INIT_PARAM);
- initSection.setCallback(callback);
-
- mappingSection = new FilterMappingsArrayTableWizardSection(composite,
- model, FILTER_MAPPINGS);
-
- displayNameText.setFocus();
-
- IStatus projectStatus = validateProjectName();
- if (!projectStatus.isOK()) {
- setErrorMessage(projectStatus.getMessage());
- composite.setEnabled(false);
- }
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- protected IStatus validateProjectName() {
- // check for empty
- if (model.getStringProperty(PROJECT_NAME) == null || model.getStringProperty(PROJECT_NAME).trim().length() == 0) {
- return WTPCommonPlugin.createErrorStatus(NO_WEB_PROJECTS);
- }
- return WTPCommonPlugin.OK_STATUS;
- }
-
- protected void createNameDescription(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- composite.setLayout(new GridLayout(2, false));
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- // display name
- Label displayNameLabel = new Label(composite, SWT.LEFT);
- displayNameLabel.setText(NAME_LABEL);
- displayNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- displayNameText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- displayNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(displayNameText, DISPLAY_NAME, null);
-
- // description
- Label descLabel = new Label(composite, SWT.LEFT);
- descLabel.setText(DESCRIPTION_LABEL);
- descLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- Text descText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- descText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(descText, DESCRIPTION, null);
- }
-
- public String getDisplayName() {
- return displayNameText.getText();
- }
-
- @Override
- public boolean canFlipToNextPage() {
- if (model.getBooleanProperty(USE_EXISTING_CLASS))
- return false;
- return super.canFlipToNextPage();
- }
-
- @Override
- protected boolean showValidationErrorsOnEnter() {
- return true;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizard.java
deleted file mode 100644
index 1b90021..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizard.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_PAGE_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_WINDOW_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.operations.NewListenerClassDataModelProvider;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * New application lifecycle listener wizard
- */
-public class AddListenerWizard extends NewWebArtifactWizard {
-
- public AddListenerWizard() {
- this(null);
- }
-
- public AddListenerWizard(IDataModel model) {
- super(model);
- }
-
- @Override
- protected String getTitle() {
- return ADD_LISTENER_WIZARD_WINDOW_TITLE;
- }
-
- @Override
- protected ImageDescriptor getImage() {
- return getImageFromJ2EEPlugin("newlistener_wiz"); //$NON-NLS-1$
- }
-
- @Override
- public void doAddPages() {
- NewListenerClassWizardPage page1 = new NewListenerClassWizardPage(
- getDataModel(),
- PAGE_ONE,
- NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC,
- ADD_LISTENER_WIZARD_PAGE_TITLE, J2EEProjectUtilities.DYNAMIC_WEB);
- page1.setInfopopID(IWebUIContextIds.WEBEDITOR_LISTENER_PAGE_ADD_LISTENER_WIZARD_1);
- addPage(page1);
- AddListenerWizardPage page2 = new AddListenerWizardPage(getDataModel(), PAGE_TWO);
- page2.setInfopopID(IWebUIContextIds.WEBEDITOR_LISTENER_PAGE_ADD_LISTENER_WIZARD_2);
- addPage(page2);
- NewListenerClassOptionsWizardPage page3 = new NewListenerClassOptionsWizardPage(
- getDataModel(),
- PAGE_THREE,
- NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC,
- ADD_LISTENER_WIZARD_PAGE_TITLE);
- page3.setInfopopID(IWebUIContextIds.WEBEDITOR_LISTENER_PAGE_ADD_LISTENER_WIZARD_3);
- addPage(page3);
- }
-
- @Override
- protected void postPerformFinish() throws InvocationTargetException {
- // open new listener class in java editor
- openJavaClass();
- }
-
- @Override
- protected IDataModelProvider getDefaultProvider() {
- return new NewListenerClassDataModelProvider();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizardPage.java
deleted file mode 100644
index 8b1d3c3..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizardPage.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.INTERFACES;
-import static org.eclipse.jst.j2ee.internal.web.operations.NewListenerClassDataModelProvider.LISTENER_INTERFACES;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_ACTIVATION_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_ATTRIBUTE_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_BINDING_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_CONTEXT_ATTRIBUTE_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_CONTEXT_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_REQUEST_LISTENER;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.*;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jface.dialogs.Dialog;
-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.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-public class AddListenerWizardPage extends DataModelWizardPage {
-
- private static final Image IMG_INTERFACE = JavaPluginImages.get(JavaPluginImages.IMG_OBJS_INTERFACE);
-
- protected ServletDataModelSyncHelper synchHelper;
-
- public AddListenerWizardPage(IDataModel model, String pageName) {
- super(model, pageName);
- setDescription(ADD_LISTENER_WIZARD_PAGE_DESC);
- setTitle(ADD_LISTENER_WIZARD_PAGE_TITLE);
- synchHelper = initializeSynchHelper(model);
- }
-
- @Override
- public ServletDataModelSyncHelper initializeSynchHelper(IDataModel dm) {
- return new ServletDataModelSyncHelper(dm);
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(1, false));
- GridData data = new GridData(GridData.FILL_BOTH);
- data.widthHint = 300;
- composite.setLayoutData(data);
-
- createServletContextEvents(composite);
- createHttpSessionEvents(composite);
- createServletRequestEvents(composite);
- createSelectAllGroup(composite);
-
- Dialog.applyDialogFont(composite);
-
- return composite;
- }
-
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[] {
- INTERFACES
- };
- }
-
- @Override
- protected void enter() {
- super.enter();
- synchHelper.synchUIWithModel(INTERFACES, DataModelEvent.VALUE_CHG);
- }
-
- private void createServletContextEvents(Composite parent) {
- Group group = createGroup(parent, ADD_LISTENER_WIZARD_SERVLET_CONTEXT_EVENTS);
-
- createEventListenerRow(group,
- ADD_LISTENER_WIZARD_LIFECYCLE_L,
- QUALIFIED_SERVLET_CONTEXT_LISTENER,
- INTERFACES);
-
- createEventListenerRow(group,
- ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_C,
- QUALIFIED_SERVLET_CONTEXT_ATTRIBUTE_LISTENER,
- INTERFACES);
- }
-
- private void createHttpSessionEvents(Composite parent) {
- Group group = createGroup(parent, ADD_LISTENER_WIZARD_HTTP_SESSION_EVENTS);
-
- createEventListenerRow(group,
- ADD_LISTENER_WIZARD_LIFECYCLE_I,
- QUALIFIED_HTTP_SESSION_LISTENER,
- INTERFACES);
-
- createEventListenerRow(group,
- ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_H,
- QUALIFIED_HTTP_SESSION_ATTRIBUTE_LISTENER,
- INTERFACES);
-
- createEventListenerRow(group,
- ADD_LISTENER_WIZARD_SESSION_MIGRATION,
- QUALIFIED_HTTP_SESSION_ACTIVATION_LISTENER,
- INTERFACES);
-
- createEventListenerRow(group,
- ADD_LISTENER_WIZARD_OBJECT_BINDING,
- QUALIFIED_HTTP_SESSION_BINDING_LISTENER,
- INTERFACES);
- }
-
- private void createServletRequestEvents(Composite parent) {
- Group group = createGroup(parent, ADD_LISTENER_WIZARD_SERVLET_REQUEST_EVENTS);
-
- createEventListenerRow(group,
- ADD_LISTENER_WIZARD_LIFECYCLE_Y,
- QUALIFIED_SERVLET_REQUEST_LISTENER,
- INTERFACES);
-
- createEventListenerRow(group,
- ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_G,
- QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_LISTENER,
- INTERFACES);
- }
-
- private Group createGroup(Composite parent, String text) {
- Group group = new Group(parent, SWT.NONE);
-
- group.setLayout(new GridLayout(3, false));
- group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- group.setText(text);
-
- return group;
- }
-
- private void createEventListenerRow(Composite parent, String event, String listener, String property) {
- createCheckbox(parent, event, listener, property);
- createInterfaceIcon(parent);
- createInterfaceLabel(parent, listener);
- }
-
- private Button createCheckbox(Composite parent, String text, String value, String property) {
- Button button = new Button(parent, SWT.CHECK);
-
- button.setText(text);
- button.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, true));
- synchHelper.synchCheckbox(button, value, property, null);
-
- return button;
- }
-
- private Label createInterfaceIcon(Composite parent) {
- GridData data = new GridData();
- data.horizontalIndent = 50;
-
- Label label = new Label(parent, SWT.RIGHT);
- label.setImage(IMG_INTERFACE);
- label.setLayoutData(data);
-
- return label;
- }
-
- private Label createInterfaceLabel(Composite parent, String text) {
- Label label = new Label(parent, SWT.LEFT);
-
- label.setText(text);
-
- return label;
- }
-
- private void createSelectAllGroup(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(2, false));
- composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
- Button selectAll = new Button(composite, SWT.PUSH);
- selectAll.setText(SELECT_ALL_BUTTON);
- selectAll.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleSelectAll();
- }
- });
-
- Button clear = new Button(composite, SWT.PUSH);
- clear.setText(CLEAR_BUTTON);
- clear.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleSelectNone();
- }
- });
- }
-
- private void handleSelectAll() {
- List interfaces = (List) model.getProperty(INTERFACES);
- if (interfaces == null) {
- interfaces = new ArrayList();
- model.setProperty(INTERFACES, interfaces);
- }
-
- for (String iface : LISTENER_INTERFACES) {
- if (!interfaces.contains(iface)) {
- interfaces.add(iface);
- }
- }
-
- synchHelper.synchUIWithModel(INTERFACES, DataModelEvent.VALUE_CHG);
- model.notifyPropertyChange(INTERFACES, DataModelEvent.VALUE_CHG);
- }
-
- private void handleSelectNone() {
- List interfaces = (List) model.getProperty(INTERFACES);
- if (interfaces == null) {
- interfaces = new ArrayList();
- model.setProperty(INTERFACES, interfaces);
- }
-
- interfaces.removeAll(Arrays.asList(LISTENER_INTERFACES));
-
- synchHelper.synchUIWithModel(INTERFACES, DataModelEvent.VALUE_CHG);
- model.notifyPropertyChange(INTERFACES, DataModelEvent.VALUE_CHG);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizard.java
deleted file mode 100644
index b3a35d6..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizard.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Kaloyan Raev, kaloyan.raev@sap.com
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.IS_SERVLET_TYPE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_SERVLET_WIZARD_PAGE_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_SERVLET_WIZARD_WINDOW_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModelProvider;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * New servlet wizard
- */
-public class AddServletWizard extends NewWebArtifactWizard {
-
- public AddServletWizard() {
- this(null);
- }
-
- public AddServletWizard(IDataModel model) {
- super(model);
- }
-
- @Override
- protected String getTitle() {
- return ADD_SERVLET_WIZARD_WINDOW_TITLE;
- }
-
- @Override
- protected ImageDescriptor getImage() {
- return J2EEUIPlugin.getDefault().getImageDescriptor("newservlet_wiz"); //$NON-NLS-1$
- }
-
- @Override
- public void doAddPages() {
- NewServletClassWizardPage page1 = new NewServletClassWizardPage(
- getDataModel(),
- PAGE_ONE,
- NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC,
- ADD_SERVLET_WIZARD_PAGE_TITLE, J2EEProjectUtilities.DYNAMIC_WEB);
- page1.setInfopopID(IWebUIContextIds.WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_1);
- addPage(page1);
- AddServletWizardPage page2 = new AddServletWizardPage(getDataModel(), PAGE_TWO);
- page2.setInfopopID(IWebUIContextIds.WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_2);
- addPage(page2);
- NewServletClassOptionsWizardPage page3 = new NewServletClassOptionsWizardPage(
- getDataModel(),
- PAGE_THREE,
- NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC,
- ADD_SERVLET_WIZARD_PAGE_TITLE);
- page3.setInfopopID(IWebUIContextIds.WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_3);
- addPage(page3);
- }
-
- @Override
- protected void postPerformFinish() throws InvocationTargetException {
- boolean isServlet = getDataModel().getBooleanProperty(IS_SERVLET_TYPE);
- if (isServlet) {
- // open new servlet class in java editor
- openJavaClass();
- } else {
- // open new jsp file in jsp editor
- openWebFile();
- }
- }
-
- @Override
- protected IDataModelProvider getDefaultProvider() {
- return new NewServletClassDataModelProvider();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java
deleted file mode 100644
index 83fdc45..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- * Kaloyan Raev, kaloyan.raev@sap.com
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.INIT_PARAM;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.URL_MAPPINGS;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DESCRIPTION;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DISPLAY_NAME;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_BUTTON_LABEL_A;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_BUTTON_LABEL_D;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_SERVLET_WIZARD_PAGE_DESC;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_SERVLET_WIZARD_PAGE_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DESCRIPTION_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DESCRIPTION_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.EDIT_BUTTON_LABEL_E;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.EDIT_BUTTON_LABEL_T;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.INIT_PARAM_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.INIT_PARAM_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NAME_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NAME_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NO_WEB_PROJECTS;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.REMOVE_BUTTON_LABEL_R;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.REMOVE_BUTTON_LABEL_V;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.URL_MAPPINGS_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.URL_MAPPINGS_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.URL_PATTERN_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.URL_PATTERN_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.VALUE_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.VALUE_TITLE;
-import static org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties.PROJECT_NAME;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.j2ee.internal.wizard.StringArrayTableWizardSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * Servlet Wizard Setting Page
- */
-public class AddServletWizardPage extends DataModelWizardPage {
- final static String[] JSPEXTENSIONS = {"jsp"}; //$NON-NLS-1$
-
- private Text displayNameText;
-
- private StringArrayTableWizardSection urlSection;
-
- public AddServletWizardPage(IDataModel model, String pageName) {
- super(model, pageName);
- setDescription(ADD_SERVLET_WIZARD_PAGE_DESC);
- this.setTitle(ADD_SERVLET_WIZARD_PAGE_TITLE);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[] { DISPLAY_NAME, INIT_PARAM, URL_MAPPINGS };
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- composite.setLayout(new GridLayout());
- GridData data = new GridData(GridData.FILL_BOTH);
- data.widthHint = 300;
- composite.setLayoutData(data);
-
- createNameDescription(composite);
-
- StringArrayTableWizardSectionCallback callback = new StringArrayTableWizardSectionCallback();
- StringArrayTableWizardSection initSection = new StringArrayTableWizardSection(
- composite,
- INIT_PARAM_LABEL,
- INIT_PARAM_TITLE,
- ADD_BUTTON_LABEL_A,
- EDIT_BUTTON_LABEL_E,
- REMOVE_BUTTON_LABEL_R,
- new String[] { NAME_TITLE, VALUE_TITLE, DESCRIPTION_TITLE },
- new String[] { NAME_LABEL, VALUE_LABEL, DESCRIPTION_LABEL },
- null,// WebPlugin.getDefault().getImage("initializ_parameter"),
- model,
- INIT_PARAM);
- initSection.setCallback(callback);
- urlSection = new StringArrayTableWizardSection(
- composite,
- URL_MAPPINGS_LABEL,
- URL_MAPPINGS_TITLE,
- ADD_BUTTON_LABEL_D,
- EDIT_BUTTON_LABEL_T,
- REMOVE_BUTTON_LABEL_V,
- new String[] { URL_PATTERN_TITLE },
- new String[] { URL_PATTERN_LABEL },
- null,// WebPlugin.getDefault().getImage("url_type"),
- model,
- URL_MAPPINGS);
- urlSection.setCallback(callback);
-
- String text = displayNameText.getText();
- // Set default URL Pattern
- List input = new ArrayList();
- input.add(new String[]{"/" + text}); //$NON-NLS-1$
- if (urlSection != null)
- urlSection.setInput(input);
- displayNameText.setFocus();
-
- IStatus projectStatus = validateProjectName();
- if (!projectStatus.isOK()) {
- setErrorMessage(projectStatus.getMessage());
- composite.setEnabled(false);
- }
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- protected IStatus validateProjectName() {
- // check for empty
- if (model.getStringProperty(PROJECT_NAME) == null || model.getStringProperty(PROJECT_NAME).trim().length() == 0) {
- return WTPCommonPlugin.createErrorStatus(NO_WEB_PROJECTS);
- }
- return WTPCommonPlugin.OK_STATUS;
- }
-
- protected void createNameDescription(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- composite.setLayout(new GridLayout(2, false));
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- // display name
- Label displayNameLabel = new Label(composite, SWT.LEFT);
- displayNameLabel.setText(NAME_LABEL);
- displayNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- displayNameText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- displayNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- displayNameText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- String text = displayNameText.getText();
- // Set default URL Pattern
- List input = new ArrayList();
- input.add(new String[]{"/" + text}); //$NON-NLS-1$
- if (urlSection != null)
- urlSection.setInput(input);
- }
-
- });
- synchHelper.synchText(displayNameText, DISPLAY_NAME, null);
-
- // description
- Label descLabel = new Label(composite, SWT.LEFT);
- descLabel.setText(DESCRIPTION_LABEL);
- descLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- Text descText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- descText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(descText, DESCRIPTION, null);
- }
-
- public String getDisplayName() {
- return displayNameText.getText();
- }
-
- @Override
- public boolean canFlipToNextPage() {
- if (model.getBooleanProperty(USE_EXISTING_CLASS))
- return false;
- return super.canFlipToNextPage();
- }
-
- @Override
- protected boolean showValidationErrorsOnEnter() {
- return true;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AvailableWebLibProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AvailableWebLibProvider.java
deleted file mode 100644
index 8ce5e4a..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AvailableWebLibProvider.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import java.util.Arrays;
-import java.util.Comparator;
-
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.internal.archive.ArchiveWrapper;
-import org.eclipse.jst.j2ee.internal.wizard.AvailableJarsProvider;
-import org.eclipse.swt.graphics.Image;
-
-public class AvailableWebLibProvider implements IStructuredContentProvider, ITableLabelProvider {
-
- public AvailableWebLibProvider() {
- }
-
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof ArchiveWrapper) {
- Object[] array = ((ArchiveWrapper) inputElement).getWebLibs().toArray();
- Arrays.sort(array, new Comparator() {
- public int compare(Object o1, Object o2) {
- return getColumnText(o1, 0).compareTo(getColumnText(o2, 0));
- }
-
- });
- return array;
- }
- return new Object[0];
- }
-
- public Image getColumnImage(Object element, int columnIndex) {
- return AvailableJarsProvider.getUtilImage();
- }
-
- public String getColumnText(Object element, int columnIndex) {
- ArchiveWrapper wrapper = (ArchiveWrapper)element;
- return wrapper.getName();
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
- public void addListener(ILabelProviderListener listener) {
- }
-
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- public void removeListener(ILabelProviderListener listener) {
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java
deleted file mode 100644
index a6409d0..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.window.IShellProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-public class ConvertToWebModuleTypeDialog extends Dialog {
-
- private String fShellTitle = IWebWizardConstants.CONVERT_TO_WEB_TITLE;
- private String fLabelText = IWebWizardConstants.SELECT_WEB_VERSION;
- private static String fSelection= null;
- private String[] fAllowedStrings = new String[] {J2EEVersionConstants.VERSION_2_2_TEXT, J2EEVersionConstants.VERSION_2_3_TEXT, J2EEVersionConstants.VERSION_2_4_TEXT, J2EEVersionConstants.VERSION_2_5_TEXT, J2EEVersionConstants.VERSION_3_0_TEXT};
- private int fInitialSelectionIndex = fAllowedStrings.length-1;
-
- public static String getSelectedVersion() {
- return fSelection;
- }
-
- public ConvertToWebModuleTypeDialog(IShellProvider parentShell) {
- super(parentShell);
- }
-
- public ConvertToWebModuleTypeDialog(Shell parentShell) {
- super(parentShell);
- }
-
- @Override
- protected Control createDialogArea(Composite parent) {
- getShell().setText(fShellTitle);
-
- Composite composite = (Composite)super.createDialogArea(parent);
- Composite innerComposite = new Composite(composite, SWT.NONE);
- innerComposite.setLayoutData(new GridData());
- GridLayout gl= new GridLayout();
- gl.numColumns= 2;
- innerComposite.setLayout(gl);
-
- Label label= new Label(innerComposite, SWT.NONE);
- label.setText(fLabelText);
- label.setLayoutData(new GridData());
-
- final Combo combo= new Combo(innerComposite, SWT.READ_ONLY);
- for (int i = 0; i < fAllowedStrings.length; i++) {
- combo.add(fAllowedStrings[i]);
- }
- combo.select(fInitialSelectionIndex);
- fSelection= combo.getItem(combo.getSelectionIndex());
- GridData gd= new GridData();
- combo.setLayoutData(gd);
- combo.addSelectionListener(new SelectionAdapter(){
- @Override
- public void widgetSelected(SelectionEvent e) {
- fSelection= combo.getItem(combo.getSelectionIndex());
- }
- });
- return composite;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java
deleted file mode 100644
index 261d093..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.PROJECT;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.*;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.internal.web.operations.FilterMappingItem;
-import org.eclipse.jst.j2ee.internal.web.operations.IFilterMappingItem;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-
-public class FilterMappingsArrayTableWizardSection extends Composite implements IDataModelListener {
-
- protected class StringArrayListContentProvider implements IStructuredContentProvider {
- public boolean isDeleted(Object element) {
- return false;
- }
- public Object[] getElements(Object element) {
- if (element instanceof List) {
- return ((List<FilterMappingItem>) element).toArray();
- }
- return new Object[0];
- }
- public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) {
- //Default nothing
- }
- public void dispose() {
- //Default nothing
- }
- }
- protected class StringArrayListLabelProvider extends LabelProvider implements ITableLabelProvider {
- private final Image URL_PATTERN_ICON =
- ImageDescriptor.createFromURL((URL) WebPlugin.getDefault().getImage("url_mapping")).createImage(); //$NON-NLS-1$
- private final Image SERVLET_ICON =
- ImageDescriptor.createFromURL((URL) WebPlugin.getDefault().getImage("servlet")).createImage(); //$NON-NLS-1$
-
- public Image getColumnImage(Object element, int columnIndex) {
- if (columnIndex == 0) {
- FilterMappingItem item = (FilterMappingItem) element;
- if (item.isServletNameType()) {
- return SERVLET_ICON;
- } else if (item.isUrlPatternType()) {
- return URL_PATTERN_ICON;
- }
-
- }
- return null;
- }
-
- public String getColumnText(Object element, int columnIndex) {
- if (columnIndex == 1) {
- return ((FilterMappingItem) element).getName();
- } else if (columnIndex == 2) {
- return ((FilterMappingItem) element).getDispatchersAsString();
- }
- return null;
- }
-
- }
-
- final static int ICON_WIDTH = 25;
- final static int DISPATCHERS_WIDTH = 100;
- private final static String ICON_PROP = "ICON_PROP"; //$NON-NLS-1$
- private final static String NAME_PROP = "NAME_PROP"; //$NON-NLS-1$
- private final static String DISPATCHERS_PROP = "DISPATCHERS_PROP"; //$NON-NLS-1$
-
- private TableViewer viewer;
- private Button addButton;
- private Button editButton;
- private Button removeButton;
- private IDataModel model;
- private String propertyName;
-
- public FilterMappingsArrayTableWizardSection(Composite parent, IDataModel model, String propertyName) {
- super(parent, SWT.NONE);
-
- this.model = model;
- this.propertyName = propertyName;
- model.addListener(this);
-
- GridLayout layout = new GridLayout(2, false);
- layout.marginHeight = 4;
- layout.marginWidth = 0;
- this.setLayout(layout);
- this.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Label titleLabel = new Label(this, SWT.LEFT);
- titleLabel.setText(FILTER_MAPPINGS_LABEL);
- GridData data = new GridData();
- data.horizontalSpan = 2;
- titleLabel.setLayoutData(data);
-
- Table table = new Table(this, SWT.FULL_SELECTION | SWT.BORDER);
- viewer = new TableViewer(table);
- table.setLayoutData(new GridData(GridData.FILL_BOTH));
- viewer.setContentProvider(new StringArrayListContentProvider());
- viewer.setLabelProvider(new StringArrayListLabelProvider());
-
- final Composite buttonCompo = new Composite(this, SWT.NULL);
- layout = new GridLayout();
- layout.marginHeight = 0;
- buttonCompo.setLayout(layout);
- buttonCompo.setLayoutData(new GridData(GridData.FILL_VERTICAL | GridData.VERTICAL_ALIGN_BEGINNING));
-
- addButton = new Button(buttonCompo, SWT.PUSH);
- addButton.setText(ADD_BUTTON_LABEL_D);
- addButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
- addButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent event) {
- handleAddButtonSelected();
- }
- public void widgetDefaultSelected(SelectionEvent event) {
- //Do nothing
- }
- });
-
- editButton = new Button(buttonCompo, SWT.PUSH);
- editButton.setText(EDIT_BUTTON_LABEL_T);
- editButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
- editButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent event) {
- handleEditButtonSelected();
- }
- public void widgetDefaultSelected(SelectionEvent event) {
- //Do nothing
- }
- });
- editButton.setEnabled(false);
-
- removeButton = new Button(buttonCompo, SWT.PUSH);
- removeButton.setText(REMOVE_BUTTON_LABEL_V);
- removeButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
- removeButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent event) {
- handleRemoveButtonSelected();
- }
- public void widgetDefaultSelected(SelectionEvent event) {
- //Do nothing
- }
- });
- removeButton.setEnabled(false);
-
- viewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- ISelection selection = event.getSelection();
- if (editButton != null) {
- boolean enabled = ((IStructuredSelection) selection).size() == 1;
- editButton.setEnabled(enabled);
- }
- removeButton.setEnabled(!selection.isEmpty());
- }
- });
-
- if (editButton != null) {
- viewer.addDoubleClickListener(new IDoubleClickListener() {
- public void doubleClick(DoubleClickEvent event) {
- handleEditButtonSelected();
- }
- });
- }
-
- TableColumn tableColumn = new TableColumn(table, SWT.NONE);
- tableColumn.setWidth(ICON_WIDTH);
- tableColumn.setResizable(false);
- tableColumn = new TableColumn(table, SWT.NONE);
- tableColumn.setText(URL_SERVLET_LABEL);
- tableColumn.setResizable(true);
- tableColumn = new TableColumn(table, SWT.NONE);
- tableColumn.setText(DISPATCHERS_LABEL);
- tableColumn.setWidth(DISPATCHERS_WIDTH);
- tableColumn.setResizable(false);
- viewer.setColumnProperties(new String[] {ICON_PROP, NAME_PROP, DISPATCHERS_PROP});
- table.setHeaderVisible(true);
- this.addControlListener(new ControlAdapter() {
- @Override
- public void controlResized(ControlEvent e) {
- Table table = viewer.getTable();
- TableColumn[] columns = table.getColumns();
- Point buttonArea = buttonCompo.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- Rectangle area = table.getParent().getClientArea();
- Point preferredSize = viewer.getTable().computeSize(SWT.DEFAULT, SWT.DEFAULT);
- int width = area.width - 2*table.getBorderWidth() - buttonArea.x - columns.length*2;
- if (preferredSize.y > area.height + table.getHeaderHeight()) {
- // Subtract the scrollbar width from the total column width
- // if a vertical scrollbar will be required
- Point vBarSize = table.getVerticalBar().getSize();
- width -= vBarSize.x;
- }
- Point oldSize = table.getSize();
- for (int i=0; i < columns.length; i++) {
- if (oldSize.x > area.width) {
- // table is getting smaller so make the columns
- // smaller first and then resize the table to
- // match the client area width
- if (i == 1) columns[i].setWidth(width - ICON_WIDTH - DISPATCHERS_WIDTH);
- table.setSize(area.width - buttonArea.x - columns.length*2, area.height);
- } else {
- // table is getting bigger so make the table
- // bigger first and then make the columns wider
- // to match the client area width
- table.setSize(area.width - buttonArea.x - columns.length*2, area.height);
- if (i == 1) columns[i].setWidth(width - ICON_WIDTH - DISPATCHERS_WIDTH);
- }
- }
- }
- });
-
- viewer.setInput(model.getProperty(propertyName));
- }
-
- private void handleAddButtonSelected() {
- String title = WebAppEditResourceHandler.getString("Add_Filter_Mapping_Title_UI_"); //$NON-NLS-1$
- IProject p = (IProject) model.getProperty(PROJECT);
- List valueList = (List) viewer.getInput();
- AddEditFilterMappingDialog dialog =
- new AddEditFilterMappingDialog(getShell(), title, p, valueList, null);
- dialog.open();
- Object[] result = dialog.getResult();
-
- addFilterMapping((result != null && result.length > 0) ? (IFilterMappingItem) result[0] : null);
- }
-
- private void handleEditButtonSelected() {
- String title = WebAppEditResourceHandler.getString("Edit_Filter_Mapping_Title_UI_"); //$NON-NLS-1$
- ISelection s = viewer.getSelection();
- if (!(s instanceof IStructuredSelection))
- return;
- IStructuredSelection selection = (IStructuredSelection) s;
- if (selection.size() != 1)
- return;
- List valueList = (List) viewer.getInput();
- Object selectedObj = selection.getFirstElement();
- FilterMappingItem value = (FilterMappingItem) selectedObj;
- IProject p = (IProject) model.getProperty(PROJECT);
- AddEditFilterMappingDialog dialog =
- new AddEditFilterMappingDialog(getShell(), title, p, valueList, value);
- dialog.open();
- Object[] result = dialog.getResult();
- if (result == null || result.length == 0) return;
- editFilterMapping(value, (IFilterMappingItem) result[0]);
- }
-
- private void handleRemoveButtonSelected() {
- ISelection selection = viewer.getSelection();
- if (selection.isEmpty() || !(selection instanceof IStructuredSelection))
- return;
- List selectedObj = ((IStructuredSelection) selection).toList();
- removeFilterMappings(selectedObj);
- }
-
- private void addFilterMapping(IFilterMappingItem filterMapping) {
- if (filterMapping == null) return;
- List valueList = (List) viewer.getInput();
- if (valueList == null) {
- valueList = new ArrayList();
- }
- valueList.add(filterMapping);
- setInput(valueList);
- }
-
- private void editFilterMapping(IFilterMappingItem oldFilterMapping, IFilterMappingItem newFilterMapping) {
- if (newFilterMapping == null) return;
- List valueList = (List) viewer.getInput();
- if (valueList == null) {
- valueList = new ArrayList();
- }
- int index = valueList.indexOf(oldFilterMapping);
- if (index == -1) {
- valueList.add(newFilterMapping);
- } else {
- valueList.set(index, newFilterMapping);
- }
-
- setInput(valueList);
- }
-
- private void removeFilterMappings(Collection selectedFilterMappings) {
- List valueList = (List) viewer.getInput();
- valueList.removeAll(selectedFilterMappings);
- setInput(valueList);
- }
-
- public void setInput(List input) {
- viewer.setInput(input);
- // Create a new list to trigger property change
- List newInput = new ArrayList();
- newInput.addAll(input);
- model.setProperty(propertyName, newInput);
- }
-
- public List getInput() {
- List valueList = (List) viewer.getInput();
- if (valueList == null) {
- valueList = new ArrayList();
- }
- return valueList;
- }
-
- public void propertyChanged(DataModelEvent event) {
- if (this.propertyName.equals(event.getPropertyName())) {
- viewer.setInput(event.getProperty());
- }
- }
-
- @Override
- public void dispose() {
- model.removeListener(this);
- super.dispose();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java
deleted file mode 100644
index 8b052af..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-
-public interface IWebWizardConstants {
-
- // AddServletWizard
- public final static String ADD_SERVLET_WIZARD_WINDOW_TITLE = WEBUIMessages.ADD_SERVLET_WIZARD_WINDOW_TITLE;
- public final static String ADD_SERVLET_WIZARD_PAGE_TITLE = WEBUIMessages.ADD_SERVLET_WIZARD_PAGE_TITLE;
- public final static String ADD_SERVLET_WIZARD_PAGE_DESC = WEBUIMessages.ADD_SERVLET_WIZARD_PAGE_DESC;
-
- public final static String DEFAULT_PACKAGE = WEBUIMessages.DEFAULT_PACKAGE;
- public final static String SELECT_CLASS_TITLE = WEBUIMessages.SELECT_CLASS_TITLE;
- public final static String MAP_CLASS_NAME_TO_CLASS_ERROR_MSG = WEBUIMessages.MAP_CLASS_NAME_TO_CLASS_ERROR_MSG;
- public final static String EMPTY_LIST_MSG = WEBUIMessages.EMPTY_LIST_MSG;
- public final static String ADD_LABEL = WEBUIMessages.ADD_LABEL;
- public final static String USE_EXISTING_SERVLET_CLASS = WEBUIMessages.USE_EXISTING_SERVLET_CLASS;
- public final static String INIT_PARAM_TITLE = WEBUIMessages.INIT_PARAM_TITLE;
- public final static String INIT_PARAM_LABEL = WEBUIMessages.INIT_PARAM_LABEL;
- public final static String URL_MAPPINGS_TITLE = WEBUIMessages.URL_MAPPINGS_TITLE;
- public final static String URL_MAPPINGS_LABEL = WEBUIMessages.URL_MAPPINGS_LABEL;
- public final static String CHOOSE_SERVLET_CLASS = WEBUIMessages.CHOOSE_SERVLET_CLASS;
-
- // NewServletWizard
- public final static String NEW_SERVLET_WIZARD_WINDOW_TITLE = WEBUIMessages.NEW_SERVLET_WIZARD_WINDOW_TITLE;
- public final static String NEW_SERVLET_WIZARD_PAGE_TITLE = WEBUIMessages.NEW_SERVLET_WIZARD_PAGE_TITLE;
- public final static String NEW_SERVLET_WIZARD_PAGE_DESC = WEBUIMessages.NEW_SERVLET_WIZARD_PAGE_DESC;
- public final static String SERVLET_PACKAGE_LABEL = WEBUIMessages.SERVLET_PACKAGE_LABEL;
- public final static String SERVLET_NAME_LABEL = WEBUIMessages.SERVLET_NAME_LABEL;
-
- // AddFilterWizard
- public final static String ADD_FILTER_WIZARD_WINDOW_TITLE = WEBUIMessages.ADD_FILTER_WIZARD_WINDOW_TITLE;
- public final static String ADD_FILTER_WIZARD_PAGE_TITLE = WEBUIMessages.ADD_FILTER_WIZARD_PAGE_TITLE;
- public final static String ADD_FILTER_WIZARD_PAGE_DESC = WEBUIMessages.ADD_FILTER_WIZARD_PAGE_DESC;
-
- public final static String USE_EXISTING_FILTER_CLASS = WEBUIMessages.USE_EXISTING_FILTER_CLASS;
- public final static String CHOOSE_FILTER_CLASS = WEBUIMessages.CHOOSE_FILTER_CLASS;
- public final static String SERVLET_MAPPINGS_LABEL = WEBUIMessages.SERVLET_MAPPINGS_LABEL;
- public final static String FILTER_MAPPINGS_LABEL = WEBUIMessages.FILTER_MAPPINGS_LABEL;
- public final static String URL_SERVLET_LABEL = WEBUIMessages.URL_SERVLET_LABEL;
- public final static String DISPATCHERS_LABEL = WEBUIMessages.DISPATCHERS_LABEL;
-
- public static String REQUEST = WEBUIMessages.DISPATCHER_REQUEST;
- public static String FORWARD = WEBUIMessages.DISPATCHER_FORWARD;
- public static String INCLUDE = WEBUIMessages.DISPATCHER_INCLUDE;
- public static String ERROR = WEBUIMessages.DISPATCHER_ERROR;
-
- // NewFilterWizard
- public final static String NEW_FILTER_WIZARD_WINDOW_TITLE = WEBUIMessages.NEW_FILTER_WIZARD_WINDOW_TITLE;
-
- // AddListenerWizard
- public final static String ADD_LISTENER_WIZARD_WINDOW_TITLE = WEBUIMessages.ADD_LISTENER_WIZARD_WINDOW_TITLE;
- public final static String ADD_LISTENER_WIZARD_PAGE_TITLE = WEBUIMessages.ADD_LISTENER_WIZARD_PAGE_TITLE;
- public final static String ADD_LISTENER_WIZARD_PAGE_DESC = WEBUIMessages.ADD_LISTENER_WIZARD_PAGE_DESC;
-
- public final static String USE_EXISTING_LISTENER_CLASS = WEBUIMessages.USE_EXISTING_LISTENER_CLASS;
- public final static String ADD_LISTENER_WIZARD_SERVLET_CONTEXT_EVENTS = WEBUIMessages.ADD_LISTENER_WIZARD_SERVLET_CONTEXT_EVENTS;
- public final static String ADD_LISTENER_WIZARD_HTTP_SESSION_EVENTS = WEBUIMessages.ADD_LISTENER_WIZARD_HTTP_SESSION_EVENTS;
- public final static String ADD_LISTENER_WIZARD_SERVLET_REQUEST_EVENTS = WEBUIMessages.ADD_LISTENER_WIZARD_SERVLET_REQUEST_EVENTS;
- public final static String ADD_LISTENER_WIZARD_LIFECYCLE = WEBUIMessages.ADD_LISTENER_WIZARD_LIFECYCLE;
- public final static String ADD_LISTENER_WIZARD_LIFECYCLE_L = WEBUIMessages.ADD_LISTENER_WIZARD_LIFECYCLE_L;
- public final static String ADD_LISTENER_WIZARD_LIFECYCLE_I = WEBUIMessages.ADD_LISTENER_WIZARD_LIFECYCLE_I;
- public final static String ADD_LISTENER_WIZARD_LIFECYCLE_Y = WEBUIMessages.ADD_LISTENER_WIZARD_LIFECYCLE_Y;
- public final static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES = WEBUIMessages.ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES;
- public final static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_C = WEBUIMessages.ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_C;
- public final static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_H = WEBUIMessages.ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_H;
- public final static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_G = WEBUIMessages.ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_G;
- public final static String ADD_LISTENER_WIZARD_SESSION_MIGRATION = WEBUIMessages.ADD_LISTENER_WIZARD_SESSION_MIGRATION;
- public final static String ADD_LISTENER_WIZARD_OBJECT_BINDING = WEBUIMessages.ADD_LISTENER_WIZARD_OBJECT_BINDING;
-
- // common
- public final static String ADD_BUTTON_LABEL = WEBUIMessages.ADD_BUTTON_LABEL;
- public final static String ADD_BUTTON_LABEL_A = WEBUIMessages.ADD_BUTTON_LABEL_A;
- public final static String ADD_BUTTON_LABEL_D = WEBUIMessages.ADD_BUTTON_LABEL_D;
- public final static String EDIT_BUTTON_LABEL = WEBUIMessages.EDIT_BUTTON_LABEL;
- public final static String EDIT_BUTTON_LABEL_E = WEBUIMessages.EDIT_BUTTON_LABEL_E;
- public final static String EDIT_BUTTON_LABEL_T = WEBUIMessages.EDIT_BUTTON_LABEL_T;
- public final static String REMOVE_BUTTON_LABEL = WEBUIMessages.REMOVE_BUTTON_LABEL;
- public final static String REMOVE_BUTTON_LABEL_R = WEBUIMessages.REMOVE_BUTTON_LABEL_R;
- public final static String REMOVE_BUTTON_LABEL_V = WEBUIMessages.REMOVE_BUTTON_LABEL_V;
- public final static String URL_PATTERN_TITLE = WEBUIMessages.URL_PATTERN_TITLE;
- public final static String URL_PATTERN_LABEL = WEBUIMessages.URL_PATTERN_LABEL;
- public final static String FOLDER_LABEL = WEBUIMessages.FOLDER_LABEL;
- public final static String JAVA_PACKAGE_LABEL = WEBUIMessages.JAVA_PACKAGE_LABEL;
- public final static String CLASS_NAME_LABEL = WEBUIMessages.CLASS_NAME_LABEL;
- public final static String SUPERCLASS_LABEL = WEBUIMessages.SUPERCLASS_LABEL;
- public final static String CONTAINER_SELECTION_DIALOG_TITLE = WEBUIMessages.CONTAINER_SELECTION_DIALOG_TITLE;
- public final static String CONTAINER_SELECTION_DIALOG_DESC = WEBUIMessages.CONTAINER_SELECTION_DIALOG_DESC;
- public final static String CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG = WEBUIMessages.CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG;
- public final static String PACKAGE_SELECTION_DIALOG_TITLE = WEBUIMessages.PACKAGE_SELECTION_DIALOG_TITLE;
- public final static String PACKAGE_SELECTION_DIALOG_DESC = WEBUIMessages.PACKAGE_SELECTION_DIALOG_DESC;
- public final static String PACKAGE_SELECTION_DIALOG_MSG_NONE = WEBUIMessages.PACKAGE_SELECTION_DIALOG_MSG_NONE;
- public final static String SUPERCLASS_SELECTION_DIALOG_TITLE = WEBUIMessages.SUPERCLASS_SELECTION_DIALOG_TITLE;
- public final static String SUPERCLASS_SELECTION_DIALOG_DESC = WEBUIMessages.SUPERCLASS_SELECTION_DIALOG_DESC;
- public final static String INTERFACE_SELECTION_DIALOG_TITLE = WEBUIMessages.INTERFACE_SELECTION_DIALOG_TITLE;
- public final static String INTERFACE_SELECTION_DIALOG_DESC = WEBUIMessages.INTERFACE_SELECTION_DIALOG_DESC;
- public final static String INTERFACE_SELECTION_DIALOG_MSG_NONE = WEBUIMessages.INTERFACE_SELECTION_DIALOG_MSG_NONE;
- public final static String JAVA_CLASS_MODIFIERS_LABEL = WEBUIMessages.JAVA_CLASS_MODIFIERS_LABEL;
- public final static String JAVA_CLASS_INTERFACES_LABEL = WEBUIMessages.JAVA_CLASS_INTERFACES_LABEL;
- public final static String JAVA_CLASS_METHOD_STUBS_LABEL = WEBUIMessages.JAVA_CLASS_METHOD_STUBS_LABEL;
- public final static String JAVA_CLASS_PUBLIC_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_PUBLIC_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_FINAL_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_FINAL_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_MAIN_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_MAIN_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_INHERIT_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_INHERIT_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_BROWER_DIALOG_TITLE = WEBUIMessages.JAVA_CLASS_BROWER_DIALOG_TITLE;
- public final static String JAVA_CLASS_BROWER_DIALOG_MESSAGE = WEBUIMessages.JAVA_CLASS_BROWER_DIALOG_MESSAGE;
-
- public final static String NAME_TITLE = WEBUIMessages.NAME_TITLE;
- public final static String NAME_LABEL = WEBUIMessages.NAME_LABEL;
- public final static String DESCRIPTION_TITLE = WEBUIMessages.DESCRIPTION_TITLE;
- public final static String DESCRIPTION_LABEL = WEBUIMessages.DESCRIPTION_LABEL;
- public final static String VALUE_TITLE = WEBUIMessages.VALUE_TITLE;
- public final static String VALUE_LABEL = WEBUIMessages.VALUE_LABEL;
- public final static String EMPTY_STRING = ""; //$NON-NLS-1$
- public final static String BROWSE_BUTTON_LABEL = WEBUIMessages.BROWSE_BUTTON_LABEL;
- public static final String REMOVE_BUTTON = WEBUIMessages.REMOVE_BUTTON;
- public final static String SELECT_ALL_BUTTON = WEBUIMessages.SELECT_ALL_BUTTON;
- public final static String CLEAR_BUTTON = WEBUIMessages.CLEAR_BUTTON;
-
-
- public final static String NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC = WEBUIMessages.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC;
- public final static String NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC = WEBUIMessages.NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC;
-
- public final static String ImportWARAction_UI_ = WEBUIMessages.ImportWARAction_UI_;
- public final static String ExportWARAction_UI_ = WEBUIMessages.ExportWARAction_UI_;
-
- public final static String NO_WEB_PROJECTS = WEBUIMessages.NO_WEB_PROJECTS;
-
- public static final String SERVLETS = WEBUIMessages.SERVLETS;
-
- public static final String CONVERT_TO_WEB_TITLE = WEBUIMessages.ConvertToWebTitle;
- public static final String SELECT_WEB_VERSION = WEBUIMessages.SelectWebVersion;
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java
deleted file mode 100644
index 4565ebe..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java
+++ /dev/null
@@ -1,691 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Kaloyan Raev, kaloyan.raev@sap.com
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DEFAULT_PACKAGE;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.j2ee.internal.dialogs.FilteredFileSelectionDialog;
-import org.eclipse.jst.j2ee.internal.dialogs.TwoArrayQuickSorter;
-import org.eclipse.jst.j2ee.internal.dialogs.TypedFileViewerFilter;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.part.PageBook;
-
-/**
- * Insert the type's description here.
- * Creation date: (7/30/2001 11:16:36 AM)
- */
-public class MultiSelectFilteredFileSelectionDialog extends
- FilteredFileSelectionDialog implements SelectionListener {
-
-
- private static class PackageRenderer extends LabelProvider {
- private final Image PACKAGE_ICON = JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKAGE);
-
- @Override
- public String getText(Object element) {
- IType type = (IType) element;
- String p = type.getPackageFragment().getElementName();
- if ("".equals(p)) //$NON-NLS-1$
- p = DEFAULT_PACKAGE;
- return (p + " - " + type.getPackageFragment().getParent().getPath().toString()); //$NON-NLS-1$
- }
- @Override
- public Image getImage(Object element) {
- return PACKAGE_ICON;
- }
- }
-
- private static class TypeRenderer extends LabelProvider {
- private final Image CLASS_ICON = JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_CLASS);
-
- @Override
- public String getText(Object element) {
- IType e = ((IType) element);
- return e.getElementName();
- }
-
- @Override
- public Image getImage(Object element) {
- return CLASS_ICON;
- }
-
- }
- public final static int JSP = 0;
- public final static int SERVLET = 1;
- protected Button fServletButton;
- protected Button fJSPButton;
- protected int fSelection = -1;
- protected PageBook fPageBook = null;
- protected Control fJspControl = null;
- protected Control fServletControl = null;
- protected Composite fChild = null;
- // construction parameters
- protected IRunnableContext fRunnableContext;
- protected ILabelProvider fElementRenderer;
- protected ILabelProvider fQualifierRenderer;
- private Object[] fElements;
- private boolean fIgnoreCase = true;
- private String fUpperListLabel;
- private String fLowerListLabel;
- // SWT widgets
- private Table fUpperList;
- private Table fLowerList;
- protected Text fText;
- private IType[] fIT;
- private String[] fRenderedStrings;
- private int[] fElementMap;
- private Integer[] fQualifierMap;
- private Object fInput;
-
- private ISelectionStatusValidator fLocalValidator = null;
- /**
- * MultiSelectFilteredFileSelectionDialog constructor comment.
- * @param parent Shell
- * @param title String
- * @param message String
- * @parent extensions String[]
- * @param allowMultiple boolean
- */
- public MultiSelectFilteredFileSelectionDialog(Shell parent, String title, String message, String[] extensions, boolean allowMultiple, IProject project) {
- super(parent, title, message, extensions, allowMultiple);
- setShellStyle(SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL | SWT.RESIZE);
-
- if (title == null)
- setTitle(WebAppEditResourceHandler.getString("File_Selection_UI_")); //$NON-NLS-1$
- if (message == null)
- {
- setMessage(WebAppEditResourceHandler.getString("Select_a_file__UI_")); //$NON-NLS-1$
- }
- fLocalValidator = new SimpleTypedElementSelectionValidator(new Class[] { IFile.class }, allowMultiple);
- setValidator(fLocalValidator);
-
- //StatusInfo currStatus = new StatusInfo();
- //currStatus.setOK();
- Status currStatus = new Status(Status.OK, ServletUIPlugin.PLUGIN_ID, Status.OK, "", null);//$NON-NLS-1$
-
- updateStatus(currStatus);
- fElementRenderer = new TypeRenderer();
- fQualifierRenderer = new PackageRenderer();
- fRunnableContext = ServletUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
- try {
- IJavaElement jelem = null;
- IProject proj = null;
- jelem = (IJavaElement) project.getAdapter(IJavaElement.class);
- if (jelem == null) {
- IResource resource = (IResource) project.getAdapter(IResource.class);
- if (resource != null) {
- proj = resource.getProject();
- if (proj != null) {
- jelem = org.eclipse.jdt.core.JavaCore.create(proj);
- }
- }
- }
- if(jelem != null){
- IJavaProject jp = jelem.getJavaProject();
-
- IType servletType = jp.findType(QUALIFIED_SERVLET);
- ArrayList servletClasses = new ArrayList();
- if (servletType != null)
- {
- ITypeHierarchy tH = servletType.newTypeHierarchy(jp, null);
- IType[] types = tH.getAllSubtypes(servletType);
- for (int i = 0; i < types.length; i++) {
- if (types[i].isClass() && !servletClasses.contains(types[i]))
- servletClasses.add(types[i]);
- }
- }
- fIT = (IType[]) servletClasses.toArray(new IType[servletClasses.size()]);
- servletClasses = null;
- }
- } catch (Exception e) {
- ServletUIPlugin.log(e);
- }
- }
-
- /**
- * @private
- */
- @Override
- protected void computeResult() {
- if (fSelection == JSP) {
- super.computeResult();
- } else {
- IType type = (IType) getWidgetSelection();
- if (type != null) {
- java.util.List result = new ArrayList(1);
- result.add(type);
- setResult(result);
- }
- }
- }
-
- @Override
- public void create() {
- super.create();
- fText.setFocus();
- rematch(""); //$NON-NLS-1$
- updateOkState();
- }
-
- /**
- * Creates and returns the contents of this dialog's
- * button bar.
- * <p>
- * The <code>Dialog</code> implementation of this framework method
- * lays out a button bar and calls the <code>createButtonsForButtonBar</code>
- * framework method to populate it. Subclasses may override.
- * </p>
- *
- * @param parent the parent composite to contain the button bar
- * @return the button bar control
- */
- @Override
- protected Control createButtonBar(Composite parent) {
-
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
-
- layout.numColumns = 2;
-
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Composite composite2 = new Composite(composite, SWT.NONE);
-
- // create a layout with spacing and margins appropriate for the font size.
- layout = new GridLayout();
- layout.numColumns = 0; // this is incremented by createButton
- layout.makeColumnsEqualWidth = true;
- layout.marginWidth = convertHorizontalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.HORIZONTAL_MARGIN);
- layout.marginHeight = convertVerticalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.VERTICAL_MARGIN);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.HORIZONTAL_SPACING);
- layout.verticalSpacing = convertVerticalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.VERTICAL_SPACING);
-
- composite2.setLayout(layout);
-
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.VERTICAL_ALIGN_CENTER);
- composite2.setLayoutData(data);
-
- composite2.setFont(parent.getFont());
-
- // Add the buttons to the button bar.
- super.createButtonsForButtonBar(composite2);
-
- return composite;
- }
-
- /*
- * @private
- */
- @Override
- protected Control createDialogArea(Composite parent) {
- GridData gd = new GridData();
-
- fChild = new Composite(parent, SWT.NONE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(fChild, "com.ibm.etools.webapplicationedit.webx2010"); //$NON-NLS-1$
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- gl.marginHeight = 0;
- fChild.setLayout(gl);
-
- gd.verticalAlignment = GridData.FILL;
- gd.grabExcessVerticalSpace = true;
- fChild.setLayoutData(gd);
-
- // Create the Web Type radio buttons and text fields.
- fServletButton = new Button(fChild, SWT.RADIO);
- fServletButton.setText(WebAppEditResourceHandler.getString("Servlet_UI_")); //$NON-NLS-1$ = Servlet
- gd = new GridData();
- fServletButton.setLayoutData(gd);
- fServletButton.addSelectionListener(this);
-
- fJSPButton = new Button(fChild, SWT.RADIO);
- fJSPButton.setText(WebAppEditResourceHandler.getString("JSP_UI_")); //$NON-NLS-1$ = JSP
- gd = new GridData();
- fJSPButton.setLayoutData(gd);
- fJSPButton.addSelectionListener(this);
-
- if (fSelection == JSP)
- fJSPButton.setSelection(true);
- else {
- fServletButton.setSelection(true);
- fSelection = SERVLET;
- }
-
- fPageBook = new PageBook(fChild, SWT.NONE);
- gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.verticalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = true;
- gd.grabExcessVerticalSpace = true;
- gd.horizontalSpan = 2;
- fPageBook.setLayoutData(gd);
- fJspControl = super.createDialogArea(fPageBook);
-
- Composite composite = new Composite(fPageBook, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
-
- Label messageLabel = new Label(composite, SWT.NONE);
- gd = new GridData();
- messageLabel.setLayoutData(gd);
- messageLabel.setText(WebAppEditResourceHandler.getString("Choose_a_servlet__1")); //$NON-NLS-1$
-
- fText = createText(composite);
-
- messageLabel = new Label(composite, SWT.NONE);
- gd = new GridData();
- messageLabel.setLayoutData(gd);
- messageLabel.setText(WebAppEditResourceHandler.getString("Matching_servlets__2")); //$NON-NLS-1$
-
- fUpperList = createUpperList(composite);
-
- messageLabel = new Label(composite, SWT.NONE);
- gd = new GridData();
- messageLabel.setLayoutData(gd);
- messageLabel.setText(WebAppEditResourceHandler.getString("Qualifier__3")); //$NON-NLS-1$
-
- fLowerList = createLowerList(composite);
-
- fServletControl = composite;
-
- if (fSelection == JSP)
- fPageBook.showPage(fJspControl);
- else
- fPageBook.showPage(fServletControl);
- return parent;
- }
-
- /**
- * Creates the list widget and sets layout data.
- * @return org.eclipse.swt.widgets.List
- */
- private Table createLowerList(Composite parent) {
- if (fLowerListLabel != null)
- (new Label(parent, SWT.NONE)).setText(fLowerListLabel);
-
- Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- list.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event evt) {
- handleLowerSelectionChanged();
- }
- });
- list.addListener(SWT.MouseDoubleClick, new Listener() {
- public void handleEvent(Event evt) {
- handleLowerDoubleClick();
- }
- });
- list.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- fQualifierRenderer.dispose();
- }
- });
- GridData spec = new GridData();
- spec.widthHint = convertWidthInCharsToPixels(50);
- spec.heightHint = convertHeightInCharsToPixels(5);
- spec.grabExcessVerticalSpace = true;
- spec.grabExcessHorizontalSpace = true;
- spec.horizontalAlignment = GridData.FILL;
- spec.verticalAlignment = GridData.FILL;
- list.setLayoutData(spec);
- return list;
- }
-
- /**
- * Creates the text widget and sets layout data.
- * @return org.eclipse.swt.widgets.Text
- */
- private Text createText(Composite parent) {
- Text text = new Text(parent, SWT.BORDER);
- GridData spec = new GridData();
- spec.grabExcessVerticalSpace = false;
- spec.grabExcessHorizontalSpace = true;
- spec.horizontalAlignment = GridData.FILL;
- spec.verticalAlignment = GridData.BEGINNING;
- text.setLayoutData(spec);
- Listener l = new Listener() {
- public void handleEvent(Event evt) {
- rematch(fText.getText());
- }
- };
- text.addListener(SWT.Modify, l);
- return text;
- }
-
- /**
- * Creates the list widget and sets layout data.
- * @return org.eclipse.swt.widgets.List
- */
- private Table createUpperList(Composite parent) {
- if (fUpperListLabel != null)
- (new Label(parent, SWT.NONE)).setText(fUpperListLabel);
-
- Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- list.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event evt) {
- handleUpperSelectionChanged();
- }
- });
- list.addListener(SWT.MouseDoubleClick, new Listener() {
- public void handleEvent(Event evt) {
- handleUpperDoubleClick();
- }
- });
- list.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- fElementRenderer.dispose();
- }
- });
- GridData spec = new GridData();
- spec.widthHint = convertWidthInCharsToPixels(50);
- spec.heightHint = convertHeightInCharsToPixels(15);
- spec.grabExcessVerticalSpace = true;
- spec.grabExcessHorizontalSpace = true;
- spec.horizontalAlignment = GridData.FILL;
- spec.verticalAlignment = GridData.FILL;
- list.setLayoutData(spec);
- return list;
- }
-
- /**
- * @return the ID of the button that is 'pressed' on doubleClick in the lists.
- * By default it is the OK button.
- * Override to change this setting.
- */
- protected int getDefaultButtonID() {
- return IDialogConstants.OK_ID;
- }
-
- public int getSelectedItem() {
- return fSelection;
- }
-
- protected Object getWidgetSelection() {
- int i = fLowerList.getSelectionIndex();
- if (fQualifierMap != null) {
- if (fQualifierMap.length == 1)
- i = 0;
- if (i < 0) {
- return null;
- }
- Integer index = fQualifierMap[i];
- return fElements[index.intValue()];
- }
- return null;
- }
-
- protected final void handleLowerDoubleClick() {
- if (getWidgetSelection() != null)
- buttonPressed(getDefaultButtonID());
- }
-
- protected final void handleLowerSelectionChanged() {
- updateOkState();
- }
-
- protected final void handleUpperDoubleClick() {
- if (getWidgetSelection() != null)
- buttonPressed(getDefaultButtonID());
- }
-
- protected final void handleUpperSelectionChanged() {
- int selection = fUpperList.getSelectionIndex();
- if (selection >= 0) {
- int i = fElementMap[selection];
- int k = i;
- int length = fRenderedStrings.length;
- while (k < length && fRenderedStrings[k].equals(fRenderedStrings[i])) {
- k++;
- }
- updateLowerListWidget(i, k);
- } else
- updateLowerListWidget(0, 0);
- }
-
- @Override
- public int open() {
-
- if (fIT == null || fIT.length == 0) {
- if (!hasJSPs())
- {
- MessageDialog.openInformation(getShell(), WebAppEditResourceHandler.getString("Empty_List_1"), WebAppEditResourceHandler.getString("_INFO_No_servlets_exist_to_add._1")); //$NON-NLS-2$ //$NON-NLS-1$
- return CANCEL;
- }
- fSelection = JSP;
- }
- setElements(fIT);
- setInitialSelection(""); //$NON-NLS-1$
- return super.open();
- }
-
- /**
- * update the list to reflect a new match string.
- * @param matchString java.lang.String
- */
- protected final void rematch(String matchString) {
- int k = 0;
- String text = fText.getText();
- StringMatcher matcher = new StringMatcher(text + "*", fIgnoreCase, false); //$NON-NLS-1$
- String lastString = null;
- int length = fElements.length;
- for (int i = 0; i < length; i++) {
- while (i < length && fRenderedStrings[i].equals(lastString))
- i++;
- if (i < length) {
- lastString = fRenderedStrings[i];
- if (matcher.match(fRenderedStrings[i])) {
- fElementMap[k] = i;
- k++;
- }
- }
- }
- fElementMap[k] = -1;
-
- updateUpperListWidget(fElementMap, k);
- }
-
- /**
- *
- * @return java.lang.String[]
- * @param p org.eclipse.jface.elements.IIndexedProperty
- */
- private String[] renderStrings(Object[] p) {
- String[] strings = new String[p.length];
- int size = strings.length;
- for (int i = 0; i < size; i++) {
- strings[i] = fElementRenderer.getText(p[i]);
- }
- new TwoArrayQuickSorter(fIgnoreCase).sort(strings, p);
- return strings;
- }
-
- public void setElements(Object[] elements) {
- fElements = elements;
- fElementMap = new int[fElements.length + 1];
- fRenderedStrings = renderStrings(fElements);
- }
-
- public void setSelectedItem(int newSelection) {
- fSelection = newSelection;
- }
-
- private void updateLowerListWidget(int from, int to) {
- fLowerList.removeAll();
- fQualifierMap = new Integer[to - from];
- String[] qualifiers = new String[to - from];
- for (int i = from; i < to; i++) {
- // XXX: 1G65LDG: JFUIF:WIN2000 - ILabelProvider used outside a viewer
- qualifiers[i - from] = fQualifierRenderer.getText(fElements[i]);
- fQualifierMap[i - from] = new Integer(i);
- }
-
- new TwoArrayQuickSorter(fIgnoreCase).sort(qualifiers, fQualifierMap);
-
- for (int i = 0; i < to - from; i++) {
- TableItem ti = new TableItem(fLowerList, i);
- ti.setText(qualifiers[i]);
- // XXX: 1G65LDG: JFUIF:WIN2000 - ILabelProvider used outside a viewer
- Image img = fQualifierRenderer.getImage(fElements[from + i]);
- if (img != null)
- ti.setImage(img);
- }
-
- if (fLowerList.getItemCount() > 0)
- fLowerList.setSelection(0);
- updateOkState();
- }
-
- private void updateOkState() {
- Button okButton = getOkButton();
- if (okButton != null)
- okButton.setEnabled(getWidgetSelection() != null);
- }
-
- private void updateUpperListWidget(int[] indices, int size) {
- fUpperList.setRedraw(false);
- int itemCount = fUpperList.getItemCount();
- if (size < itemCount)
- fUpperList.remove(0, itemCount - size - 1);
- TableItem[] items = fUpperList.getItems();
- for (int i = 0; i < size; i++) {
- TableItem ti = null;
- if (i < itemCount)
- ti = items[i];
- else
- ti = new TableItem(fUpperList, i);
- ti.setText(fRenderedStrings[indices[i]]);
- // XXX: 1G65LDG: JFUIF:WIN2000 - ILabelProvider used outside a viewer
- Image img = fElementRenderer.getImage(fElements[indices[i]]);
- if (img != null)
- ti.setImage(img);
- }
- if (fUpperList.getItemCount() > 0)
- fUpperList.setSelection(0);
- fUpperList.setRedraw(true);
- handleUpperSelectionChanged();
- }
-
- /**
- * Sent when default selection occurs in the control.
- * <p>
- * For example, on some platforms default selection occurs
- * in a List when the user double-clicks an item or types
- * return in a Text.
- * </p>
- *
- * @param e an event containing information about the default selection
- */
- public void widgetDefaultSelected(SelectionEvent e) {
- // Do nothing
- }
-
- /**
- * Sent when selection occurs in the control.
- * <p>
- * For example, on some platforms selection occurs in
- * a List when the user selects an item or items.
- * </p>
- *
- * @param e an event containing information about the selection
- */
- public void widgetSelected(SelectionEvent e) {
- if (e.widget == fJSPButton) {
- fSelection = JSP;
- fPageBook.showPage(fJspControl);
- updateOKStatus();
- } else if (e.widget == fServletButton) {
- fSelection = SERVLET;
- fPageBook.showPage(fServletControl);
- } else
- fSelection = -1;
- }
-
- /**
- * @see ElementTreeSelectionDialog#updateOKStatus()
- */
- @Override
- protected void updateOKStatus() {
- super.updateOKStatus();
- Button okButton = getOkButton();
- if (okButton != null)
- okButton.setEnabled(fLocalValidator.validate(getResult()).isOK());
- }
-
- private boolean hasJSPs() {
- WorkbenchContentProvider workbenchContentProvider = new WorkbenchContentProvider();
- Object[] elements = workbenchContentProvider.getElements(fInput);
- if (elements.length > 0) {
- TypedFileViewerFilter viewerFilter = new TypedFileViewerFilter(getExtensions());
- elements = viewerFilter.filter(getTreeViewer(), fInput, elements);
- }
- return elements.length != 0;
- }
-
- /**
- * Sets the tree input.
- * @param input the tree input.
- */
- @Override
- public void setInput(Object input) {
- fInput = input;
- super.setInput(input);
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFilterFileSelectionDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFilterFileSelectionDialog.java
deleted file mode 100644
index 4b84465..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFilterFileSelectionDialog.java
+++ /dev/null
@@ -1,606 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_FILTER;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DEFAULT_PACKAGE;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.j2ee.internal.dialogs.FilteredFileSelectionDialog;
-import org.eclipse.jst.j2ee.internal.dialogs.TwoArrayQuickSorter;
-import org.eclipse.jst.j2ee.internal.dialogs.TypedFileViewerFilter;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.part.PageBook;
-
-/**
- * Insert the type's description here.
- * Creation date: (7/30/2001 11:16:36 AM)
- */
-public class MultiSelectFilteredFilterFileSelectionDialog extends
- FilteredFileSelectionDialog {
-
-
- private static class PackageRenderer extends LabelProvider {
- private final Image PACKAGE_ICON = JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKAGE);
-
- @Override
- public String getText(Object element) {
- IType type = (IType) element;
- String p = type.getPackageFragment().getElementName();
- if ("".equals(p)) //$NON-NLS-1$
- p = DEFAULT_PACKAGE;
- return (p + " - " + type.getPackageFragment().getParent().getPath().toString()); //$NON-NLS-1$
- }
- @Override
- public Image getImage(Object element) {
- return PACKAGE_ICON;
- }
- }
-
- private static class TypeRenderer extends LabelProvider {
- private final Image CLASS_ICON = JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_CLASS);
-
- @Override
- public String getText(Object element) {
- IType e = ((IType) element);
- return e.getElementName();
- }
-
- @Override
- public Image getImage(Object element) {
- return CLASS_ICON;
- }
-
- }
- protected PageBook fPageBook = null;
- protected Control fServletControl = null;
- protected Composite fChild = null;
- // construction parameters
- protected IRunnableContext fRunnableContext;
- protected ILabelProvider fElementRenderer;
- protected ILabelProvider fQualifierRenderer;
- private Object[] fElements;
- private boolean fIgnoreCase = true;
- private String fUpperListLabel;
- private String fLowerListLabel;
- // SWT widgets
- private Table fUpperList;
- private Table fLowerList;
- protected Text fText;
- private IType[] fIT;
- private String[] fRenderedStrings;
- private int[] fElementMap;
- private Integer[] fQualifierMap;
-
- private ISelectionStatusValidator fLocalValidator = null;
- /**
- * This is a selection dialog for available servlet.
- * @param parent Shell
- * @param title String
- * @param message String
- * @parent extensions String[]
- * @param allowMultiple boolean
- */
- public MultiSelectFilteredFilterFileSelectionDialog(Shell parent, String title, String message, String[] extensions, boolean allowMultiple, IProject project) {
- super(parent, title, message, extensions, allowMultiple);
- setShellStyle(SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL | SWT.RESIZE);
-
- if (title == null)
- setTitle(WebAppEditResourceHandler.getString("File_Selection_UI_")); //$NON-NLS-1$
- String innerMessage = message;
- if (innerMessage == null)
- innerMessage = WebAppEditResourceHandler.getString("Select_a_file__UI_"); //$NON-NLS-1$
- setMessage(innerMessage);
- setExtensions(extensions);
- addFilter(new TypedFileViewerFilter(extensions));
- fLocalValidator = new SimpleTypedElementSelectionValidator(new Class[] { IFile.class }, allowMultiple);
- setValidator(fLocalValidator);
-
- //StatusInfo currStatus = new StatusInfo();
- //currStatus.setOK();
- Status currStatus = new Status(Status.OK, ServletUIPlugin.PLUGIN_ID, Status.OK, "", null);//$NON-NLS-1$
-
- updateStatus(currStatus);
- fElementRenderer = new TypeRenderer();
- fQualifierRenderer = new PackageRenderer();
- fRunnableContext = ServletUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
- try {
- IJavaElement jelem = null;
- IProject proj = null;
- jelem = (IJavaElement) project.getAdapter(IJavaElement.class);
- if (jelem == null) {
- IResource resource = (IResource) project.getAdapter(IResource.class);
- if (resource != null) {
- proj = resource.getProject();
- if (proj != null) {
- jelem = org.eclipse.jdt.core.JavaCore.create(proj);
- }
- }
- }
- if(jelem != null){
- IJavaProject jp = jelem.getJavaProject();
- IType filterType = jp.findType(QUALIFIED_FILTER);
- // next 3 lines fix defect 177686
- if (filterType == null) {
- return;
- }
- ArrayList filterClasses = new ArrayList();
- ITypeHierarchy tH = filterType.newTypeHierarchy(jp, null);
- IType[] types = tH.getAllSubtypes(filterType);
- for (int i = 0; i < types.length; i++) {
- if (types[i].isClass() && !filterClasses.contains(types[i]))
- filterClasses.add(types[i]);
- }
- fIT = (IType[]) filterClasses.toArray(new IType[filterClasses.size()]);
- filterClasses = null;
- }
- } catch (Exception e) {
- ServletUIPlugin.log(e);
- }
- }
-
- /**
- * @private
- */
- @Override
- protected void computeResult() {
- IType type = (IType) getWidgetSelection();
- if (type != null) {
- java.util.List result = new ArrayList(1);
- result.add(type);
- setResult(result);
- }
- }
-
- @Override
- public void create() {
- super.create();
- fText.setFocus();
- rematch(""); //$NON-NLS-1$
- updateOkState();
- }
-
- /**
- * Creates and returns the contents of this dialog's
- * button bar.
- * <p>
- * The <code>Dialog</code> implementation of this framework method
- * lays out a button bar and calls the <code>createButtonsForButtonBar</code>
- * framework method to populate it. Subclasses may override.
- * </p>
- *
- * @param parent the parent composite to contain the button bar
- * @return the button bar control
- */
- @Override
- protected Control createButtonBar(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
-
- layout.numColumns = 2;
-
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Composite composite2 = new Composite(composite, SWT.NONE);
-
- // create a layout with spacing and margins appropriate for the font size.
- layout = new GridLayout();
- layout.numColumns = 0; // this is incremented by createButton
- layout.makeColumnsEqualWidth = true;
- layout.marginWidth = convertHorizontalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.HORIZONTAL_MARGIN);
- layout.marginHeight = convertVerticalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.VERTICAL_MARGIN);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.HORIZONTAL_SPACING);
- layout.verticalSpacing = convertVerticalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.VERTICAL_SPACING);
-
- composite2.setLayout(layout);
-
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.VERTICAL_ALIGN_CENTER);
- composite2.setLayoutData(data);
-
- composite2.setFont(parent.getFont());
-
- // Add the buttons to the button bar.
- super.createButtonsForButtonBar(composite2);
-
- return composite;
- }
-
- /*
- * @private
- */
- @Override
- protected Control createDialogArea(Composite parent) {
- GridData gd = new GridData();
-
- fChild = new Composite(parent, SWT.NONE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(fChild, "com.ibm.etools.webapplicationedit.webx2010"); //$NON-NLS-1$
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- gl.marginHeight = 5;
- fChild.setLayout(gl);
-
- gd.verticalAlignment = GridData.FILL;
- gd.horizontalAlignment = GridData.FILL;
- gd.grabExcessVerticalSpace = true;
- fChild.setLayoutData(gd);
-
- fPageBook = new PageBook(fChild, SWT.NONE);
- gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.verticalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = true;
- gd.grabExcessVerticalSpace = true;
- gd.horizontalSpan = 2;
- fPageBook.setLayoutData(gd);
- super.createDialogArea(fPageBook);
-
- Composite composite = new Composite(fPageBook, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
-
- Label messageLabel = new Label(composite, SWT.NONE);
- gd = new GridData();
- messageLabel.setLayoutData(gd);
- messageLabel.setText(WebAppEditResourceHandler.getString("Choose_a_filter__1")); //$NON-NLS-1$
-
- fText = createText(composite);
-
- messageLabel = new Label(composite, SWT.NONE);
- gd = new GridData();
- messageLabel.setLayoutData(gd);
- messageLabel.setText(WebAppEditResourceHandler.getString("Matching_filters__2")); //$NON-NLS-1$
-
- fUpperList = createUpperList(composite);
-
- messageLabel = new Label(composite, SWT.NONE);
- gd = new GridData();
- messageLabel.setLayoutData(gd);
- messageLabel.setText(WebAppEditResourceHandler.getString("Qualifier__3")); //$NON-NLS-1$
-
- fLowerList = createLowerList(composite);
-
- fServletControl = composite;
-
- fPageBook.showPage(fServletControl);
- return parent;
- }
-
- /**
- * Creates the list widget and sets layout data.
- * @return org.eclipse.swt.widgets.List
- */
- private Table createLowerList(Composite parent) {
- if (fLowerListLabel != null)
- (new Label(parent, SWT.NONE)).setText(fLowerListLabel);
-
- Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- list.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event evt) {
- handleLowerSelectionChanged();
- }
- });
- list.addListener(SWT.MouseDoubleClick, new Listener() {
- public void handleEvent(Event evt) {
- handleLowerDoubleClick();
- }
- });
- list.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- fQualifierRenderer.dispose();
- }
- });
- GridData spec = new GridData();
- spec.widthHint = convertWidthInCharsToPixels(50);
- spec.heightHint = convertHeightInCharsToPixels(5);
- spec.grabExcessVerticalSpace = true;
- spec.grabExcessHorizontalSpace = true;
- spec.horizontalAlignment = GridData.FILL;
- spec.verticalAlignment = GridData.FILL;
- list.setLayoutData(spec);
- return list;
- }
-
- /**
- * Creates the text widget and sets layout data.
- * @return org.eclipse.swt.widgets.Text
- */
- private Text createText(Composite parent) {
- Text text = new Text(parent, SWT.BORDER);
- GridData spec = new GridData();
- spec.grabExcessVerticalSpace = false;
- spec.grabExcessHorizontalSpace = true;
- spec.horizontalAlignment = GridData.FILL;
- spec.verticalAlignment = GridData.BEGINNING;
- text.setLayoutData(spec);
- Listener l = new Listener() {
- public void handleEvent(Event evt) {
- rematch(fText.getText());
- }
- };
- text.addListener(SWT.Modify, l);
- return text;
- }
-
- /**
- * Creates the list widget and sets layout data.
- * @return org.eclipse.swt.widgets.List
- */
- private Table createUpperList(Composite parent) {
- if (fUpperListLabel != null)
- (new Label(parent, SWT.NONE)).setText(fUpperListLabel);
-
- Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- list.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event evt) {
- handleUpperSelectionChanged();
- }
- });
- list.addListener(SWT.MouseDoubleClick, new Listener() {
- public void handleEvent(Event evt) {
- handleUpperDoubleClick();
- }
- });
- list.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- fElementRenderer.dispose();
- }
- });
- GridData spec = new GridData();
- spec.widthHint = convertWidthInCharsToPixels(50);
- spec.heightHint = convertHeightInCharsToPixels(15);
- spec.grabExcessVerticalSpace = true;
- spec.grabExcessHorizontalSpace = true;
- spec.horizontalAlignment = GridData.FILL;
- spec.verticalAlignment = GridData.FILL;
- list.setLayoutData(spec);
- return list;
- }
-
- /**
- * @return the ID of the button that is 'pressed' on doubleClick in the lists.
- * By default it is the OK button.
- * Override to change this setting.
- */
- protected int getDefaultButtonID() {
- return IDialogConstants.OK_ID;
- }
-
- protected Object getWidgetSelection() {
- int i = fLowerList.getSelectionIndex();
- if (fQualifierMap != null) {
- if (fQualifierMap.length == 1)
- i = 0;
- if (i < 0) {
- return null;
- }
- Integer index = fQualifierMap[i];
- return fElements[index.intValue()];
- }
- return null;
- }
-
- protected final void handleLowerDoubleClick() {
- if (getWidgetSelection() != null)
- buttonPressed(getDefaultButtonID());
- }
-
- protected final void handleLowerSelectionChanged() {
- updateOkState();
- }
-
- protected final void handleUpperDoubleClick() {
- if (getWidgetSelection() != null)
- buttonPressed(getDefaultButtonID());
- }
-
- protected final void handleUpperSelectionChanged() {
- int selection = fUpperList.getSelectionIndex();
- if (selection >= 0) {
- int i = fElementMap[selection];
- int k = i;
- int length = fRenderedStrings.length;
- while (k < length && fRenderedStrings[k].equals(fRenderedStrings[i])) {
- k++;
- }
- updateLowerListWidget(i, k);
- } else
- updateLowerListWidget(0, 0);
- }
-
- @Override
- public int open() {
- if (fIT == null || fIT.length == 0) {
- MessageDialog.openInformation(getShell(),
- WebAppEditResourceHandler.getString("Empty_List_1"), //$NON-NLS-1$
- WebAppEditResourceHandler.getString("_INFO_No_filters_exist_to_add._1")); //$NON-NLS-1$
- return CANCEL;
- }
-
- setElements(fIT);
- setInitialSelection(""); //$NON-NLS-1$
- return super.open();
- }
-
- /**
- * update the list to reflect a new match string.
- * @param matchString java.lang.String
- */
- protected final void rematch(String matchString) {
- int k = 0;
- String text = fText.getText();
- StringMatcher matcher = new StringMatcher(text + "*", fIgnoreCase, false); //$NON-NLS-1$
- String lastString = null;
- int length = fElements.length;
- for (int i = 0; i < length; i++) {
- while (i < length && fRenderedStrings[i].equals(lastString))
- i++;
- if (i < length) {
- lastString = fRenderedStrings[i];
- if (matcher.match(fRenderedStrings[i])) {
- fElementMap[k] = i;
- k++;
- }
- }
- }
- fElementMap[k] = -1;
-
- updateUpperListWidget(fElementMap, k);
- }
-
- /**
- *
- * @return java.lang.String[]
- * @param p org.eclipse.jface.elements.IIndexedProperty
- */
- private String[] renderStrings(Object[] p) {
- String[] strings = new String[p.length];
- int size = strings.length;
- for (int i = 0; i < size; i++) {
- strings[i] = fElementRenderer.getText(p[i]);
- }
- new TwoArrayQuickSorter(fIgnoreCase).sort(strings, p);
- return strings;
- }
-
- public void setElements(Object[] elements) {
- fElements = elements;
- fElementMap = new int[fElements.length + 1];
- fRenderedStrings = renderStrings(fElements);
- }
-
- private void updateLowerListWidget(int from, int to) {
- fLowerList.removeAll();
- fQualifierMap = new Integer[to - from];
- String[] qualifiers = new String[to - from];
- for (int i = from; i < to; i++) {
- // XXX: 1G65LDG: JFUIF:WIN2000 - ILabelProvider used outside a viewer
- qualifiers[i - from] = fQualifierRenderer.getText(fElements[i]);
- fQualifierMap[i - from] = new Integer(i);
- }
-
- new TwoArrayQuickSorter(fIgnoreCase).sort(qualifiers, fQualifierMap);
-
- for (int i = 0; i < to - from; i++) {
- TableItem ti = new TableItem(fLowerList, i);
- ti.setText(qualifiers[i]);
- // XXX: 1G65LDG: JFUIF:WIN2000 - ILabelProvider used outside a viewer
- Image img = fQualifierRenderer.getImage(fElements[from + i]);
- if (img != null)
- ti.setImage(img);
- }
-
- if (fLowerList.getItemCount() > 0)
- fLowerList.setSelection(0);
- updateOkState();
- }
-
- private void updateOkState() {
- Button okButton = getOkButton();
- if (okButton != null)
- okButton.setEnabled(getWidgetSelection() != null);
- }
-
- private void updateUpperListWidget(int[] indices, int size) {
- fUpperList.setRedraw(false);
- int itemCount = fUpperList.getItemCount();
- if (size < itemCount)
- fUpperList.remove(0, itemCount - size - 1);
- TableItem[] items = fUpperList.getItems();
- for (int i = 0; i < size; i++) {
- TableItem ti = null;
- if (i < itemCount)
- ti = items[i];
- else
- ti = new TableItem(fUpperList, i);
- ti.setText(fRenderedStrings[indices[i]]);
- // XXX: 1G65LDG: JFUIF:WIN2000 - ILabelProvider used outside a viewer
- Image img = fElementRenderer.getImage(fElements[indices[i]]);
- if (img != null)
- ti.setImage(img);
- }
- if (fUpperList.getItemCount() > 0)
- fUpperList.setSelection(0);
- fUpperList.setRedraw(true);
- handleUpperSelectionChanged();
- }
-
- /**
- * Sent when default selection occurs in the control.
- * <p>
- * For example, on some platforms default selection occurs
- * in a List when the user double-clicks an item or types
- * return in a Text.
- * </p>
- *
- * @param e an event containing information about the default selection
- */
- public void widgetDefaultSelected(SelectionEvent e) {
- // Do nothing
- }
-
- /**
- * @see ElementTreeSelectionDialog#updateOKStatus()
- */
- @Override
- protected void updateOKStatus() {
- super.updateOKStatus();
- Button okButton = getOkButton();
- if (okButton != null)
- okButton.setEnabled(fLocalValidator.validate(getResult()).isOK());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassOptionsWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassOptionsWizardPage.java
deleted file mode 100644
index 94124e0..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassOptionsWizardPage.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.DESTROY;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.DO_FILTER;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.INIT;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_FILTER;
-
-import java.util.Iterator;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.internal.web.operations.FilterSupertypesValidator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class NewFilterClassOptionsWizardPage extends
- NewWebClassOptionsWizardPage implements ISelectionChangedListener {
-
- protected Button initButton;
- protected Button destroyButton;
- protected Button doFilterButton;
-
- public NewFilterClassOptionsWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle) {
- super(model, pageName, pageDesc, pageTitle);
- }
-
- /**
- * Create the composite with all the stubs
- */
- @Override
- protected void createStubsComposite(Composite parent) {
- super.createStubsComposite(parent);
-
- Composite comp = new Composite(methodStubs, SWT.NULL);
- GridLayout layout = new GridLayout(3, false);
- layout.marginWidth = 0;
- layout.makeColumnsEqualWidth = true;
- comp.setLayout(layout);
- GridData data = new GridData(GridData.FILL_BOTH);
- comp.setLayoutData(data);
-
- initButton = new Button(comp, SWT.CHECK);
- initButton.setText("init"); //$NON-NLS-1$
- synchHelper.synchCheckbox(initButton, INIT, null);
-
- destroyButton = new Button(comp, SWT.CHECK);
- destroyButton.setText("destroy"); //$NON-NLS-1$
- synchHelper.synchCheckbox(destroyButton, DESTROY, null);
-
- doFilterButton = new Button(comp, SWT.CHECK);
- doFilterButton.setText("doFilter"); //$NON-NLS-1$
- synchHelper.synchCheckbox(doFilterButton, DO_FILTER, null);
-
- interfaceViewer.addSelectionChangedListener(this);
-
- Dialog.applyDialogFont(parent);
- }
-
- public void selectionChanged(SelectionChangedEvent event) {
- StructuredSelection selection = (StructuredSelection) event.getSelection();
-
- // if the selection is empty, then the remove button is disabled
- if (selection.isEmpty()) {
- removeButton.setEnabled(false);
- return;
- }
-
- // if the selection is non-empty and the filter extends a class which
- // implements javax.servlet.Filter, then the remove button is enabled
- if (FilterSupertypesValidator.isFilterSuperclass(model)) {
- removeButton.setEnabled(true);
- return;
- }
-
- // if the selection is non-empty and the filter does not extend a class
- // which implements javax.servlet.Filter, then the remove button is
- // disabled only if the Filter interface is in the selection
- Iterator iter = selection.iterator();
- while (iter.hasNext()) {
- if (QUALIFIED_FILTER.equals(iter.next()))
- removeButton.setEnabled(false);
- return;
- }
-
- // in all other cases the remove button is enabled
- removeButton.setEnabled(true);
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassWizardPage.java
deleted file mode 100644
index 2ad1bd1..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassWizardPage.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.PROJECT;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.FILTER_MAPPINGS;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.CHOOSE_FILTER_CLASS;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NEW_FILTER_WIZARD_WINDOW_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.USE_EXISTING_FILTER_CLASS;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.jdt.core.IType;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.war.ui.util.WebFiltersGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.web.operations.FilterMappingItem;
-import org.eclipse.jst.j2ee.internal.web.operations.IFilterMappingItem;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.WebUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupFiltersItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class NewFilterClassWizardPage extends NewWebClassWizardPage {
-
- private final static String[] FILTEREXTENSIONS = { "java" }; //$NON-NLS-1$
-
- public NewFilterClassWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle, String moduleType) {
- super(model, pageName, pageDesc, pageTitle, moduleType);
- }
-
- @Override
- protected String getUseExistingCheckboxText() {
- return USE_EXISTING_FILTER_CLASS;
- }
-
- @Override
- protected String getUseExistingProperty() {
- return USE_EXISTING_CLASS;
- }
-
- @Override
- protected IProject getExtendedSelectedProject(Object selection) {
- if (selection instanceof WebFiltersGroupItemProvider) {
- WebApp webApp = (WebApp)((WebFiltersGroupItemProvider) selection).getParent();
- return ProjectUtilities.getProject(webApp);
- }else if(selection instanceof WebAppProvider){
- return ((WebAppProvider) selection).getProject();
- } if(selection instanceof GroupFiltersItemProvider){
- org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) ((GroupFiltersItemProvider) selection).getJavaEEObject();
- return ProjectUtilities.getProject(webApp);
- }
-
- return super.getExtendedSelectedProject(selection);
- }
-
- @Override
- protected void handleClassButtonSelected() {
- getControl().setCursor(new Cursor(getShell().getDisplay(), SWT.CURSOR_WAIT));
- IProject project = (IProject) model.getProperty(PROJECT);
- IVirtualComponent component = ComponentCore.createComponent(project);
- MultiSelectFilteredFilterFileSelectionDialog ms = new MultiSelectFilteredFilterFileSelectionDialog(
- getShell(),
- NEW_FILTER_WIZARD_WINDOW_TITLE,
- CHOOSE_FILTER_CLASS,
- FILTEREXTENSIONS,
- false,
- project);
- IContainer root = component.getRootFolder().getUnderlyingFolder();
- ms.setInput(root);
- ms.open();
- if (ms.getReturnCode() == Window.OK) {
- String qualifiedClassName = ""; //$NON-NLS-1$
- IType type = (IType) ms.getFirstResult();
- if (type != null) {
- qualifiedClassName = type.getFullyQualifiedName();
- }
- existingClassText.setText(qualifiedClassName);
- }
- getControl().setCursor(null);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.servlet.ui.internal.wizard.NewWebClassWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = super.createTopLevelComposite(parent);
-
- Object obj = getSelectedObject();
- if (isFilter(obj)) {
- checkExistingButton(true);
- existingClassText.setText(getFilterClass(obj));
- } else if (isServlet(obj)) {
- String servletName = getServletName(obj);
- // set the class name
- classText.setText(makeFirstCharUppercase(servletName) + "Filter"); //$NON-NLS-1$
- // set the filter mapping
- if (servletName != null) {
- List<IFilterMappingItem> mappings = new ArrayList<IFilterMappingItem>();
- mappings.add(new FilterMappingItem(IFilterMappingItem.SERVLET_NAME, servletName));
- model.setProperty(FILTER_MAPPINGS, mappings);
- }
- } else if (isWebFolder(obj)) {
- IFolder folder = (IFolder) obj;
- // set the class name
- String webFolderName = makeFirstCharUppercase(folder.getName());
- classText.setText(webFolderName + "Filter"); //$NON-NLS-1$
- // set the filter mapping
- String webFolderPath = getWebResourcePath(folder);
- List<IFilterMappingItem> mappings = new ArrayList<IFilterMappingItem>();
- mappings.add(new FilterMappingItem(IFilterMappingItem.URL_PATTERN, webFolderPath + "/*")); //$NON-NLS-1$
- model.setProperty(FILTER_MAPPINGS, mappings);
- } else if (WebUtilities.isWebResource(obj)) {
- IFile file = (IFile) obj;
- // set the class name
- String webResourceName = makeFirstCharUppercase(getFileNameWithouFileExtension(file));
- classText.setText(webResourceName + "Filter"); //$NON-NLS-1$
- // set the filter mapping
- String webResourcePath = getWebResourcePath(file);
- List<IFilterMappingItem> mappings = new ArrayList<IFilterMappingItem>();
- mappings.add(new FilterMappingItem(IFilterMappingItem.URL_PATTERN, webResourcePath));
- model.setProperty(FILTER_MAPPINGS, mappings);
- }
-
- return composite;
- }
-
- @Override
- protected boolean isProjectValid(IProject project) {
- boolean result = super.isProjectValid(project);
- if (!result)
- return false;
-
- if (JavaEEProjectUtilities.isWebFragmentProject(project))
- return true;
-
- // get the version of the web facet
- IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.DYNAMIC_WEB);
- if (facetVersion == null)
- return false;
-
- // convert the version to an integer
- int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString());
-
- // only web 2.3 and greater projects are valid
- return version > J2EEVersionConstants.SERVLET_2_2;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassOptionsWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassOptionsWizardPage.java
deleted file mode 100644
index 6d4d265..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassOptionsWizardPage.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class NewListenerClassOptionsWizardPage extends NewWebClassOptionsWizardPage {
-
- public NewListenerClassOptionsWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle) {
- super(model, pageName, pageDesc, pageTitle);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassWizardPage.java
deleted file mode 100644
index 031ed18..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassWizardPage.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.USE_EXISTING_LISTENER_CLASS;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.war.ui.util.WebListenerGroupItemProvider;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupListenerItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class NewListenerClassWizardPage extends NewWebClassWizardPage {
-
- public NewListenerClassWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle, String moduleType) {
- super(model, pageName, pageDesc, pageTitle, moduleType);
- }
-
- @Override
- protected String getUseExistingCheckboxText() {
- return USE_EXISTING_LISTENER_CLASS;
- }
-
- @Override
- protected String getUseExistingProperty() {
- return USE_EXISTING_CLASS;
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = super.createTopLevelComposite(parent);
-
- existingButton.setEnabled(false);
-
- return composite;
- }
-
- @Override
- protected IProject getExtendedSelectedProject(Object selection) {
- if (selection instanceof WebListenerGroupItemProvider) {
- WebApp webApp = (WebApp)((WebListenerGroupItemProvider) selection).getParent();
- return ProjectUtilities.getProject(webApp);
- }else if(selection instanceof WebAppProvider){
- return ((WebAppProvider) selection).getProject();
- } else if(selection instanceof GroupListenerItemProvider){
- org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) ((GroupListenerItemProvider) selection).getJavaEEObject();
- return ProjectUtilities.getProject(webApp);
- }
-
- return super.getExtendedSelectedProject(selection);
- }
-
- @Override
- protected void handleClassButtonSelected() {
- }
-
- @Override
- protected boolean isProjectValid(IProject project) {
- boolean result = super.isProjectValid(project);
- if (!result)
- return false;
-
- if (JavaEEProjectUtilities.isWebFragmentProject(project))
- return true;
-
- // get the version of the web facet
- IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.DYNAMIC_WEB);
- if (facetVersion == null)
- return false;
-
- // convert the version to an integer
- int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString());
-
- // only web 2.3 and greater projects are valid
- return version > J2EEVersionConstants.SERVLET_2_2;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java
deleted file mode 100644
index d7d3779..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - bug 142500
- * Kiril Mitov, k.mitov@sap.com - bug 204160
- * Kaloyan Raev, kaloyan.raev@sap.com
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET;
-
-import java.util.Iterator;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.web.operations.ServletSupertypesValidator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class NewServletClassOptionsWizardPage extends
- NewWebClassOptionsWizardPage implements ISelectionChangedListener {
-
- protected Button initButton;
- protected Button destroyButton;
- protected Button getConfigButton;
- protected Button getInfoButton;
- protected Button serviceButton;
- protected Button doGetButton;
- protected Button doPostButton;
- protected Button doPutButton;
- protected Button doDeleteButton;
- protected Button doHeadButton;
- protected Button doOptionsButton;
- protected Button doTraceButton;
-
- public NewServletClassOptionsWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle) {
- super(model, pageName, pageDesc, pageTitle);
- }
-
- @Override
- protected void enter() {
- super.enter();
-
- boolean httpServlet = ServletSupertypesValidator.isHttpServletSuperclass(model);
- doGetButton.setVisible(httpServlet);
- doPostButton.setVisible(httpServlet);
- doPutButton.setVisible(httpServlet);
- doDeleteButton.setVisible(httpServlet);
- doHeadButton.setVisible(httpServlet);
- doOptionsButton.setVisible(httpServlet);
- doTraceButton.setVisible(httpServlet);
- }
-
- /**
- * Create the composite with all the stubs
- */
- @Override
- protected void createStubsComposite(Composite parent) {
- super.createStubsComposite(parent);
-
- inheritButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- boolean enable = inheritButton.getSelection();
- enableGenericServletButtons(enable);
- enableHttpServletButtons(enable);
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- //Do nothing
- }
-
- private void enableGenericServletButtons(boolean enable) {
- if (ServletSupertypesValidator.isGenericServletSuperclass(model)) {
- initButton.setEnabled(enable);
- destroyButton.setEnabled(enable);
- getConfigButton.setEnabled(enable);
- getInfoButton.setEnabled(enable);
- serviceButton.setEnabled(enable);
- }
- }
-
- private void enableHttpServletButtons(boolean enable) {
- doGetButton.setEnabled(enable);
- doPostButton.setEnabled(enable);
- doPutButton.setEnabled(enable);
- doDeleteButton.setEnabled(enable);
- doHeadButton.setEnabled(enable);
- doOptionsButton.setEnabled(enable);
- doTraceButton.setEnabled(enable);
- }
- });
-
- Composite comp = new Composite(methodStubs, SWT.NULL);
- GridLayout layout = new GridLayout(3, false);
- layout.marginWidth = 0;
- layout.makeColumnsEqualWidth = true;
- comp.setLayout(layout);
- GridData data = new GridData(GridData.FILL_BOTH);
- comp.setLayoutData(data);
-
- initButton = new Button(comp, SWT.CHECK);
- initButton.setText("init"); //$NON-NLS-1$
- synchHelper.synchCheckbox(initButton, INewServletClassDataModelProperties.INIT, null);
-
- destroyButton = new Button(comp, SWT.CHECK);
- destroyButton.setText("destroy"); //$NON-NLS-1$
- synchHelper.synchCheckbox(destroyButton, INewServletClassDataModelProperties.DESTROY, null);
-
- getConfigButton = new Button(comp, SWT.CHECK);
- getConfigButton.setText("getServletConfig"); //$NON-NLS-1$
- synchHelper.synchCheckbox(getConfigButton, INewServletClassDataModelProperties.GET_SERVLET_CONFIG, null);
-
- getInfoButton = new Button(comp, SWT.CHECK);
- getInfoButton.setText("getServletInfo"); //$NON-NLS-1$
- synchHelper.synchCheckbox(getInfoButton, INewServletClassDataModelProperties.GET_SERVLET_INFO, null);
-
- serviceButton = new Button(comp, SWT.CHECK);
- serviceButton.setText("service"); //$NON-NLS-1$
- synchHelper.synchCheckbox(serviceButton, INewServletClassDataModelProperties.SERVICE, null);
-
- doGetButton = new Button(comp, SWT.CHECK);
- doGetButton.setText("do&Get"); //$NON-NLS-1$
- synchHelper.synchCheckbox(doGetButton, INewServletClassDataModelProperties.DO_GET, null);
-
- doPostButton = new Button(comp, SWT.CHECK);
- doPostButton.setText("do&Post"); //$NON-NLS-1$
- synchHelper.synchCheckbox(doPostButton, INewServletClassDataModelProperties.DO_POST, null);
-
- doPutButton = new Button(comp, SWT.CHECK);
- doPutButton.setText("doP&ut"); //$NON-NLS-1$
- synchHelper.synchCheckbox(doPutButton, INewServletClassDataModelProperties.DO_PUT, null);
-
- doDeleteButton = new Button(comp, SWT.CHECK);
- doDeleteButton.setText("do&Delete"); //$NON-NLS-1$
- synchHelper.synchCheckbox(doDeleteButton, INewServletClassDataModelProperties.DO_DELETE, null);
-
- doHeadButton = new Button(comp, SWT.CHECK);
- doHeadButton.setText("doH&ead"); //$NON-NLS-1$
- synchHelper.synchCheckbox(doHeadButton, INewServletClassDataModelProperties.DO_HEAD, null);
-
- doOptionsButton = new Button(comp, SWT.CHECK);
- doOptionsButton.setText("do&Options"); //$NON-NLS-1$
- synchHelper.synchCheckbox(doOptionsButton, INewServletClassDataModelProperties.DO_OPTIONS, null);
-
- doTraceButton = new Button(comp, SWT.CHECK);
- doTraceButton.setText("do&Trace"); //$NON-NLS-1$
- synchHelper.synchCheckbox(doTraceButton, INewServletClassDataModelProperties.DO_TRACE, null);
-
- interfaceViewer.addSelectionChangedListener(this);
-
- Dialog.applyDialogFont(parent);
- }
-
- public void selectionChanged(SelectionChangedEvent event) {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- removeButton.setEnabled(canRemoveSelectedInterfaces(selection));
- }
-
- @Override
- protected KeyListener getInterfaceKeyListener() {
- return new KeyListener() {
-
- public void keyPressed(KeyEvent e) {
- }
-
- public void keyReleased(KeyEvent e) {
- if (e.keyCode == SWT.DEL) {
- IStructuredSelection selection = (IStructuredSelection) interfaceViewer.getSelection();
- if (canRemoveSelectedInterfaces(selection)) {
- handleInterfaceRemoveButtonSelected();
- }
- }
- }
-
- };
- }
-
- private boolean canRemoveSelectedInterfaces(IStructuredSelection selection) {
- // if the selection is empty, then remove is not possible
- if (selection.isEmpty()) {
- return false;
- }
-
- // if the selection is non-empty and the servlet extends GenericServlet, then
- // remove is possible
- if (ServletSupertypesValidator.isGenericServletSuperclass(model)) {
- return true;
- }
-
- // if the selection is non-empty and the servlet does not extend GenericServlet,
- // then remove is not possible only if the Servlet interface is in the selection
- Iterator iter = selection.iterator();
- while (iter.hasNext()) {
- if (QUALIFIED_SERVLET.equals(iter.next())) {
- return false;
- }
- }
-
- // in all other cases remove is possible
- return true;
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassWizardPage.java
deleted file mode 100644
index d6b3809..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassWizardPage.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Kaloyan Raev, kaloyan.raev@sap.com
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.PROJECT;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.IS_SERVLET_TYPE;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.CHOOSE_SERVLET_CLASS;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NEW_SERVLET_WIZARD_WINDOW_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.USE_EXISTING_SERVLET_CLASS;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.internal.war.ui.util.WebServletGroupItemProvider;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupServletItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class NewServletClassWizardPage extends NewWebClassWizardPage {
-
- private final static String[] JSPEXTENSIONS = { "jsp" }; //$NON-NLS-1$
-
- public NewServletClassWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle, String moduleType) {
- super(model, pageName, pageDesc, pageTitle, moduleType);
- }
-
- @Override
- protected String getUseExistingCheckboxText() {
- return USE_EXISTING_SERVLET_CLASS;
- }
-
- @Override
- protected String getUseExistingProperty() {
- return USE_EXISTING_CLASS;
- }
-
- @Override
- protected IProject getExtendedSelectedProject(Object selection) {
- if (selection instanceof WebServletGroupItemProvider) {
- WebApp webApp = (WebApp) ((WebServletGroupItemProvider) selection).getParent();
- return ProjectUtilities.getProject(webApp);
- } else if(selection instanceof WebAppProvider){
- return ((WebAppProvider) selection).getProject();
- } else if(selection instanceof GroupServletItemProvider){
- org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) ((GroupServletItemProvider) selection).getJavaEEObject();
- return ProjectUtilities.getProject(webApp);
- }
-
- return super.getExtendedSelectedProject(selection);
- }
-
- @Override
- protected void handleClassButtonSelected() {
- getControl().setCursor(new Cursor(getShell().getDisplay(), SWT.CURSOR_WAIT));
- try {
- IProject project = (IProject) model.getProperty(PROJECT);
-
- if (project == null) {
- // show info message
- return;
- }
-
- IVirtualComponent component = ComponentCore.createComponent(project);
- MultiSelectFilteredFileSelectionDialog ms = new MultiSelectFilteredFileSelectionDialog(
- getShell(),
- NEW_SERVLET_WIZARD_WINDOW_TITLE,
- CHOOSE_SERVLET_CLASS,
- JSPEXTENSIONS,
- false,
- project);
- IContainer root = component.getRootFolder().getUnderlyingFolder();
- ms.setInput(root);
- ms.open();
- if (ms.getReturnCode() == Window.OK) {
- String qualifiedClassName = ""; //$NON-NLS-1$
- if (ms.getSelectedItem() == MultiSelectFilteredFileSelectionDialog.JSP) {
- Object obj = ms.getFirstResult();
- if (obj != null) {
- if (obj instanceof IFile) {
- IFile file = (IFile) obj;
- IPath pFull = file.getFullPath();
- IPath pBase = root.getFullPath();
- IPath path = pFull.removeFirstSegments(pBase.segmentCount());
- qualifiedClassName = path.makeAbsolute().toString();
- model.setProperty(IS_SERVLET_TYPE, new Boolean(false));
- }
- }
- }
- else {
- IType type = (IType) ms.getFirstResult();
- if (type != null) {
- qualifiedClassName = type.getFullyQualifiedName();
- model.setProperty(IS_SERVLET_TYPE, new Boolean(true));
- }
- }
- existingClassText.setText(qualifiedClassName);
- }
- } finally {
- getControl().setCursor(null);
- }
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = super.createTopLevelComposite(parent);
-
- Object obj = getSelectedObject();
- if (isServlet(obj)) {
- checkExistingButton(true);
- if (isServletJSP(obj)) {
- existingClassText.setText(getServletJSPFile(obj));
- model.setBooleanProperty(IS_SERVLET_TYPE, false);
- } else {
- existingClassText.setText(getServletClass(obj));
- model.setBooleanProperty(IS_SERVLET_TYPE, true);
- }
- } else if (isJSP(obj)) {
- checkExistingButton(true);
- existingClassText.setText(getWebResourcePath((IResource) obj));
- model.setBooleanProperty(IS_SERVLET_TYPE, false);
- }
-
- return composite;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebArtifactWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebArtifactWizard.java
deleted file mode 100644
index d1fe456..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebArtifactWizard.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.CLASS_NAME;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.OPEN_IN_EDITOR;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.PROJECT;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.QUALIFIED_CLASS_NAME;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS;
-
-import java.net.URL;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEEditorUtility;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public abstract class NewWebArtifactWizard extends NewWebWizard {
-
- protected static final String PAGE_ONE = "pageOne"; //$NON-NLS-1$
- protected static final String PAGE_TWO = "pageTwo"; //$NON-NLS-1$
- protected static final String PAGE_THREE = "pageThree"; //$NON-NLS-1$
-
- public NewWebArtifactWizard(IDataModel model) {
- super(model);
- setWindowTitle(getTitle());
- setDefaultPageImageDescriptor(getImage());
- }
-
- @Override
- protected boolean runForked() {
- return false;
- }
-
- @Override
- public boolean canFinish() {
- return getDataModel().isValid();
- }
-
- protected abstract String getTitle();
-
- protected abstract ImageDescriptor getImage();
-
- protected ImageDescriptor getImageFromJ2EEPlugin(String key) {
- URL url = (URL) J2EEPlugin.getDefault().getImage(key);
- return ImageDescriptor.createFromURL(url);
- }
-
- protected void openJavaClass() {
- try {
- String className;
- if (getDataModel().getBooleanProperty(USE_EXISTING_CLASS)) {
- className = getDataModel().getStringProperty(CLASS_NAME);
- } else {
- className = getDataModel().getStringProperty(QUALIFIED_CLASS_NAME);
- }
- IProject p = (IProject) getDataModel().getProperty(PROJECT);
- IJavaProject javaProject = J2EEEditorUtility.getJavaProject(p);
- IFile file = (IFile) javaProject.findType(className).getResource();
- openEditor(file);
- } catch (Exception cantOpen) {
- ServletUIPlugin.log(cantOpen);
- }
- }
-
- protected void openWebFile() {
- try {
- String className = getDataModel().getStringProperty(CLASS_NAME);
- IProject p = (IProject) getDataModel().getProperty(PROJECT);
- IVirtualComponent component = ComponentCore.createComponent(p);
- IContainer webContent = component.getRootFolder().getUnderlyingFolder();
- IFile file = webContent.getFile(new Path(className));
- openEditor(file);
- } catch (Exception cantOpen) {
- ServletUIPlugin.log(cantOpen);
- }
- }
-
- protected void openEditor(final IFile file) {
- if (getDataModel().getBooleanProperty(OPEN_IN_EDITOR)) {
- if (file != null) {
- getShell().getDisplay().asyncExec(new Runnable() {
- public void run() {
- try {
- IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- IDE.openEditor(page, file, true);
- }
- catch (PartInitException e) {
- ServletUIPlugin.log(e);
- }
- }
- });
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassOptionsWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassOptionsWizardPage.java
deleted file mode 100644
index 5a55cca..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassOptionsWizardPage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.ABSTRACT_METHODS;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.CONSTRUCTOR;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.INTERFACES;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.JAVA_CLASS_INHERIT_CHECKBOX_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.JAVA_CLASS_METHOD_STUBS_LABEL;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.j2ee.internal.wizard.NewJavaClassOptionsWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class NewWebClassOptionsWizardPage extends NewJavaClassOptionsWizardPage {
-
- protected Composite methodStubs;
-
- public NewWebClassOptionsWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle) {
- super(model, pageName, pageDesc, pageTitle);
- }
-
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[] { INTERFACES };
- }
-
- @Override
- protected void createStubsComposite(Composite parent) {
- Label stubLabel = new Label(parent, SWT.NONE);
- stubLabel.setText(JAVA_CLASS_METHOD_STUBS_LABEL);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.horizontalSpan = 2;
- stubLabel.setLayoutData(data);
-
- methodStubs = new Composite(parent, SWT.NULL);
- methodStubs.setLayout(new GridLayout());
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.horizontalSpan = 2;
- data.horizontalIndent = 15;
- methodStubs.setLayoutData(data);
-
- constructorButton = new Button(methodStubs, SWT.CHECK);
- constructorButton.setText(JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL);
- synchHelper.synchCheckbox(constructorButton, CONSTRUCTOR, null);
-
- inheritButton = new Button(methodStubs, SWT.CHECK);
- inheritButton.setText(JAVA_CLASS_INHERIT_CHECKBOX_LABEL);
- synchHelper.synchCheckbox(inheritButton, ABSTRACT_METHODS, null);
-
- Dialog.applyDialogFont(parent);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassWizardPage.java
deleted file mode 100644
index 07d9961..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassWizardPage.java
+++ /dev/null
@@ -1,450 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel.USE_ANNOTATIONS;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.CLASS_NAME;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.GENERATE_DD;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.BROWSE_BUTTON_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.CLASS_NAME_LABEL;
-import static org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties.PROJECT_NAME;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.J2EEFileUtil;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.AnnotationsStandaloneGroup;
-import org.eclipse.jst.j2ee.internal.wizard.NewJavaClassWizardPage;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.WebUtilities;
-import org.eclipse.jst.j2ee.web.IServletConstants;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
-import org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaProject;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public abstract class NewWebClassWizardPage extends NewJavaClassWizardPage {
-
- protected AnnotationsStandaloneGroup annotationsGroup;
-
- protected Button existingClassButton;
- protected Label existingClassLabel;
- protected Text existingClassText;
- protected Button existingButton;
-
- public NewWebClassWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle, String moduleType) {
- super(model, pageName, pageDesc, pageTitle, moduleType);
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = super.createTopLevelComposite(parent);
-
- //bug 303931
- // projectNameLabel.setText(WEBUIMessages.WEB_PROJECT_LBL);
-
- addSeperator(composite, 3);
- createUseExistingGroup(composite);
- createAnnotationsGroup(composite);
-
- Dialog.applyDialogFont(composite);
-
- return composite;
- }
-
- @Override
- protected IProject getExtendedSelectedProject(Object selection) {
- if (selection instanceof CompressedJavaProject) {
- return ((CompressedJavaProject) selection).getProject().getProject();
- }
-
- return super.getExtendedSelectedProject(selection);
- }
-
- protected abstract String getUseExistingCheckboxText();
-
- protected abstract String getUseExistingProperty();
-
- protected abstract void handleClassButtonSelected();
-
- /**
- * Create annotations group and set default enablement
- */
- private void createAnnotationsGroup(Composite parent) {
- if (isWebDocletProject()) {
- annotationsGroup = new AnnotationsStandaloneGroup(parent, model, J2EEProjectUtilities.EJB.equals(projectType),
- J2EEProjectUtilities.DYNAMIC_WEB.equals(projectType));
- if (!model.isPropertySet(PROJECT_NAME))
- return;
- IProject project = ProjectUtilities.getProject(model.getStringProperty(PROJECT_NAME));
- annotationsGroup.setEnablement(project);
- // annotationsGroup.setUseAnnotations(true);
- } else {
- // not a Web Doclet project - make sure that the USE_ANNOTATIONS property is off
- model.setProperty(USE_ANNOTATIONS, false);
- }
- }
-
- private void createUseExistingGroup(Composite composite) {
- existingButton = new Button(composite, SWT.CHECK);
- existingButton.setText(getUseExistingCheckboxText());
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.horizontalSpan = 3;
- existingButton.setLayoutData(data);
- synchHelper.synchCheckbox(existingButton, getUseExistingProperty(), null);
- existingButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleExistingButtonSelected();
- }
- });
-
- existingClassLabel = new Label(composite, SWT.LEFT);
- existingClassLabel.setText(CLASS_NAME_LABEL);
- existingClassLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- existingClassLabel.setEnabled(false);
-
- existingClassText = new Text(composite, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
- existingClassText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- existingClassText.setEnabled(false);
- synchHelper.synchText(existingClassText, CLASS_NAME, null);
-
- existingClassButton = new Button(composite, SWT.PUSH);
- existingClassButton.setText(BROWSE_BUTTON_LABEL);
- existingClassButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- existingClassButton.setEnabled(false);
- existingClassButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleClassButtonSelected();
- }
- });
- }
-
- private void handleExistingButtonSelected() {
- boolean enable = existingButton.getSelection();
- existingClassLabel.setEnabled(enable);
- existingClassButton.setEnabled(enable);
- packageText.setEnabled(!enable);
- packageButton.setEnabled(!enable);
- packageLabel.setEnabled(!enable);
- classText.setEnabled(!enable);
- classLabel.setEnabled(!enable);
- superText.setEnabled(!enable);
- superButton.setEnabled(!enable);
- superLabel.setEnabled(!enable);
- }
-
- private boolean isWebDocletProject() {
- String projectName = model.getStringProperty(PROJECT_NAME);
- if(projectName != null && !"".equals(projectName.trim())){ //$NON-NLS-1$
- IProject project = ProjectUtilities.getProject(projectName);
- try {
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- return facetedProject.hasProjectFacet(WebFacetUtils.WEB_XDOCLET_FACET);
- } catch (CoreException e) {
- ServletUIPlugin.log(e);
- }
- }
- return false;
- }
-
- @Override
- protected void validateProjectRequirements(IProject project)
- {
- if(JavaEEProjectUtilities.isWebFragmentProject(project)){
- // don't create a web DD, since web fragment project is created with one.
- model.setBooleanProperty(GENERATE_DD, Boolean.FALSE);
- return;
- }
- IVirtualComponent component = ComponentCore.createComponent(project);
- if(component.getRootFolder() != null
- && component.getRootFolder().getUnderlyingFolder() != null){
- IFile ddXmlFile = component.getRootFolder().getUnderlyingFolder().getFile(new Path(J2EEConstants.WEBAPP_DD_URI));
- if (!ddXmlFile.exists())
- {
- // add a flag into the model to create the DD at the beginning of the operation
- model.setBooleanProperty(GENERATE_DD, Boolean.TRUE);
- }
- else
- {
- // don't create a DD, since one already exists.
- model.setBooleanProperty(GENERATE_DD, Boolean.FALSE);
- }
- }
- }
-
- protected Object getSelectedObject() {
- IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- if (window == null)
- return null;
- ISelection selection = window.getSelectionService().getSelection();
- if (selection == null)
- return null;
- if (!(selection instanceof IStructuredSelection))
- return null;
- IStructuredSelection ssel = (IStructuredSelection) selection;
- if (ssel.size() != 1)
- return null;
- return ssel.getFirstElement();
- }
-
- private IType getPrimaryType(ICompilationUnit cu) {
- return cu.getType(new Path(cu.getElementName()).removeFileExtension().toString());
- }
-
- private boolean isObjectSubclassOf(Object obj, String base) {
- IJavaElement jelem = getJavaElement(obj);
-
- try {
- if (jelem != null) {
- if (jelem instanceof ICompilationUnit) {
- ICompilationUnit cu = (ICompilationUnit) jelem;
- jelem = getPrimaryType(cu);
- }
-
- if (jelem instanceof IType && ((IType) jelem).isClass()) {
- IType type = (IType) jelem;
- ITypeHierarchy typeHierarchy = type.newTypeHierarchy(null);
- for (IType superType : typeHierarchy.getAllSuperInterfaces(type)) {
- if (base.equals(superType.getFullyQualifiedName()))
- return true;
- }
- }
- }
- } catch (JavaModelException e) {
- ServletUIPlugin.log(e);
- }
-
- return false;
- }
-
- protected boolean isServlet(Object obj) {
- if (obj instanceof org.eclipse.jst.javaee.web.Servlet)
- return true;
-
- if (obj instanceof org.eclipse.jst.j2ee.webapplication.Servlet)
- return true;
-
- return isObjectSubclassOf(obj, IServletConstants.QUALIFIED_SERVLET);
- }
-
- protected boolean isFilter(Object obj) {
- if (obj instanceof org.eclipse.jst.javaee.web.Filter)
- return true;
-
- if (obj instanceof org.eclipse.jst.j2ee.webapplication.Filter)
- return true;
-
- return isObjectSubclassOf(obj, IServletConstants.QUALIFIED_FILTER);
- }
-
- private String getJavaClass(Object obj) {
- IJavaElement jelem = getJavaElement(obj);
-
- if (jelem == null) {
- throw new IllegalArgumentException("the object parameter must be instance of IJavaElement"); //$NON-NLS-1$
- }
-
- if (jelem instanceof ICompilationUnit) {
- ICompilationUnit cu = (ICompilationUnit) jelem;
- jelem = getPrimaryType(cu);
- }
- return ((IType) jelem).getFullyQualifiedName();
- }
-
- protected String getServletClass(Object obj) {
- if (obj instanceof org.eclipse.jst.javaee.web.Servlet) {
- org.eclipse.jst.javaee.web.Servlet servlet = (org.eclipse.jst.javaee.web.Servlet) obj;
- return servlet.getServletClass();
- }
-
- if (obj instanceof org.eclipse.jst.j2ee.webapplication.Servlet) {
- org.eclipse.jst.j2ee.webapplication.Servlet servlet = (org.eclipse.jst.j2ee.webapplication.Servlet) obj;
- return servlet.getServletClass().getQualifiedName();
- }
-
- return getJavaClass(obj);
- }
-
- protected String getFilterClass(Object obj) {
- if (obj instanceof org.eclipse.jst.javaee.web.Filter) {
- org.eclipse.jst.javaee.web.Filter filter = (org.eclipse.jst.javaee.web.Filter) obj;
- return filter.getFilterClass();
- }
-
- if (obj instanceof org.eclipse.jst.j2ee.webapplication.Filter) {
- org.eclipse.jst.j2ee.webapplication.Filter filter = (org.eclipse.jst.j2ee.webapplication.Filter) obj;
- return filter.getFilterClass().getQualifiedName();
- }
-
- return getJavaClass(obj);
- }
-
- protected String getServletName(Object obj) {
- if (obj instanceof org.eclipse.jst.javaee.web.Servlet) {
- org.eclipse.jst.javaee.web.Servlet servlet = (org.eclipse.jst.javaee.web.Servlet) obj;
- return servlet.getServletName();
- }
-
- if (obj instanceof org.eclipse.jst.j2ee.webapplication.Servlet) {
- org.eclipse.jst.j2ee.webapplication.Servlet servlet = (org.eclipse.jst.j2ee.webapplication.Servlet) obj;
- return servlet.getServletName();
- }
-
- String servletClass = getServletClass(obj);
- IProject project = getJavaElement(obj).getJavaProject().getProject();
- IModelProvider provider = ModelProviderManager.getModelProvider(project);
- Object modelObject = provider.getModelObject();
- if (modelObject instanceof org.eclipse.jst.javaee.web.WebApp) {
- org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) modelObject;
- Iterator servlets = webApp.getServlets().iterator();
- while (servlets.hasNext()) {
- org.eclipse.jst.javaee.web.Servlet servlet = (org.eclipse.jst.javaee.web.Servlet) servlets.next();
- String qualified = servlet.getServletClass();
- if (qualified.equals(servletClass)) {
- return servlet.getServletName();
- }
- }
- } else if (modelObject instanceof org.eclipse.jst.j2ee.webapplication.WebApp) {
- org.eclipse.jst.j2ee.webapplication.WebApp webApp = (org.eclipse.jst.j2ee.webapplication.WebApp) modelObject;
- Iterator servlets = webApp.getServlets().iterator();
- while (servlets.hasNext()) {
- org.eclipse.jst.j2ee.webapplication.Servlet servlet = (org.eclipse.jst.j2ee.webapplication.Servlet) servlets.next();
- String qualified = servlet.getServletClass().getQualifiedName();
- if (qualified.equals(servletClass)) {
- return servlet.getServletName();
- }
- }
- }
-
- return null;
- }
-
- protected boolean isServletJSP(Object obj) {
- return getServletJSPFile(obj) != null;
- }
-
- protected String getServletJSPFile(Object obj) {
- if (obj instanceof org.eclipse.jst.javaee.web.Servlet) {
- org.eclipse.jst.javaee.web.Servlet servlet = (org.eclipse.jst.javaee.web.Servlet) obj;
- return servlet.getJspFile();
- }
-
- if (obj instanceof org.eclipse.jst.j2ee.webapplication.Servlet) {
- org.eclipse.jst.j2ee.webapplication.Servlet servlet = (org.eclipse.jst.j2ee.webapplication.Servlet) obj;
- org.eclipse.jst.j2ee.webapplication.WebType webType = servlet.getWebType();
- if (webType.isJspType()) {
- org.eclipse.jst.j2ee.webapplication.JSPType jspType = (org.eclipse.jst.j2ee.webapplication.JSPType) webType;
- return jspType.getJspFile();
- }
- }
-
- return null;
- }
-
- protected boolean isWebFolder(Object obj) {
- if (obj instanceof IFolder) {
- return WebUtilities.isWebResource(obj);
- }
- return false;
- }
-
- protected boolean isJSP(Object obj) {
- if (obj instanceof IFile) {
- IFile file = (IFile) obj;
- return WebUtilities.isWebResource(file) && file.getName().endsWith(J2EEFileUtil.DOT_JSP);
- }
- return false;
- }
-
- protected String getWebResourcePath(IResource resource) {
- IVirtualComponent comp = ComponentCore.createComponent(resource.getProject());
- if (comp != null) {
- IPath rootPath = comp.getRootFolder().getWorkspaceRelativePath();
- return "/" + resource.getFullPath().makeRelativeTo(rootPath).toString(); //$NON-NLS-1$
- }
- return null;
- }
-
- protected String makeFirstCharUppercase(String str) {
- if (str == null || str.length() == 0)
- return str;
-
- StringBuilder builder = new StringBuilder(str);
- builder.setCharAt(0, Character.toUpperCase(builder.charAt(0)));
- return builder.toString();
- }
-
- protected String getFileNameWithouFileExtension(IFile file) {
- String name = file.getName();
- String ext = file.getFileExtension();
-
- if (ext == null)
- return name;
-
- return name.substring(0, name.length() - (ext.length() + 1));
- }
-
- protected void checkExistingButton(boolean state) {
- existingButton.setSelection(state);
- existingButton.notifyListeners(SWT.Selection, new Event());
- }
-
- @Override
- protected boolean isProjectValid(IProject project) {
- boolean result;
- try {
- result = project.isAccessible() &&
- project.hasNature(IModuleConstants.MODULE_NATURE_ID) &&
- (JavaEEProjectUtilities.isDynamicWebProject(project) || JavaEEProjectUtilities.isWebFragmentProject(project));
- } catch (CoreException ce) {
- result = false;
- }
- return result;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebWizard.java
deleted file mode 100644
index d1f6fb9..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebWizard.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Kaloyan Raev, kaloyan.raev@sap.com
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-
-/**
- * @author jlanuti
- */
-public abstract class NewWebWizard extends DataModelWizard implements INewWizard {
-
- /**
- * @param model
- */
- public NewWebWizard(IDataModel model) {
- super(model);
- }
-
- /**
- * Default constructor
- */
- public NewWebWizard() {
- super();
- }
-
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- getDataModel();
- }
-
- protected IStructuredSelection getCurrentSelection() {
- IWorkbenchWindow window = ServletUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
- if (window != null) {
- ISelection selection = window.getSelectionService().getSelection();
- if (selection instanceof IStructuredSelection) {
- return (IStructuredSelection) selection;
- }
- }
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ServletDataModelSyncHelper.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ServletDataModelSyncHelper.java
deleted file mode 100644
index ce69dac..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ServletDataModelSyncHelper.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
-
-public class ServletDataModelSyncHelper extends DataModelSynchHelper {
- protected Map widgetToValueHash;
- protected MultipleCheckboxSelectionListener multipleCheckboxSelectionListener;
-
- public ServletDataModelSyncHelper(IDataModel model) {
- super(model);
- }
-
- /**
- * Sets the UI to have the property value defined in the model
- *
- * @param propertyName
- * @link IDataModelListener for the flag values.
- */
- @Override
- public void synchUIWithModel(final String propertyName, final int flag) {
- if (null != propertyToWidgetHash && propertyToWidgetHash.containsKey(propertyName)) {
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- try {
- Object obj = propertyToWidgetHash.get(propertyName);
- if (obj != null) {
- if (obj instanceof List) {
- List widgets = (List) obj;
- for (int i = 0; i < widgets.size(); i++) {
- currentWidget = (Widget) widgets.get(i);
- synchUIWithModel(propertyName, flag, currentWidget);
- }
- } else {
- currentWidget = (Widget) obj;
- synchUIWithModel(propertyName, flag, currentWidget);
- }
- }
- } finally {
- currentWidget = null;
- }
- }
- });
- }
- }
-
- protected void synchUIWithModel(final String propertyName, final int flag, Widget currentWidget) {
- if (currentWidget != null && currentWidget != currentWidgetFromEvent) {
- //We must hold a copy in a temp variable because setting the widget value
- //may trigger an event that will cause this method to be called again.
- Widget widget = currentWidget;
- try {
- ignoreModifyEvent = true;
- if (currentWidget instanceof Text)
- setWidgetValue(propertyName, flag, (Text) currentWidget);
- else if (currentWidget instanceof Combo) {
- setWidgetValue(propertyName, flag, (Combo) currentWidget);
- } else if (currentWidget instanceof Button)
- setWidgetValue(propertyName, flag, (Button) currentWidget);
- else if (currentWidget instanceof Label)
- setWidgetValue(propertyName, flag, (Label) currentWidget);
- else if (currentWidget instanceof List)
- setWidgetValue(propertyName, flag, (org.eclipse.swt.widgets.List) currentWidget);
- else if (currentWidget instanceof Table)
- setWidgetValue(propertyName, flag, (Table) currentWidget);
- else if (currentWidget instanceof Tree)
- setWidgetValue(propertyName, flag, (Tree) currentWidget);
- } finally {
- ignoreModifyEvent = false;
- }
- //Pass the copy of the currentWidget
- setEnablement((Control) widget, dataModel.isPropertyEnabled(propertyName));
- }
- }
-
- @Override
- protected void setWidgetValue(String propertyName, int flag, Button button) {
- if ((button.getStyle() & SWT.CHECK) == SWT.CHECK) {
- Object propertyValue = dataModel.getProperty(propertyName);
- if (propertyValue instanceof java.util.List) {
- List value = (List) propertyValue;
- Object buttonValue = widgetToValueHash.get(button);
- boolean exists = value.contains(buttonValue);
- if (button.getSelection() != exists) {
- button.setSelection(exists);
- }
- return;
- }
- }
- }
-
- private class MultipleCheckboxSelectionListener implements SelectionListener {
- public void widgetSelected(SelectionEvent e) {
- Button button = (Button) e.getSource();
- if (currentWidget == button)
- return;
- try {
- currentWidgetFromEvent = button;
- String propertyName = (String) widgetToPropertyHash.get(button);
- Object propertyValue = widgetToValueHash.get(button);
-
- Object contents = dataModel.getProperty(propertyName);
-
- if (contents == null) {
- contents = new ArrayList();
- }
- if (contents instanceof java.util.List) {
- List list = (List) contents;
- if (button.getSelection()) {
- if (!list.contains(propertyValue))
- list.add(propertyValue);
- } else {
- list.remove(propertyValue);
- }
- setProperty(propertyName, list);
- dataModel.notifyPropertyChange(propertyName, DataModelEvent.VALUE_CHG);
- }
- } finally {
- currentWidgetFromEvent = null;
- }
- }
-
-
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- }
-
- public void synchCheckbox(Button checkbox, String textValue, String propertyName, Control[] dependentControls) {
- setCompositeValue(checkbox, textValue);
- synchComposite(checkbox, propertyName, dependentControls);
- if (multipleCheckboxSelectionListener == null) {
- multipleCheckboxSelectionListener = new MultipleCheckboxSelectionListener();
- }
- checkbox.addSelectionListener(multipleCheckboxSelectionListener);
- }
-
- protected void setCompositeValue(Widget widget, Object value) {
- if (widgetToValueHash == null)
- widgetToValueHash = new HashMap();
- widgetToValueHash.put(widget, value);
- }
-
- @Override
- protected void synchComposite(Widget widget, String propertyName, Control[] depControls) {
- if (null == widgetToPropertyHash)
- widgetToPropertyHash = new HashMap();
- if (propertyToWidgetHash == null)
- propertyToWidgetHash = new HashMap();
- widgetToPropertyHash.put(widget, propertyName);
- Object value = propertyToWidgetHash.get(propertyName);
- List widgets;
- if (value == null || !(value instanceof List)) {
- widgets = new ArrayList();
- } else {
- widgets = (List) value;
- }
- widgets.add(widget);
- propertyToWidgetHash.put(propertyName, widgets);
-
- if (depControls != null) {
- if (widgetToDepControls == null)
- widgetToDepControls = new HashMap();
- widgetToDepControls.put(widget, depControls);
- }
- synchUIWithModel(propertyName, DataModelEvent.VALUE_CHG);
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/SimpleTypedElementSelectionValidator.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/SimpleTypedElementSelectionValidator.java
deleted file mode 100644
index a05cca4..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/SimpleTypedElementSelectionValidator.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-/**
- * Implementation of a <code>ISelectionValidator</code> to validate the type
- * of an element. Empty selections are not accepted.
- */
-public class SimpleTypedElementSelectionValidator implements ISelectionStatusValidator {
-
- private IStatus fgErrorStatus = new Status(IStatus.ERROR, ServletUIPlugin.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
- private IStatus fgOKStatus = new Status(IStatus.OK, ServletUIPlugin.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
-
- private Class[] fAcceptedTypes;
- private boolean fAllowMultipleSelection;
-
- /**
- * @param acceptedTypes
- * The types accepted by the validator
- * @param allowMultipleSelection
- * If set to <code>true</code>, the validator allows
- * multiple selection.
- */
- public SimpleTypedElementSelectionValidator(Class[] acceptedTypes, boolean allowMultipleSelection) {
- org.eclipse.core.runtime.Assert.isNotNull(acceptedTypes);
- fAcceptedTypes = acceptedTypes;
- fAllowMultipleSelection = allowMultipleSelection;
- }
-
- /*
- * @see org.eclipse.ui.dialogs.ISelectionValidator#isValid(java.lang.Object)
- */
- public IStatus validate(Object[] elements) {
- if (isValid(elements)) {
- return fgOKStatus;
- }
- return fgErrorStatus;
- }
-
- private boolean isOfAcceptedType(Object o) {
- for (int i = 0; i < fAcceptedTypes.length; i++) {
- if (fAcceptedTypes[i].isInstance(o)) {
- return true;
- }
- }
- return false;
- }
-
- private boolean isValid(Object[] selection) {
- if (selection.length == 0) {
- return false;
- }
-
- if (!fAllowMultipleSelection && selection.length != 1) {
- return false;
- }
-
- for (int i = 0; i < selection.length; i++) {
- Object o = selection[i];
- if (!isOfAcceptedType(o)) {
- return false;
- }
- }
- return true;
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringArrayTableWizardSectionCallback.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringArrayTableWizardSectionCallback.java
deleted file mode 100644
index e75f6c1..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringArrayTableWizardSectionCallback.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.wizard.StringArrayTableWizardSection.StringArrayDialogCallback;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Implementation of the <code>StringArrayDialogCallback</code> interface for
- * both "Initialization Parameters" and "URL Mappings" table views.
- */
-public class StringArrayTableWizardSectionCallback implements
- StringArrayDialogCallback {
-
- /**
- * The first text field should not be empty.
- */
- public boolean validate(Text[] texts) {
- if (texts.length > 0) {
- return texts[0].getText().trim().length() > 0;
- }
- return true;
- }
-
- /**
- * Trims the text values.
- */
- public String[] retrieveResultStrings(Text[] texts) {
- int n = texts.length;
- String[] result = new String[n];
- for (int i = 0; i < n; i++) {
- result[i] = texts[i].getText().trim();
- }
- return result;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringMatcher.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringMatcher.java
deleted file mode 100644
index d148b9c..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringMatcher.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *
- * Note: this class was copied from org.eclipse.jst.internal.ui.util
- * It has much requested as an API since there are a dozen such copies throughout
- * Eclipse and related projects. (Such as, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=12214)
- * These requests have been rejected since, all users should eventually migrate to use javax.regx
- * counterparts instead.
- *
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import java.util.*;
-
-/**
- * A string pattern matcher. Supports '*' and '?' wildcards.
- */
-public class StringMatcher {
- protected String fPattern;
- protected int fLength; // pattern length
- protected boolean fIgnoreWildCards;
- protected boolean fIgnoreCase;
- protected boolean fHasLeadingStar;
- protected boolean fHasTrailingStar;
- protected String fSegments[]; //the given pattern is split into * separated segments
-
- /* boundary value beyond which we don't need to search in the text */
- protected int fBound= 0;
-
-
- protected static final char fSingleWildCard= '\u0000';
-
- public static class Position {
- int start; //inclusive
- int end; //exclusive
- public Position(int start, int end) {
- this.start= start;
- this.end= end;
- }
- public int getStart() {
- return start;
- }
- public int getEnd() {
- return end;
- }
- }
- /**
- * StringMatcher constructor takes in a String object that is a simple
- * pattern. The pattern may contain '*' for 0 and many characters and
- * '?' for exactly one character.
- *
- * Literal '*' and '?' characters must be escaped in the pattern
- * e.g., "\*" means literal "*", etc.
- *
- * Escaping any other character (including the escape character itself),
- * just results in that character in the pattern.
- * e.g., "\a" means "a" and "\\" means "\"
- *
- * If invoking the StringMatcher with string literals in Java, don't forget
- * escape characters are represented by "\\".
- *
- * @param pattern the pattern to match text against
- * @param ignoreCase if true, case is ignored
- * @param ignoreWildCards if true, wild cards and their escape sequences are ignored
- * (everything is taken literally).
- */
- public StringMatcher(String pattern, boolean ignoreCase, boolean ignoreWildCards) {
- if (pattern == null)
- throw new IllegalArgumentException();
- fIgnoreCase= ignoreCase;
- fIgnoreWildCards= ignoreWildCards;
- fPattern= pattern;
- fLength= pattern.length();
-
- if (fIgnoreWildCards) {
- parseNoWildCards();
- } else {
- parseWildCards();
- }
- }
- /**
- * Find the first occurrence of the pattern between <code>start</code)(inclusive)
- * and <code>end</code>(exclusive).
- * @param text the String object to search in
- * @param start the starting index of the search range, inclusive
- * @param end the ending index of the search range, exclusive
- * @return an <code>StringMatcher.Position</code> object that keeps the starting
- * (inclusive) and ending positions (exclusive) of the first occurrence of the
- * pattern in the specified range of the text; return null if not found or subtext
- * is empty (start==end). A pair of zeros is returned if pattern is empty string
- * Note that for pattern like "*abc*" with leading and trailing stars, position of "abc"
- * is returned. For a pattern like"*??*" in text "abcdf", (1,3) is returned
- */
- public StringMatcher.Position find(String text, int start, int end) {
- if (text == null)
- throw new IllegalArgumentException();
-
- int tlen= text.length();
- int innerStart = start;
- int innerEnd = end;
- if (innerStart < 0)
- innerStart= 0;
- if (innerEnd > tlen)
- innerEnd= tlen;
- if (innerEnd < 0 ||innerStart >= innerEnd )
- return null;
- if (fLength == 0)
- return new Position(innerStart, innerStart);
- if (fIgnoreWildCards) {
- int x= posIn(text, innerStart, innerEnd);
- if (x < 0)
- return null;
- return new Position(x, x+fLength);
- }
-
- int segCount= fSegments.length;
- if (segCount == 0)//pattern contains only '*'(s)
- return new Position (innerStart, innerEnd);
-
- int curPos= innerStart;
- int matchStart= -1;
- int i;
- for (i= 0; i < segCount && curPos < innerEnd; ++i) {
- String current= fSegments[i];
- int nextMatch= regExpPosIn(text, curPos, innerEnd, current);
- if (nextMatch < 0 )
- return null;
- if(i == 0)
- matchStart= nextMatch;
- curPos= nextMatch + current.length();
- }
- if (i < segCount)
- return null;
- return new Position(matchStart, curPos);
- }
- /**
- * match the given <code>text</code> with the pattern
- * @return true if matched eitherwise false
- * @param text a String object
- */
- public boolean match(String text) {
- return match(text, 0, text.length());
- }
- /**
- * Given the starting (inclusive) and the ending (exclusive) positions in the
- * <code>text</code>, determine if the given substring matches with aPattern
- * @return true if the specified portion of the text matches the pattern
- * @param text a String object that contains the substring to match
- * @param start marks the starting position (inclusive) of the substring
- * @param end marks the ending index (exclusive) of the substring
- */
- public boolean match(String text, int start, int end) {
- if (null == text)
- throw new IllegalArgumentException();
-
- int innerStart = start;
- int innerEnd = end;
-
- if (innerStart > innerEnd)
- return false;
-
- if (fIgnoreWildCards)
- return (innerEnd - innerStart == fLength) && fPattern.regionMatches(fIgnoreCase, 0, text, innerStart, fLength);
- int segCount= fSegments.length;
- if (segCount == 0 && (fHasLeadingStar || fHasTrailingStar)) // pattern contains only '*'(s)
- return true;
- if (innerStart == innerEnd)
- return fLength == 0;
- if (fLength == 0)
- return innerStart == innerEnd;
-
- int tlen= text.length();
- if (innerStart < 0)
- innerStart= 0;
- if (innerEnd > tlen)
- innerEnd= tlen;
-
- int tCurPos= innerStart;
- int bound= innerEnd - fBound;
- if ( bound < 0)
- return false;
- int i=0;
- String current= fSegments[i];
- int segLength= current.length();
-
- /* process first segment */
- if (!fHasLeadingStar){
- if(!regExpRegionMatches(text, innerStart, current, 0, segLength)) {
- return false;
- }
- ++i;
- tCurPos= tCurPos + segLength;
- }
- if ((fSegments.length == 1) && (!fHasLeadingStar) && (!fHasTrailingStar)) {
- // only one segment to match, no wildcards specified
- return tCurPos == innerEnd;
- }
- /* process middle segments */
- while (i < segCount) {
- current= fSegments[i];
- int currentMatch;
- int k= current.indexOf(fSingleWildCard);
- if (k < 0) {
- currentMatch= textPosIn(text, tCurPos, innerEnd, current);
- if (currentMatch < 0)
- return false;
- } else {
- currentMatch= regExpPosIn(text, tCurPos, innerEnd, current);
- if (currentMatch < 0)
- return false;
- }
- tCurPos= currentMatch + current.length();
- i++;
- }
-
- /* process final segment */
- if (!fHasTrailingStar && tCurPos != innerEnd) {
- int clen= current.length();
- return regExpRegionMatches(text, innerEnd - clen, current, 0, clen);
- }
- return i == segCount ;
- }
-
- /**
- * This method parses the given pattern into segments seperated by wildcard '*' characters.
- * Since wildcards are not being used in this case, the pattern consists of a single segment.
- */
- private void parseNoWildCards() {
- fSegments= new String[1];
- fSegments[0]= fPattern;
- fBound= fLength;
- }
- /**
- * Parses the given pattern into segments seperated by wildcard '*' characters.
- */
- private void parseWildCards() {
- if(fPattern.startsWith("*"))//$NON-NLS-1$
- fHasLeadingStar= true;
- if(fPattern.endsWith("*")) {//$NON-NLS-1$
- /* make sure it's not an escaped wildcard */
- if (fLength > 1 && fPattern.charAt(fLength - 2) != '\\') {
- fHasTrailingStar= true;
- }
- }
-
- Vector temp= new Vector();
-
- int pos= 0;
- StringBuffer buf= new StringBuffer();
- while (pos < fLength) {
- char c= fPattern.charAt(pos++);
- switch (c) {
- case '\\':
- if (pos >= fLength) {
- buf.append(c);
- } else {
- char next= fPattern.charAt(pos++);
- /* if it's an escape sequence */
- if (next == '*' || next == '?' || next == '\\') {
- buf.append(next);
- } else {
- /* not an escape sequence, just insert literally */
- buf.append(c);
- buf.append(next);
- }
- }
- break;
- case '*':
- if (buf.length() > 0) {
- /* new segment */
- temp.addElement(buf.toString());
- fBound += buf.length();
- buf.setLength(0);
- }
- break;
- case '?':
- /* append special character representing single match wildcard */
- buf.append(fSingleWildCard);
- break;
- default:
- buf.append(c);
- }
- }
-
- /* add last buffer to segment list */
- if (buf.length() > 0) {
- temp.addElement(buf.toString());
- fBound += buf.length();
- }
-
- fSegments= new String[temp.size()];
- temp.copyInto(fSegments);
- }
- /**
- * @param text a string which contains no wildcard
- * @param start the starting index in the text for search, inclusive
- * @param end the stopping point of search, exclusive
- * @return the starting index in the text of the pattern , or -1 if not found
- */
- protected int posIn(String text, int start, int end) {//no wild card in pattern
- int max= end - fLength;
-
- if (!fIgnoreCase) {
- int i= text.indexOf(fPattern, start);
- if (i == -1 || i > max)
- return -1;
- return i;
- }
-
- for (int i= start; i <= max; ++i) {
- if (text.regionMatches(true, i, fPattern, 0, fLength))
- return i;
- }
-
- return -1;
- }
- /**
- * @param text a simple regular expression that may only contain '?'(s)
- * @param start the starting index in the text for search, inclusive
- * @param end the stopping point of search, exclusive
- * @param p a simple regular expression that may contains '?'
- * @return the starting index in the text of the pattern , or -1 if not found
- */
- protected int regExpPosIn(String text, int start, int end, String p) {
- int plen= p.length();
-
- int max= end - plen;
- for (int i= start; i <= max; ++i) {
- if (regExpRegionMatches(text, i, p, 0, plen))
- return i;
- }
- return -1;
- }
-
-
- protected boolean regExpRegionMatches(String text, int tStart, String p, int pStart, int plen) {
- int innerPlen = plen;
- int innerTStart = tStart;
- int innerPStart = pStart;
- while (innerPlen-- > 0) {
- char tchar= text.charAt(innerTStart++);
- char pchar= p.charAt(innerPStart++);
-
- /* process wild cards */
- if (!fIgnoreWildCards) {
- /* skip single wild cards */
- if (pchar == fSingleWildCard) {
- continue;
- }
- }
- if (pchar == tchar)
- continue;
- if (fIgnoreCase) {
- if (Character.toUpperCase(tchar) == Character.toUpperCase(pchar))
- continue;
- // comparing after converting to upper case doesn't handle all cases;
- // also compare after converting to lower case
- if (Character.toLowerCase(tchar) == Character.toLowerCase(pchar))
- continue;
- }
- return false;
- }
- return true;
- }
- /**
- * @param text the string to match
- * @param start the starting index in the text for search, inclusive
- * @param end the stopping point of search, exclusive
- * @param p a string that has no wildcard
- * @return the starting index in the text of the pattern , or -1 if not found
- */
- protected int textPosIn(String text, int start, int end, String p) {
-
- int plen= p.length();
- int max= end - plen;
-
- if (!fIgnoreCase) {
- int i= text.indexOf(p, start);
- if (i == -1 || i > max)
- return -1;
- return i;
- }
-
- for (int i= start; i <= max; ++i) {
- if (text.regionMatches(true, i, p, 0, plen))
- return i;
- }
-
- return -1;
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.java
deleted file mode 100644
index a498a9b..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.IClasspathContainerPage;
-import org.eclipse.jdt.ui.wizards.IClasspathContainerPageExtension;
-import org.eclipse.jdt.ui.wizards.NewElementWizardPage;
-import org.eclipse.jst.j2ee.internal.web.classpath.WebAppLibrariesContainer;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public class WebAppLibrariesContainerPage
-
- extends NewElementWizardPage
- implements IClasspathContainerPage, IClasspathContainerPageExtension
-
-{
- private IProject ownerProject;
- private String libsProjectName;
- private Combo projectsCombo;
-
- public WebAppLibrariesContainerPage()
- {
- super( "WebAppLibrariesContainerPage" ); //$NON-NLS-1$
-
- setTitle( Resources.pageTitle );
- setDescription( Resources.pageDescription );
- }
-
- public IClasspathEntry getSelection()
- {
- IPath path = new Path( WebAppLibrariesContainer.CONTAINER_ID );
-
- final int index = this.projectsCombo.getSelectionIndex();
- if(index != -1){
- final String selectedProjectName = this.projectsCombo.getItem( index );
-
- if( this.ownerProject == null ||
- ! selectedProjectName.equals( this.ownerProject.getName() ) )
- {
- path = path.append( selectedProjectName );
- }
- }
-
- return JavaCore.newContainerEntry( path );
- }
-
- public void setSelection( final IClasspathEntry cpentry )
- {
- final IPath path = cpentry == null ? null : cpentry.getPath();
-
- if( path == null || path.segmentCount() == 1 )
- {
- if( this.ownerProject != null )
- {
- this.libsProjectName = this.ownerProject.getName();
- }
- }
- else
- {
- this.libsProjectName = path.segment( 1 );
- }
- }
-
- public void createControl( final Composite parent )
- {
- final Composite composite = new Composite( parent, SWT.NONE );
- composite.setLayout( new GridLayout( 2, false ) );
-
- final Label label = new Label( composite, SWT.NONE );
- label.setText( Resources.projectsLabel );
-
- final String[] webProjects = getWebProjects();
-
- this.projectsCombo = new Combo( composite, SWT.READ_ONLY );
- this.projectsCombo.setItems( webProjects );
-
- final int index;
-
- if( this.ownerProject != null )
- {
- index = indexOf( webProjects, this.libsProjectName );
- }
- else
- {
- if( this.projectsCombo.getItemCount() > 0 )
- {
- index = 0;
- }
- else
- {
- index = -1;
- }
- }
-
- if( index != -1 )
- {
- this.projectsCombo.select( index );
- }
-
- final GridData gd = new GridData();
- gd.grabExcessHorizontalSpace = true;
- gd.minimumWidth = 100;
-
- this.projectsCombo.setLayoutData( gd );
-
- setControl( composite );
- }
-
- public boolean finish()
- {
- return true;
- }
-
- public void initialize( final IJavaProject project,
- final IClasspathEntry[] currentEntries )
- {
- this.ownerProject = ( project == null ? null : project.getProject() );
- }
-
- private static String[] getWebProjects()
- {
- try
- {
- final Set projects
- = ProjectFacetsManager.getFacetedProjects( WebFacetUtils.WEB_FACET );
-
- final String[] names = new String[ projects.size() ];
- int i = 0;
-
- for( Iterator itr = projects.iterator(); itr.hasNext(); i++ )
- {
- final IFacetedProject fproj = (IFacetedProject) itr.next();
- names[ i ] = fproj.getProject().getName();
- }
-
- Arrays.sort( names );
-
- return names;
- }
- catch( CoreException e )
- {
- ServletUIPlugin.log( e.getStatus() );
- return new String[ 0 ];
- }
- }
-
- private static int indexOf( final String[] array,
- final String str )
- {
- for( int i = 0; i < array.length; i++ )
- {
- if( array[ i ].equals( str ) )
- {
- return i;
- }
- }
-
- return -1;
- }
-
- private static final class Resources
-
- extends NLS
-
- {
- public static String pageTitle;
- public static String pageDescription;
- public static String projectsLabel;
-
- static
- {
- initializeMessages( WebAppLibrariesContainerPage.class.getName(),
- Resources.class );
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.properties b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.properties
deleted file mode 100644
index 85621ab..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pageTitle = Web App Libraries
-pageDescription = This container dynamically manages classpath entries for types in the WEB-INF/lib and WEB-INF/classes directories.
-projectsLabel = Project:\
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportPage.java
deleted file mode 100644
index 66b7631..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportPage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleExportPage;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class WebComponentExportPage extends J2EEModuleExportPage {
- /**
- * @param model
- * @param pageName
- */
- public WebComponentExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
- super(model, pageName, selection);
- setTitle(WEBUIMessages.WEB_EXPORT_MAIN_PG_TITLE);
- setDescription(WEBUIMessages.WEB_EXPORT_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_EXPORT_WIZARD_BANNER));
- setInfopopID(IWebUIContextIds.WAR_EXPORT_PAGE1);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getProjectImportLabel()
- */
- @Override
- protected String getComponentLabel() {
- return WEBUIMessages.WEB_PROJECT_LBL;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFilterExpression()
- */
- @Override
- protected String[] getFilterExpression() {
- return new String[]{"*.war"}; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEExportPage#isMetaTypeSupported(java.lang.Object)
- */
- @Override
- protected boolean isMetaTypeSupported(Object o) {
- return o instanceof org.eclipse.jst.j2ee.webapplication.WebApp;
- }
-
- @Override
- protected String getComponentID() {
- return "JST_WEB"; //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportWizard.java
deleted file mode 100644
index ccc4021..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportWizard.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEArtifactExportWizard;
-import org.eclipse.ui.IExportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to export J2EE Web Application module structures
- * from the Eclipse Workbench to a deployable Web Application
- * Archive *.war file.
- * </p>
- */
-public final class WebComponentExportWizard extends J2EEArtifactExportWizard implements IExportWizard {
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection,
- * no model instance, and no operation instance. The model and
- * operation will be created as needed.
- * </p>
- */
- public WebComponentExportWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls
- * and interface with the operation.
- * </p>
- * @param model The model parameter is used to pre-populate wizard controls and interface with the operation
- */
- public WebComponentExportWizard(IDataModel model) {
- super(model);
- }
-
- @Override
- protected IDataModelProvider getDefaultProvider() {
- return new WebComponentExportDataModelProvider();
- }
- /**
- * <p>
- * Adds the following pages:
- * <ul>
- * <li> {@link WebComponentExportPage} as the main wizard page ({@link #MAIN_PG})
- * </ul>
- * </p>
- */
- @Override
- public void doAddPages() {
- addPage(new WebComponentExportPage(getDataModel(), MAIN_PG, getSelection()));
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the default wizard page image.
- * </p>
- */
- @Override
- protected void doInit() {
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_EXPORT_WIZARD_BANNER));
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportPage.java
deleted file mode 100644
index 12ed5a9..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportPage.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Dec 3, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleImportPage;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class WebComponentImportPage extends J2EEModuleImportPage {
- /**
- * @param model
- * @param pageName
- */
- public WebComponentImportPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(WEBUIMessages.WEB_IMPORT_MAIN_PG_TITLE);
- setDescription(WEBUIMessages.WEB_IMPORT_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_IMPORT_WIZARD_BANNER));
- setInfopopID(IWebUIContextIds.WAR_IMPORT_PAGE1);
- }
-
- @Override
- protected String getFileImportLabel() {
- return WEBUIMessages.WEB_FILE_LBL;
- }
-
- @Override
- protected String[] getFilterExpression() {
- return new String[]{"*.war"}; //$NON-NLS-1$
- }
-
- @Override
- protected String getProjectImportLabel() {
- return WEBUIMessages.WEB_PROJECT_LBL;
- }
-
- @Override
- protected void createAnnotationsStandaloneGroup(Composite composite) {
- // TODO: implement with new import wizards
- // new AnnotationsStandaloneGroup(composite, getWebDataModel(), false);
- }
-
- @Override
- protected String getModuleFacetID(){
- return J2EEProjectUtilities.DYNAMIC_WEB;
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWebLibsPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWebLibsPage.java
deleted file mode 100644
index 55d8e3e..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWebLibsPage.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.archive.ArchiveWrapper;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEImportPage;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentImportDataModelProperties;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class WebComponentImportWebLibsPage extends J2EEImportPage {
- private Button deselectAllButton;
- private Button selectAllButton;
- protected ArchiveWrapper archiveWrapper;
- public CheckboxTableViewer availableJARsViewer;
- public boolean utilJarSelectionChanged = false;
-
- /**
- * @param model
- * @param pageName
- */
- public WebComponentImportWebLibsPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(WEBUIMessages.WEB_IMPORT_WEB_LIB_PG_TITLE);
- setDescription(WEBUIMessages.WEB_IMPORT_WEB_LIB_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_IMPORT_WIZARD_BANNER));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- setInfopopID(IWebUIContextIds.WAR_IMPORT_PAGE2);
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- createAvailableJarsList(composite);
- createButtonsGroup(composite);
- return composite;
- }
-
- /*
- * Updates the enable state of the all buttons
- */
- protected void updateButtonEnablements() {
- utilJarSelectionChanged = true;
- }
-
- protected void createAvailableJarsList(Composite listGroup) {
- availableJARsViewer = CheckboxTableViewer.newCheckList(listGroup, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- GridData gData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
- gData.widthHint = 200;
- gData.heightHint = 80;
- availableJARsViewer.getControl().setLayoutData(gData);
- AvailableWebLibProvider libsProvider = new AvailableWebLibProvider();
- availableJARsViewer.setContentProvider(libsProvider);
- availableJARsViewer.setLabelProvider(libsProvider);
- availableJARsViewer.addCheckStateListener(new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent event) {
- availableJARCheckStateChanged(event);
- }
- });
- availableJARsViewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- updateButtonEnablements();
- }
- });
- TableLayout tableLayout = new TableLayout();
- availableJARsViewer.getTable().setLayout(tableLayout);
- availableJARsViewer.getTable().setHeaderVisible(false);
- availableJARsViewer.getTable().setLinesVisible(false);
-
- model.addListener(new IDataModelListener() {
- public void propertyChanged(DataModelEvent event) {
- if (event.getPropertyName().equals(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED)) {
- availableJARsViewer.setCheckedElements(((List) model.getProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED)).toArray());
- }
- }
- });
- }
-
- private void handleDeselectAllButtonPressed() {
- ArrayList emptySelection = new ArrayList(2);
- model.setProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED, emptySelection);
- }
-
- private void handleSelectAllButtonPressed() {
- ArrayList allSelection = new ArrayList(2);
- Object selection = null;
- for (int i = 0; (null != (selection = availableJARsViewer.getElementAt(i))); i++) {
- allSelection.add(selection);
- }
- model.setProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED, allSelection);
- }
-
- protected void createButtonsGroup(org.eclipse.swt.widgets.Composite parent) {
- Composite buttonGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- buttonGroup.setLayout(layout);
- buttonGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- selectAllButton = new Button(buttonGroup, SWT.PUSH);
- selectAllButton.setText(WEBUIMessages.WAR_IMPORT_SELECT_ALL_LIBS_BUTTON);
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 1;
- gd.heightHint = SWT.DEFAULT;
- gd.widthHint = SWT.DEFAULT;
- selectAllButton.setLayoutData(gd);
- selectAllButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleSelectAllButtonPressed();
- }
- });
-
- deselectAllButton = new Button(buttonGroup, SWT.PUSH);
- deselectAllButton.setText(WEBUIMessages.WAR_IMPORT_DESELECT_ALL_LIBS_BUTTON);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- gd.heightHint = SWT.DEFAULT;
- gd.widthHint = SWT.DEFAULT;
- deselectAllButton.setLayoutData(gd);
- deselectAllButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleDeselectAllButtonPressed();
- }
- });
- }
-
- private void refreshEARFileIfNecessary() {
- if (isEARFileChanged()) {
- archiveWrapper = (ArchiveWrapper) model.getProperty(IJ2EEComponentImportDataModelProperties.ARCHIVE_WRAPPER);
- refresh();
- }
- }
-
- protected void setJARsCompositeEnabled(boolean enabled) {
- availableJARsViewer.getTable().setEnabled(enabled);
- availableJARsViewer.setAllChecked(false);
- availableJARsViewer.setAllGrayed(!enabled);
- selectAllButton.setEnabled(enabled);
- deselectAllButton.setEnabled(enabled);
- }
-
- private void refresh() {
- availableJARsViewer.setInput(archiveWrapper);
- }
-
- public boolean isEARFileChanged() {
- return archiveWrapper != model.getProperty(IJ2EEComponentImportDataModelProperties.ARCHIVE_WRAPPER);
- }
-
- @Override
- protected void enter() {
- super.enter();
- refreshEARFileIfNecessary();
- }
-
- public void availableJARCheckStateChanged(CheckStateChangedEvent event) {
- model.setProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED, getJARsForProjects());
- validatePage();
- }
-
- public List getJARsForProjects() {
- refreshEARFileIfNecessary();
- List result = new ArrayList();
- result.addAll(Arrays.asList(availableJARsViewer.getCheckedElements()));
- return result;
- }
-
- protected boolean isNullOrEmpty(String aString) {
- return aString == null || aString.length() == 0;
- }
-
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[]{};
- }
-
- @Override
- protected void restoreWidgetValues() {
- // This page doesn't implement...
- }
-
- @Override
- public void storeDefaultSettings() {
- // This page doesn't implement...
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWizard.java
deleted file mode 100644
index c840ec2..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWizard.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentImportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-
-/**
- * <p>
- * Wizard used to import J2EE Web Application module structures into the Eclipse Workbench from an
- * existing Web Application *.war file.
- * </p>
- */
-public final class WebComponentImportWizard extends J2EEComponentImportWizard {
-
- protected static final String WEB_LIBS_PG = "WEB_LIBS_PG"; //$NON-NLS-1$
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public WebComponentImportWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public WebComponentImportWizard(IDataModel model) {
- super(model);
- }
-
- /**
- * <p>
- * Adds an {@link WARImportPage} as the main wizard page ({@link #MAIN_PG}).
- * </p>
- */
- @Override
- public void doAddPages() {
- addPage(new WebComponentImportPage(getDataModel(), MAIN_PG));
- addPage(new WebComponentImportWebLibsPage(getDataModel(), WEB_LIBS_PG));
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the dialog window title and default wizard page image.
- * </p>
- */
- @Override
- public final void doInit() {
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.IMPORT_WIZ_TITLE));
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_IMPORT_WIZARD_BANNER));
- // updateEARToModelFromSelection(getSpecificDataModel());
- }
-
- @Override
- protected String[] getModuleValidatorStrings() {
- return new String[]{"org.eclipse.jst.j2ee.internal.web.validation.UIWarValidator"}; //$NON-NLS-1$
- }
-
-
- // protected String getFinalPerspectiveID() {
- // // J2EEComponentCreationDataModel projCreationModel =
- // // getSpecificDataModel().getJ2EEModuleCreationDataModel();
- // // return projCreationModel.getStringProperty(ComponentCreationDataModel.FINAL_PERSPECTIVE);
- // return getDataModel().getStringProperty(ComponentCreationDataModel.FINAL_PERSPECTIVE);
- // }
-
- @Override
- protected IDataModelProvider getDefaultProvider() {
- return new WebComponentImportDataModelProvider();
- }
-
- @Override
- protected String getFinalPerspectiveID() {
- return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_WEB);
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebAppSelectionPanel.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebAppSelectionPanel.java
deleted file mode 100644
index 0e8e405..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebAppSelectionPanel.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.servlet.ui.project.facet;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFragmentFacetInstallDataModelProperties;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
-
-
-public final class WebAppSelectionPanel implements IWebFragmentFacetInstallDataModelProperties
-
-{
- private final Button addToWar;
- private final Combo combo;
- private final Button newButton;
- private final Label label;
-
- private final IDataModel model;
- private DataModelSynchHelper synchhelper;
-
- public WebAppSelectionPanel( final IDataModel model, final Composite parent)
- {
- this.model = model;
- this.synchhelper = new DataModelSynchHelper(model);
-
- final Group group = new Group( parent, SWT.NONE );
- group.setLayoutData( gdhfill() );
- group.setLayout( new GridLayout( 3, false ) );
- group.setText( Resources.warMemberShip );
-
- this.addToWar = new Button( group, SWT.CHECK );
- this.addToWar.setText( Resources.addToWarLabel );
- GridDataFactory.defaultsFor(this.addToWar).span(3, 1).applyTo(this.addToWar);
- synchhelper.synchCheckbox(addToWar, ADD_TO_WAR, null);
-
- label = new Label(group, SWT.NULL);
- label.setText(Resources.warProjectLabel);
- this.combo = new Combo(group, SWT.NONE);
- this.combo.setLayoutData( gdhfill() );
-
- this.newButton = new Button( group, SWT.PUSH );
- this.newButton.setText( Resources.newButtonLabel );
- GridDataFactory.defaultsFor(this.newButton).applyTo(this.newButton);
-
- this.newButton.addSelectionListener( new SelectionAdapter()
- {
- @Override
- public void widgetSelected( final SelectionEvent event )
- {
- handleAddButton();
- }
- } );
-
- synchhelper.synchCombo(combo, WAR_PROJECT_NAME, new Control[]{label, newButton});
- Dialog.applyDialogFont(parent);
- }
-
- private void handleAddButton()
- {
- final WebProjectWizard wizard = new WebProjectWizard();
-
- final WizardDialog dialog
- = new WizardDialog( newButton.getShell(), wizard );
-
-/* IRuntime runtime = (IRuntime)model.getProperty(FACET_RUNTIME);
- wizard.ssetRuntimeInDataModel(runtime);
-*/
- if( dialog.open() != Window.CANCEL )
- {
- model.notifyPropertyChange(WAR_PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
- final String warproj = wizard.getProjectName();
- model.setProperty(WAR_PROJECT_NAME, warproj);
- }
- }
-
- private static GridData gdhfill()
- {
- return new GridData( GridData.FILL_HORIZONTAL );
- }
-
- public static final GridData gdhspan( final GridData gd,
- final int span )
- {
- gd.horizontalSpan = span;
- return gd;
- }
-
- private static final class Resources
-
- extends NLS
-
- {
- public static String addToWarLabel;
- public static String newButtonLabel;
- public static String warProjectLabel;
- public static String warMemberShip;
-
- static
- {
- initializeMessages( WebAppSelectionPanel.class.getName(),
- Resources.class );
- }
- }
-
- public void dispose() {
- if(synchhelper != null){
- synchhelper.dispose();
- synchhelper = null;
- }
- }
-
- public String getComboText(){
- return combo.getText();
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebAppSelectionPanel.properties b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebAppSelectionPanel.properties
deleted file mode 100644
index bbf6b0b..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebAppSelectionPanel.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-addToWarLabel = Add &project to a Dynamic Web project
-newButtonLabel = Ne&w...
-warProjectLabel=Dynamic Web pro&ject name:
-warMemberShip=Dynamic Web project membership
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java
deleted file mode 100644
index e9b6aa0..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 BEA Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms 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
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- ******************************************************************************/
-
-package org.eclipse.jst.servlet.ui.project.facet;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-public class WebFacetInstallPage extends J2EEModuleFacetInstallPage implements IWebFacetInstallDataModelProperties {
- private Label contextRootLabel;
- private Text contextRoot;
- private Label contentDirLabel;
- private Text contentDir;
-
- public WebFacetInstallPage() {
- super("web.facet.install.page"); //$NON-NLS-1$
- setTitle(Resources.pageTitle);
- setDescription(Resources.pageDescription);
- }
-
- @Override
- protected Composite createTopLevelComposite(final Composite parent) {
- setInfopopID(IWebUIContextIds.NEW_DYNAMIC_WEB_PROJECT_PAGE3);
- final Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(2, false));
-
- this.contextRootLabel = new Label(composite, SWT.NONE);
- this.contextRootLabel.setText(Resources.contextRootLabel);
- this.contextRootLabel.setLayoutData(new GridData());
-
- this.contextRoot = new Text(composite, SWT.BORDER);
- this.contextRoot.setLayoutData(gdhfill());
- this.contextRoot.setData("label", this.contextRootLabel); //$NON-NLS-1$
- synchHelper.synchText(contextRoot, CONTEXT_ROOT, new Control[]{contextRootLabel});
-
- this.contentDirLabel = new Label(composite, SWT.NONE);
- this.contentDirLabel.setText(Resources.contentDirLabel);
- this.contentDirLabel.setLayoutData(new GridData());
-
- this.contentDir = new Text(composite, SWT.BORDER);
- this.contentDir.setLayoutData(gdhfill());
- this.contentDir.setData("label", this.contentDirLabel); //$NON-NLS-1$
- synchHelper.synchText(contentDir, CONFIG_FOLDER, null);
-
- new Label(composite, SWT.NONE); // pad
-
- createGenerateDescriptorControl(composite, J2EEConstants.WEBAPP_DD_SHORT_NAME);
- registerFacetVersionChangeListener();
-
- Dialog.applyDialogFont(parent);
-
- return composite;
- }
-
- @Override
- protected void handleFacetVersionChangedEvent()
- {
- String fv = model.getStringProperty(FACET_VERSION_STR);
- boolean isWeb25OrGreater = J2EEVersionUtil.convertVersionStringToInt(fv) >= J2EEVersionConstants.WEB_2_5_ID;
- this.addDD.setVisible(isWeb25OrGreater);
- }
-
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[]{EAR_PROJECT_NAME, CONTEXT_ROOT, CONFIG_FOLDER, SOURCE_FOLDER};
- }
-
- private static final class Resources extends NLS {
- public static String pageTitle;
- public static String pageDescription;
- public static String contextRootLabel;
- public static String contentDirLabel;
-
- static {
- initializeMessages(WebFacetInstallPage.class.getName(), Resources.class);
- }
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.properties b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.properties
deleted file mode 100644
index c408577..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-pageTitle = Web Module
-pageDescription = Configure web module settings.
-contextRootLabel = Context &root:
-contentDirLabel = Content &directory:
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectContentProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectContentProvider.java
deleted file mode 100644
index 0b0748b..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectContentProvider.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
-
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.servlet.ui.project.facet;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-
-public class WebFragmentProjectContentProvider implements IStructuredContentProvider {
-
- public void dispose() {
- // Do nothing
- }
-
- public void inputChanged(Viewer arg0, Object arg1, Object arg2) {
- // Do nothing
- }
-
- public Object[] getElements(Object arg0) {
- if (arg0 instanceof IWorkspaceRoot) {
- IProject[] projects = ((IWorkspaceRoot) arg0).getProjects();
- if (projects != null && projects.length != 0) {
- List<IProject> theProjects = new ArrayList<IProject>(0);
- for (int i = 0; i < projects.length; i++) {
- IProject project = projects[i];
- try {
- if (FacetedProjectFramework.hasProjectFacet(project, IModuleConstants.JST_WEBFRAGMENT_MODULE)) {
- theProjects.add(project);
- }
- } catch (CoreException e) {
- ServletUIPlugin.log(e);
- }
- }
- return theProjects.toArray();
- }
- }
- return new Object[0];
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.java
deleted file mode 100644
index 1b86aa5..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
-
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.project.facet;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jst.common.project.facet.JavaFacetUtils;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFragmentProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public class WebFragmentProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
-
- protected WebAppSelectionPanel warPanel;
- public WebFragmentProjectFirstPage(IDataModel dataModel, String pageName) {
- super(dataModel, pageName);
- setTitle(Resources.pageTitle);
- setDescription(Resources.pageDescription);
- }
-
- private static final class Resources extends NLS {
- public static String pageTitle;
- public static String pageDescription;
- static {
- initializeMessages(WebFragmentProjectFirstPage.class.getName(), Resources.class);
- }
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- setShouldAddEARComposite(false);
- final Composite top = super.createTopLevelComposite(parent);
- createWarComposite(top);
- createWorkingSetGroupPanel(top, new String[] { RESOURCE_WORKING_SET, JAVA_WORKING_SET });
- return top;
- }
-
- private void createWarComposite(Composite top)
- {
- final IFacetedProjectWorkingCopy fpjwc
- = (IFacetedProjectWorkingCopy) this.model.getProperty( FACETED_PROJECT_WORKING_COPY );
-
- final String moduleFacetId = getModuleTypeID();
- final IProjectFacet moduleFacet = ProjectFacetsManager.getProjectFacet( moduleFacetId );
- final IFacetedProject.Action action = fpjwc.getProjectFacetAction( moduleFacet );
-
- warPanel = new WebAppSelectionPanel( (IDataModel) action.getConfig(), top );
- }
-
- @Override
- protected String[] getValidationPropertyNames()
- {
- String[] superProperties = super.getValidationPropertyNames();
- List list = Arrays.asList(superProperties);
- ArrayList arrayList = new ArrayList();
- arrayList.addAll( list );
- arrayList.add( IWebFragmentProjectCreationDataModelProperties.WAR_PROJECT_NAME );
- arrayList.add( IWebFragmentProjectCreationDataModelProperties.ADD_TO_WAR );
- return (String[])arrayList.toArray( new String[0] );
- }
-
- @Override
- protected String getModuleFacetID() {
- return IModuleConstants.JST_WEBFRAGMENT_MODULE;
- }
-
- @Override
- protected Set<IProjectFacetVersion> getFacetConfiguration( final IProjectFacetVersion primaryFacetVersion )
- {
- IRuntime runtime = (IRuntime)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
- final Set<IProjectFacetVersion> facets = new HashSet<IProjectFacetVersion>( 2 );
-
- if(runtime != null) {
- facets.addAll(super.getFacetConfiguration(primaryFacetVersion));
- }
- else {
- facets.add(primaryFacetVersion);
-
- if(primaryFacetVersion == WebFacetUtils.WEBFRAGMENT_30)
- {
- facets.add(JavaFacetUtils.JAVA_60);
- }
- }
- return Collections.unmodifiableSet( facets );
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.properties b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.properties
deleted file mode 100644
index 5233684..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pageTitle = Web Fragment
-pageDescription = Configure web fragment module settings.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectLabelProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectLabelProvider.java
deleted file mode 100644
index 0b4c74f..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectLabelProvider.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
-
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.servlet.ui.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.ILabelDecorator;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-public class WebFragmentProjectLabelProvider extends LabelProvider {
- private ILabelProvider workbenchLabelProvider = new WorkbenchLabelProvider();
- private ILabelDecorator decorator = PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator();
-
- @Override
- public Image getImage(Object o) {
- Image image = workbenchLabelProvider.getImage(o);
-
- if (o instanceof IProject) {
- Image decorated = decorator.decorateImage(image, o);
-
- if (decorated != null) {
- return decorated;
- }}
- return image;
- }
-
- @Override
- public String getText(Object o) {
- if (o instanceof IProject) {
- return ((IProject) o).getName();
- }
- return ""; //$NON-NLS-1$
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectWizard.java
deleted file mode 100644
index 5f6843f..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectWizard.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
-
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.servlet.ui.project.facet;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.web.project.facet.WebFragmentFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-import org.osgi.framework.Bundle;
-
-
-public class WebFragmentProjectWizard extends NewProjectDataModelFacetWizard {
-
- public WebFragmentProjectWizard(IDataModel modelid) {
- super(modelid);
- setWindowTitle(WEBUIMessages.WEBFRAGMENT_MODULE_WIZ_TITLE);
- }
-
- public WebFragmentProjectWizard(){
- super();
- setWindowTitle(WEBUIMessages.WEBFRAGMENT_MODULE_WIZ_TITLE);
- }
-
- @Override
- protected IDataModel createDataModel() {
- return DataModelFactory.createDataModel(new WebFragmentFacetProjectCreationDataModelProvider());
- }
-
- @Override
- protected ImageDescriptor getDefaultPageImageDescriptor() {
- final Bundle bundle = Platform.getBundle("org.eclipse.jst.servlet.ui"); //$NON-NLS-1$
- final URL url = bundle.getEntry("icons/full/ctool16/webfragment_wizban.gif"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url);
- }
-
- @Override
- protected IFacetedProjectTemplate getTemplate() {
- return ProjectFacetsManager.getTemplate("template.jst.webfragment"); //$NON-NLS-1$
- }
-
- @Override
- protected IWizardPage createFirstPage() {
- return new WebFragmentProjectFirstPage(model, "first.page"); //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java
deleted file mode 100644
index fe4506f..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.servlet.ui.project.facet;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jst.common.project.facet.JavaFacetUtils;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public class WebProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
-
- public WebProjectFirstPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(WEBUIMessages.WEB_PROJECT_MAIN_PG_TITLE);
- setDescription(WEBUIMessages.WEB_PROJECT_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_PROJECT_WIZARD_BANNER));
- setInfopopID(IWebUIContextIds.NEW_DYNAMIC_WEB_PROJECT_PAGE1);
- }
-
- @Override
- protected String getModuleFacetID() {
- return J2EEProjectUtilities.DYNAMIC_WEB;
- }
-
- @Override
- protected Set<IProjectFacetVersion> getFacetConfiguration( final IProjectFacetVersion primaryFacetVersion )
- {
- IRuntime runtime = (IRuntime)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
- final Set<IProjectFacetVersion> facets = new HashSet<IProjectFacetVersion>( 2 );
-
- if(runtime != null) {
- facets.addAll(super.getFacetConfiguration(primaryFacetVersion));
- }
- else {
- facets.add( primaryFacetVersion );
-
- if( primaryFacetVersion == WebFacetUtils.WEB_30)
- {
- facets.add( JavaFacetUtils.JAVA_60 );
- }
- else if(primaryFacetVersion == WebFacetUtils.WEB_25 )
- {
- facets.add( JavaFacetUtils.JAVA_50 );
- }
- else if( primaryFacetVersion == WebFacetUtils.WEB_24 )
- {
- facets.add( JavaFacetUtils.JAVA_14 );
- }
- else if( primaryFacetVersion == WebFacetUtils.WEB_23 ||
- primaryFacetVersion == WebFacetUtils.WEB_22 )
- {
- facets.add( JavaFacetUtils.JAVA_13 );
- }
- }
- return Collections.unmodifiableSet( facets );
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard.java
deleted file mode 100644
index 86ce7f8..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.project.facet;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-import org.osgi.framework.Bundle;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-
-public class WebProjectWizard extends NewProjectDataModelFacetWizard {
-
- public WebProjectWizard(IDataModel model) {
- super(model);
- setWindowTitle(WEBUIMessages.WEB_MODULE_WIZ_TITLE);
- }
-
- public WebProjectWizard() {
- super();
- setWindowTitle(WEBUIMessages.WEB_MODULE_WIZ_TITLE);
- }
-
- @Override
- protected IDataModel createDataModel() {
- try
- {
- return DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider());
- }
- catch( Exception e )
- {
- ServletUIPlugin.logError(e);
- return null;
- }
- }
-
- @Override
- protected IFacetedProjectTemplate getTemplate() {
- return ProjectFacetsManager.getTemplate("template.jst.web"); //$NON-NLS-1$
- }
-
- @Override
- protected IWizardPage createFirstPage() {
- return new WebProjectFirstPage(model, "first.page"); //$NON-NLS-1$
- }
-
- @Override
- protected ImageDescriptor getDefaultPageImageDescriptor() {
- final Bundle bundle = Platform.getBundle("org.eclipse.jst.servlet.ui"); //$NON-NLS-1$
- final URL url = bundle.getEntry("icons/full/ctool16/web-wiz-banner.gif"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url);
- }
-
- @Override
- protected String getFinalPerspectiveID() {
- return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_WEB);
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/.classpath b/plugins/org.eclipse.wst.web/.classpath
similarity index 86%
rename from plugins/org.eclipse.jst.servlet.ui/.classpath
rename to plugins/org.eclipse.wst.web/.classpath
index 8ceb3f1..15a90f8 100644
--- a/plugins/org.eclipse.jst.servlet.ui/.classpath
+++ b/plugins/org.eclipse.wst.web/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="servlet_ui"/>
+ <classpathentry kind="src" path="static_web_project"/>
<classpathentry kind="src" path="property_files"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
diff --git a/plugins/org.eclipse.jst.servlet.ui/.cvsignore b/plugins/org.eclipse.wst.web/.cvsignore
similarity index 80%
rename from plugins/org.eclipse.jst.servlet.ui/.cvsignore
rename to plugins/org.eclipse.wst.web/.cvsignore
index a19913c..590084f 100644
--- a/plugins/org.eclipse.jst.servlet.ui/.cvsignore
+++ b/plugins/org.eclipse.wst.web/.cvsignore
@@ -1,7 +1,7 @@
bin
+runtime
temp.folder
build.xml
-servletui.jar
@dot
src.zip
javaCompiler...args
diff --git a/plugins/org.eclipse.jst.jee.ui/.project b/plugins/org.eclipse.wst.web/.project
similarity index 94%
rename from plugins/org.eclipse.jst.jee.ui/.project
rename to plugins/org.eclipse.wst.web/.project
index 65633e8..fb86548 100644
--- a/plugins/org.eclipse.jst.jee.ui/.project
+++ b/plugins/org.eclipse.wst.web/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.jst.jee.ui</name>
+ <name>org.eclipse.wst.web</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/org.eclipse.jst.jee.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.web/.settings/org.eclipse.jdt.core.prefs
similarity index 97%
rename from plugins/org.eclipse.jst.jee.ui/.settings/org.eclipse.jdt.core.prefs
rename to plugins/org.eclipse.wst.web/.settings/org.eclipse.jdt.core.prefs
index 037a4e5..51c2889 100644
--- a/plugins/org.eclipse.jst.jee.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.wst.web/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Mon Jun 08 15:35:45 EDT 2009
+#Tue Sep 29 10:42:06 EDT 2009
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
@@ -20,6 +20,7 @@
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
org.eclipse.jdt.core.compiler.problem.unusedImport=error
org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
@@ -31,6 +32,7 @@
org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
diff --git a/plugins/org.eclipse.wst.web/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.wst.web/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..9602203
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,6 @@
+#Tue Sep 29 10:42:06 EDT 2009
+org.eclipse.jdt.ui.exception.name=e
+eclipse.preferences.version=1
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.gettersetter.use.is=true
diff --git a/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..0e312b8
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF
@@ -0,0 +1,29 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.eclipse.wst.web; singleton:=true
+Bundle-Version: 1.1.403.qualifier
+Bundle-Activator: org.eclipse.wst.web.internal.WSTWebPlugin
+Bundle-Vendor: %Bundle-Vendor.0
+Bundle-Localization: plugin
+Export-Package: org.eclipse.wst.project.facet,
+ org.eclipse.wst.web.internal;x-internal:=true,
+ org.eclipse.wst.web.internal.deployables;x-internal:=true,
+ org.eclipse.wst.web.internal.facet,
+ org.eclipse.wst.web.internal.operation;x-internal:=true
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.wst.validation;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.wst.common.modulecore;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
+ com.ibm.icu;bundle-version="3.8.1",
+ org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)"
+Eclipse-LazyStart: true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.servlet.ui/about.html b/plugins/org.eclipse.wst.web/about.html
similarity index 100%
rename from plugins/org.eclipse.jst.servlet.ui/about.html
rename to plugins/org.eclipse.wst.web/about.html
diff --git a/plugins/org.eclipse.wst.web/build.properties b/plugins/org.eclipse.wst.web/build.properties
new file mode 100644
index 0000000..182b94a
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/build.properties
@@ -0,0 +1,11 @@
+bin.includes = plugin.xml,\
+ plugin.properties,\
+ icons/,\
+ META-INF/,\
+ about.html,\
+ .
+jars.compile.order = .
+src.includes = component.xml
+output.. = bin/
+source.. = static_web_project/,\
+ property_files/
diff --git a/plugins/org.eclipse.wst.web/component.xml b/plugins/org.eclipse.wst.web/component.xml
new file mode 100644
index 0000000..89207cb
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/component.xml
@@ -0,0 +1 @@
+<?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
new file mode 100644
index 0000000..09f609d
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/icons/full/obj16/web_application.gif
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
new file mode 100644
index 0000000..80531e3
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/icons/full/obj16/webstatic_deploy.gif
Binary files differ
diff --git a/plugins/org.eclipse.wst.web/icons/full/wizban/newwprj_wiz.png b/plugins/org.eclipse.wst.web/icons/full/wizban/newwprj_wiz.png
new file mode 100644
index 0000000..1edd090
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/icons/full/wizban/newwprj_wiz.png
Binary files differ
diff --git a/plugins/org.eclipse.wst.web/plugin.properties b/plugins/org.eclipse.wst.web/plugin.properties
new file mode 100644
index 0000000..d686a74
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/plugin.properties
@@ -0,0 +1,11 @@
+#########################################
+# (c) Copyright IBM Corp. 2000, 2001.
+# All Rights Reserved.
+#########################################
+
+Bundle-Vendor.0 = Eclipse Web Tools Platform
+Bundle-Name.0 = Simple Web Plug-in
+
+SIMPLE_WEB_LABEL=Static Web Module
+SIMPLE_WEB_DESCRIPTION=Enables the project to be deployed as a static web module.
+SIMPLE_WEB_TEMPLATE=Static Web Project
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/plugin.xml b/plugins/org.eclipse.wst.web/plugin.xml
new file mode 100644
index 0000000..0fd8b4d
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/plugin.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+ <extension-point id="runtimePresetMappings" name="Runtime Preset Mappings Extension" schema="schema/runtimePresetMappings.exsd"/>
+ <extension
+ point="org.eclipse.wst.server.core.moduleFactories">
+ <moduleFactory
+ projects="true"
+ class="org.eclipse.wst.web.internal.deployables.StaticWebDeployableFactory"
+ id="org.eclipse.wst.web.internal.deployables.static">
+ <moduleType
+ versions="1.0, 1.2, 1.3, 1.4"
+ types="wst.web">
+ </moduleType>
+ </moduleFactory>
+ </extension>
+
+ <extension
+ point="org.eclipse.wst.server.core.moduleArtifactAdapters">
+ <moduleArtifactAdapter
+ id="org.eclipse.jst.web.server.webstatic1"
+ class="org.eclipse.wst.web.internal.deployables.StaticWebDeployableObjectAdapter">
+ <enablement>
+ <with variable="selection">
+ <adapt type="org.eclipse.core.resources.IProject">
+ <test forcePluginActivation="true"
+ property="org.eclipse.wst.common.project.facet.core.projectFacet"
+ value="wst.web" />
+ </adapt>
+ </with>
+ </enablement>
+ </moduleArtifactAdapter>
+ <moduleArtifactAdapter
+ id="org.eclipse.jst.web.server.webstatic2"
+ class="org.eclipse.wst.web.internal.deployables.StaticWebDeployableObjectAdapter">
+ <enablement>
+ <with variable="selection">
+ <adapt type="org.eclipse.core.resources.IFile">
+ <test forcePluginActivation="true"
+ property="org.eclipse.wst.common.project.facet.core.projectFacet"
+ value="wst.web" />
+ </adapt>
+ </with>
+ </enablement>
+ </moduleArtifactAdapter>
+ </extension>
+ <extension point="org.eclipse.core.runtime.adapters">
+ <factory
+ class="org.eclipse.wst.web.internal.deployables.StaticWebDeployableObjectAdapter"
+ adaptableType="org.eclipse.core.resources.IProject">
+ <adapter type="org.eclipse.wst.web.internal.deployables.IStaticWebModuleArtifact"/>
+ </factory>
+ </extension>
+
+ <!--============================-->
+ <!-- Builder Provider registrations-->
+ <!--============================-->
+ <extension
+ point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
+ <ProviderDefinesType
+ providerType="wst.web.builder"
+ providerID="org.eclipse.wst.common.componentcore.internal.builder.WorkbenchComponentBuilderDataModelProvider"/>
+ <DataModelProvider
+ class="org.eclipse.wst.web.internal.operation.SimpleWebModuleCreationDataModelProvider"
+ id="org.eclipse.wst.web.internal.operation.SimpleWebModuleCreationDataModelProvider"/>
+ </extension>
+
+ <!-- Project Facets -->
+ <extension point="org.eclipse.wst.common.project.facet.core.facets">
+
+ <project-facet id="wst.web">
+ <label>%SIMPLE_WEB_LABEL</label>
+ <description>%SIMPLE_WEB_DESCRIPTION</description>
+ <property name="hide.version" value="true"/>
+ </project-facet>
+
+ <project-facet-version facet="wst.web" version="1.0">
+ <action type="install" id="wst.web.install">
+ <delegate class="org.eclipse.wst.project.facet.SimpleWebFacetInstallDelegate"/>
+ <config-factory class="org.eclipse.wst.project.facet.SimpleWebFacetInstallDataModelProvider"/>
+ </action>
+ <action type="uninstall" id="wst.web.uninstall">
+ <delegate class="org.eclipse.wst.project.facet.SimpleWebFacetUninstallDelegate"/>
+ <config-factory class="org.eclipse.wst.project.facet.SimpleWebFacetInstallDataModelProvider"/>
+ </action>
+ <constraint>
+ <conflicts group="modules"/>
+ </constraint>
+ <group-member id="modules"/>
+ </project-facet-version>
+
+ <template id="template.wst.web">
+ <label>%SIMPLE_WEB_TEMPLATE</label>
+ <fixed facet="wst.web"/>
+ </template>
+
+ </extension>
+</plugin>
diff --git a/plugins/org.eclipse.wst.web/property_files/staticwebproject.properties b/plugins/org.eclipse.wst.web/property_files/staticwebproject.properties
new file mode 100644
index 0000000..c3c3687
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/property_files/staticwebproject.properties
@@ -0,0 +1,23 @@
+###############################################################################
+# Copyright (c) 2005, 2006 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+StaticWebProjectCreationWizard_Wizard_Title=New Static Web Project
+StaticWebProjectWizardBasePage_Page_Description=Create a Web project for simple content (HTML files) only.
+StaticWebSettingsPropertiesPage_Web_Content_Label=&Web content folder name:
+StaticContextRootComposite_Context_Root_Label=&Context root:
+StaticWebProjectWizardBasePage_Page_Title=Static Web Project
+StaticWebSettingsPropertiesPage_Not_available_for_closed_projects=Web settings are not available for a closed project.
+TargetRuntime=Target r&untime
+NewDotDotDot=N&ew...
+InvalidServerTarget=Invalid target server selected.
+ConfigureSettings=Configure Static Web module settings.
+Context_Root_cannot_be_empty_2=Context root cannot be empty
+Names_cannot_contain_whitespace=Context root cannot contain whitespace
+The_character_is_invalid_in_a_context_root=The character ''{0}'' is invalid in a context root.
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/schema/runtimePresetMappings.exsd b/plugins/org.eclipse.wst.web/schema/runtimePresetMappings.exsd
new file mode 100644
index 0000000..3d27116
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/schema/runtimePresetMappings.exsd
@@ -0,0 +1,141 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.wst.web" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+ <appinfo>
+ <meta.schema plugin="org.eclipse.wst.web" id="RuntimePresetMappings" name="Runtime Preset Mappings Extension"/>
+ </appinfo>
+ <documentation>
+ This extension point allows the configuration of a default facet preset for any Runtime Type ID, Facet ID & Fact Version combination. For example, given runtime type X, facet jst.web, and version 2.4, the preset Y should be selected by default where as given runtime type X, facet jst.web, and version 2.5, the preset Z should be selected by default.
+
+For each of the four facetRuntimeTypeID, facetRuntimeVersion, facetID, facetVersion the following pattern is used to ease the definition process. The pattern specified allows a comma deliminated list of possible values. For example to match only "1.0" the pattern should be "1.0". To match multiple values, say 1.0, 2.0, and 3.0, use "1.0,2.0,3.0". Asterests may be used to specify multiple values. For example, "1.*" will match any values starting with '1.' including 1., 1.0, 1.1, 1.2, but not 1 Likewise, "*.0" will match any values ending with '.0' including 1.0, 2.0, 3.0, but not 1 or 0 Asterists may be added both at the begining and end of a string, so "*00*" will match any string that contains '00' such as 00, 100, 1001.
+ </documentation>
+ </annotation>
+
+ <element name="extension">
+ <annotation>
+ <appinfo>
+ <meta.element />
+ </appinfo>
+ </annotation>
+ <complexType>
+ <sequence minOccurs="1" maxOccurs="unbounded">
+ <element ref="mapping" minOccurs="1" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appinfo>
+ <meta.attribute translatable="true"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="mapping">
+ <annotation>
+ <documentation>
+ Each mapping element defineds a mapping from (runtimeid, facetid, facetversion) to presetid.
+ </documentation>
+ </annotation>
+ <complexType>
+ <attribute name="id" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="facetRuntimeTypeID" type="string" use="required">
+ <annotation>
+ <documentation>
+ Follows the pattern outlined in the overview
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="facetRuntimeVersion" type="string" use="required">
+ <annotation>
+ <documentation>
+ Follows the pattern outlined in the overview
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="facetID" type="string" use="required">
+ <annotation>
+ <documentation>
+ Follows the pattern outlined in the overview
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="facetVersion" type="string" use="required">
+ <annotation>
+ <documentation>
+ Follows the pattern outlined in the overview
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="presetID" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </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>
+
+
+</schema>
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/IProductConstants.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/IProductConstants.java
new file mode 100644
index 0000000..6ef3b6b
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/IProductConstants.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.project.facet;
+
+/**
+ * These constants define the set of properties that this pluging expects to
+ * be available via <code>IProduct.getProperty(String)</code>. The status of
+ * this interface and the facilities offered is highly provisional.
+ * Productization support will be reviewed and possibly modified in future
+ * releases.
+ *
+ * @see org.eclipse.core.runtime.IProduct#getProperty(String)
+ */
+
+public interface IProductConstants {
+
+ public static final String APPLICATION_CONTENT_FOLDER = "earContent"; //$NON-NLS-1$
+ public static final String WEB_CONTENT_FOLDER = "webContent"; //$NON-NLS-1$
+ public static final String EJB_CONTENT_FOLDER = "ejbContent"; //$NON-NLS-1$
+ public static final String APP_CLIENT_CONTENT_FOLDER = "appClientContent"; //$NON-NLS-1$
+ public static final String JCA_CONTENT_FOLDER = "jcaContent"; //$NON-NLS-1$
+ public static final String DEFAULT_SOURCE_FOLDER = "defaultSource"; //$NON-NLS-1$
+ public static final String ADD_TO_EAR_BY_DEFAULT = "addToEarByDefault"; //$NON-NLS-1$
+ public static final String OUTPUT_FOLDER = "outputFolder"; //$NON-NLS-1$
+ public static final String USE_SINGLE_ROOT_STRUCTURE = "useSingleRootStructure"; //$NON-NLS-1$
+ public static final String ID_PERSPECTIVE_HIERARCHY_VIEW = "idPerspectiveHierarchyView"; //$NON-NLS-1$
+ public static final String SHOW_JAVA_EE_MODULE_DEPENDENCY_PAGE = "showJavaEEModuleDependencyPage"; //$NON-NLS-1$
+ public static final String DYNAMIC_WEB_GENERATE_DD = "dynamic_web_generate_dd"; //$NON-NLS-1$
+ public static final String EE6_CONNECTOR_GENERATE_DD = "ee6_connector_generate_dd"; //$NON-NLS-1$
+
+ /**
+ * @deprecated Do not use. The ALLOW_CLASSPATH_DEP preference has been deprecated and its ability to disable dynamic manifest updates will soon be removed.
+ */
+ public static final String ALLOW_CLASSPATH_DEP = "allowClasspathDep"; //$NON-NLS-1$
+ public static final String VALIDATE_DUPLICATE_CLASSPATH_COMPONENT_URI = "validateDupClasspathCompURI"; //$NON-NLS-1$
+
+ public static final String DYN_WEB_OUTPUT_FOLDER = "dynWebOutput"; //$NON-NLS-1$
+ public static final String EJB_OUTPUT_FOLDER = "ejbOutput"; //$NON-NLS-1$
+ public static final String APP_CLIENT_OUTPUT_FOLDER = "appClientOutput"; //$NON-NLS-1$
+ public static final String JCA_OUTPUT_FOLDER = "jcaOutput"; //$NON-NLS-1$
+ public static final String UTILITY_OUTPUT_FOLDER ="utilOutput"; //$NON-NLS-1$
+
+ /**
+ * Alters the final perspective used by the following new project wizards
+ */
+ public static final String FINAL_PERSPECTIVE_WEB = "finalPerspectiveWeb"; //$NON-NLS-1$
+ public static final String FINAL_PERSPECTIVE_EJB = "finalPerspectiveEjb"; //$NON-NLS-1$
+ public static final String FINAL_PERSPECTIVE_EAR = "finalPerspectiveEar"; //$NON-NLS-1$
+ public static final String FINAL_PERSPECTIVE_APPCLIENT = "finalPerspectiveAppClient"; //$NON-NLS-1$
+ public static final String FINAL_PERSPECTIVE_JCA = "finalPerspectiveJca"; //$NON-NLS-1$
+ public static final String FINAL_PERSPECTIVE_UTILITY = "finalPerspectiveUtility"; //$NON-NLS-1$
+ public static final String FINAL_PERSPECTIVE_STATICWEB = "finalPerspectiveStaticWeb"; //$NON-NLS-1$
+ public static final String FINAL_PERSPECTIVE_WEBFRAGMENT = "finalPerspectiveWebFragment"; //$NON-NLS-1$
+
+ /**
+ * Ability to default initial runtimes chosen in wizards
+ */
+ public static final String DEFAULT_RUNTIME_1 = "defaultRuntime1"; //$NON-NLS-1$
+ public static final String DEFAULT_RUNTIME_2 = "defaultRuntime2"; //$NON-NLS-1$
+ public static final String DEFAULT_RUNTIME_3 = "defaultRuntime3"; //$NON-NLS-1$
+ public static final String DEFAULT_RUNTIME_4 = "defaultRuntime4"; //$NON-NLS-1$
+ public static final String VIEWER_SYNC_FOR_WEBSERVICES = "viewerSyncForWebservices"; //$NON-NLS-1$
+
+}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ISimpleWebFacetInstallDataModelProperties.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ISimpleWebFacetInstallDataModelProperties.java
new file mode 100644
index 0000000..2f3263e
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ISimpleWebFacetInstallDataModelProperties.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.project.facet;
+
+import org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties;
+
+public interface ISimpleWebFacetInstallDataModelProperties extends IDataModelProperties {
+ /**
+ * This field should not be used. It is not part of the API and may be modified in the future.
+ */
+ public static Class _provider_class = SimpleWebFacetProjectCreationDataModelProvider.class;
+
+ public static final String CONTENT_DIR = "IStaticWebFacetInstallDataModelProperties.CONTENT_DIR"; //$NON-NLS-1$
+
+ public static final String CONTEXT_ROOT = "IStaticWebFacetInstallDataModelProperties.CONTEXT_ROOT"; //$NON-NLS-1$
+}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ProductManager.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ProductManager.java
new file mode 100644
index 0000000..1a54a74
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ProductManager.java
@@ -0,0 +1,182 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.project.facet;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponent;
+import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
+import org.eclipse.wst.web.internal.WSTWebPlugin;
+
+public class ProductManager {
+
+ /**
+ * Default values for WTP level product
+ */
+ private static final String APPLICATION_CONTENT_FOLDER = "EarContent"; //$NON-NLS-1$
+ private static final String WEB_CONTENT_FOLDER = "WebContent"; //$NON-NLS-1$
+ private static final String EJB_CONTENT_FOLDER = "ejbModule"; //$NON-NLS-1$
+ private static final String APP_CLIENT_CONTENT_FOLDER = "appClientModule"; //$NON-NLS-1$
+ private static final String JCA_CONTENT_FOLDER = "connectorModule"; //$NON-NLS-1$
+ private static final String DEFAULT_SOURCE_FOLDER = "src"; //$NON-NLS-1$
+ private static final String ADD_TO_EAR_BY_DEFAULT = "false"; //$NON-NLS-1$
+ private static final String OUTPUT_FOLDER = "build/classes"; //$NON-NLS-1$
+ private static final String USE_SINGLE_ROOT_STRUCTURE = "false"; //$NON-NLS-1$
+ private static final String VIEWER_SYNC_FOR_WEBSERVICES = "true"; //$NON-NLS-1$
+ private static final String ID_PERSPECTIVE_HIERARCHY_VIEW = "org.eclipse.ui.navigator.ProjectExplorer"; //$NON-NLS-1$
+ private static final String SHOW_JAVA_EE_MODULE_DEPENDENCY_PAGE = "true"; //$NON-NLS-1$
+ private static final String FINAL_PERSPECTIVE = "org.eclipse.jst.j2ee.J2EEPerspective"; //$NON-NLS-1$
+ private static final String FINAL_WEB_PERSPECTIVE = "org.eclipse.wst.web.ui.webDevPerspective"; //$NON-NLS-1$
+ private static final String DYNAMIC_WEB_GENERATE_DD = "true"; //$NON-NLS-1$
+ private static final char RUNTIME_SEPARATOR = ':';
+ private static final String[] DEFAULT_RUNTIME_KEYS =
+ new String[]{IProductConstants.DEFAULT_RUNTIME_1,
+ IProductConstants.DEFAULT_RUNTIME_2,
+ IProductConstants.DEFAULT_RUNTIME_3,
+ IProductConstants.DEFAULT_RUNTIME_4};
+
+ /**
+ * Return the value for the associated key from the Platform Product registry or return the
+ * WTP default for the J2EE cases.
+ *
+ * @param key
+ * @return String value of product's property
+ */
+ public static String getProperty(String key) {
+ if (key == null)
+ return null;
+ String value = null;
+ if (Platform.getProduct()!=null)
+ value = Platform.getProduct().getProperty(key);
+ if (value == null)
+ {
+ value = Platform.getPreferencesService().getString(WSTWebPlugin.PLUGIN_ID, key, null, null);
+ }
+ if (value == null) {
+ if (key.equals(IProductConstants.APPLICATION_CONTENT_FOLDER))
+ return APPLICATION_CONTENT_FOLDER;
+ else if (key.equals(IProductConstants.WEB_CONTENT_FOLDER))
+ return WEB_CONTENT_FOLDER;
+ else if (key.equals(IProductConstants.EJB_CONTENT_FOLDER))
+ return EJB_CONTENT_FOLDER;
+ else if (key.equals(IProductConstants.APP_CLIENT_CONTENT_FOLDER))
+ return APP_CLIENT_CONTENT_FOLDER;
+ else if (key.equals(IProductConstants.JCA_CONTENT_FOLDER))
+ return JCA_CONTENT_FOLDER;
+ else if (key.equals(IProductConstants.DEFAULT_SOURCE_FOLDER))
+ return DEFAULT_SOURCE_FOLDER;
+ else if (key.equals(IProductConstants.ADD_TO_EAR_BY_DEFAULT))
+ return ADD_TO_EAR_BY_DEFAULT;
+ else if (key.equals(IProductConstants.USE_SINGLE_ROOT_STRUCTURE))
+ return USE_SINGLE_ROOT_STRUCTURE;
+ else if (key.equals(IProductConstants.VIEWER_SYNC_FOR_WEBSERVICES))
+ return VIEWER_SYNC_FOR_WEBSERVICES;
+ else if (key.equals(IProductConstants.OUTPUT_FOLDER))
+ return OUTPUT_FOLDER;
+ else if (key.equals(IProductConstants.ID_PERSPECTIVE_HIERARCHY_VIEW))
+ return ID_PERSPECTIVE_HIERARCHY_VIEW;
+ else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_APPCLIENT))
+ return FINAL_PERSPECTIVE;
+ else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_EAR))
+ return FINAL_PERSPECTIVE;
+ else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_EJB))
+ return FINAL_PERSPECTIVE;
+ else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_JCA))
+ return FINAL_PERSPECTIVE;
+ else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_STATICWEB))
+ return FINAL_WEB_PERSPECTIVE;
+ else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_UTILITY))
+ return FINAL_PERSPECTIVE;
+ else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_WEB))
+ return FINAL_PERSPECTIVE;
+ else if (key.equals(IProductConstants.SHOW_JAVA_EE_MODULE_DEPENDENCY_PAGE))
+ return SHOW_JAVA_EE_MODULE_DEPENDENCY_PAGE;
+ else if (key.equals(IProductConstants.DYNAMIC_WEB_GENERATE_DD))
+ return DYNAMIC_WEB_GENERATE_DD;
+ }
+ return value;
+ }
+
+ public static boolean shouldAddToEARByDefault() {
+ String value = getProperty(IProductConstants.ADD_TO_EAR_BY_DEFAULT);
+ return Boolean.valueOf(value).booleanValue();
+ }
+
+ public static boolean shouldUseSingleRootStructure() {
+ String value = getProperty(IProductConstants.USE_SINGLE_ROOT_STRUCTURE);
+ return Boolean.valueOf(value).booleanValue();
+ }
+
+ public static boolean shouldUseViewerSyncForWebservices() {
+ String value = getProperty(IProductConstants.VIEWER_SYNC_FOR_WEBSERVICES);
+ return Boolean.valueOf(value).booleanValue();
+ }
+
+ public static List/*<IRuntime>*/ getDefaultRuntimes() {
+ List theRuntimes = null;
+ Set runtimes = RuntimeManager.getRuntimes();
+ if (!runtimes.isEmpty()) {
+ IRuntime defaultRuntime = null;
+ // First check if defaults are defined
+ for (int i = 0; i < DEFAULT_RUNTIME_KEYS.length; i++) {
+ defaultRuntime = getMatchingRuntime(DEFAULT_RUNTIME_KEYS[i], runtimes);
+ if (defaultRuntime != null) {
+ if (theRuntimes == null) {
+ theRuntimes = new ArrayList(DEFAULT_RUNTIME_KEYS.length);
+ }
+ theRuntimes.add(defaultRuntime);
+ }
+ }
+ }
+ if (theRuntimes == null) {
+ theRuntimes = Collections.EMPTY_LIST;
+ }
+ return theRuntimes;
+ }
+
+ private static IRuntime getMatchingRuntime(String defaultProductRuntimeProperty, Set runtimes) {
+ String defaultProductRuntimeKey = getProperty(defaultProductRuntimeProperty);
+ if (defaultProductRuntimeKey == null || defaultProductRuntimeKey.length() == 0) {
+ return null;
+ }
+ //The defaultProductRuntimeKey needs to be in the following format
+ //<facet runtime id>:<facet version>.
+ int seperatorIndex = defaultProductRuntimeKey.indexOf(RUNTIME_SEPARATOR);
+ if (seperatorIndex < 0 && seperatorIndex < defaultProductRuntimeKey.length()) {
+ //Consider throwing an exception here.
+ WSTWebPlugin.logError("Invalid default product runtime id. It should follow the format <facet runtime id>:<facet version>. Id processed: " + defaultProductRuntimeKey); //$NON-NLS-1$
+ return null;
+ }
+ String defaultRuntimeID = defaultProductRuntimeKey.substring(0, seperatorIndex);
+ String defaultFacetVersion = defaultProductRuntimeKey.substring(seperatorIndex + 1);
+ for (Iterator runtimeIt = runtimes.iterator(); runtimeIt.hasNext();) {
+ IRuntime runtime = (IRuntime) runtimeIt.next();
+ List runtimeComps = runtime.getRuntimeComponents();
+ if (!runtimeComps.isEmpty()) {
+ for (Iterator compsIter = runtimeComps.iterator(); compsIter.hasNext();) {
+ IRuntimeComponent runtimeComp = (IRuntimeComponent) compsIter.next();
+ if (defaultRuntimeID.equals(runtimeComp.getRuntimeComponentType().getId()) &&
+ (defaultFacetVersion.equals(runtimeComp.getRuntimeComponentVersion().getVersionString()))) {
+ return runtime;
+ }
+ }
+ }
+ }
+ //No matches found.
+ return null;
+ }
+}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDataModelProvider.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDataModelProvider.java
new file mode 100644
index 0000000..c551407
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDataModelProvider.java
@@ -0,0 +1,149 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.project.facet;
+
+import java.util.Set;
+
+import org.eclipse.core.internal.resources.ResourceStatus;
+import org.eclipse.core.internal.utils.Messages;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceStatus;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
+import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
+import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
+import org.eclipse.wst.web.internal.ResourceHandler;
+
+import com.ibm.icu.text.UTF16;
+import com.ibm.icu.util.StringTokenizer;
+
+public class SimpleWebFacetInstallDataModelProvider extends FacetInstallDataModelProvider implements ISimpleWebFacetInstallDataModelProperties {
+
+ public SimpleWebFacetInstallDataModelProvider() {
+ super();
+ }
+
+ @Override
+ public Set getPropertyNames() {
+ Set names = super.getPropertyNames();
+ names.add(CONTENT_DIR);
+ names.add(CONTEXT_ROOT);
+ return names;
+ }
+
+ @Override
+ public Object getDefaultProperty(String propertyName) {
+ if (propertyName.equals(CONTENT_DIR)) {
+ return "WebContent"; //$NON-NLS-1$
+ } else if (propertyName.equals(CONTEXT_ROOT)) {
+ return getStringProperty(FACET_PROJECT_NAME).replace(' ', '_');
+ } else if (propertyName.equals(FACET_ID)) {
+ return IModuleConstants.WST_WEB_MODULE;
+ }
+ return super.getDefaultProperty(propertyName);
+ }
+
+ @Override
+ public boolean propertySet(String propertyName, Object propertyValue) {
+ if (FACET_PROJECT_NAME.equals(propertyName)) {
+ model.notifyPropertyChange(CONTEXT_ROOT, IDataModel.VALID_VALUES_CHG);
+ }
+ return super.propertySet(propertyName, propertyValue);
+ }
+
+ @Override
+ public IStatus validate(String name) {
+ if (name.equals(CONTEXT_ROOT)) {
+ return validateContextRoot(getStringProperty(CONTEXT_ROOT));
+ }
+ else if (name.equals(CONTENT_DIR)) {
+ String folderName = model.getStringProperty(CONTENT_DIR);
+ if (folderName == null || folderName.length() == 0 || folderName.equals("/") || folderName.equals("\\")) { //$NON-NLS-1$ //$NON-NLS-2$
+ // all folders which meet the criteria of "CONFIG_FOLDER" are required
+ String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.WEBCONTENTFOLDER_EMPTY);
+ return WTPCommonPlugin.createErrorStatus(errorMessage);
+ }
+ IStatus status = validateFolderName(folderName);
+ if (status.isOK())
+ {
+ if (folderName.indexOf('#') != -1) {
+ String message = NLS.bind(Messages.resources_invalidCharInName, "#", folderName); //$NON-NLS-1$
+ status = new ResourceStatus(IResourceStatus.INVALID_VALUE, null, message);
+ }
+ }
+ return status;
+ }
+
+ return super.validate(name);
+ }
+
+ protected IStatus validateContextRoot(String contextRoot) {
+ if (contextRoot == null || contextRoot.length() == 0) {
+ return new ResourceStatus(IResourceStatus.INVALID_VALUE, null, ResourceHandler.Context_Root_cannot_be_empty_2);
+ } else if (contextRoot.trim().equals(contextRoot)) {
+ StringTokenizer stok = new StringTokenizer(contextRoot, "."); //$NON-NLS-1$
+ while (stok.hasMoreTokens()) {
+ String token = stok.nextToken();
+ int cp;
+ for (int i = 0; i < token.length(); i += UTF16.getCharCount(cp)) {
+ cp = UTF16.charAt(token, i);
+ if(token.charAt(i) == ' ')
+ {
+ return new ResourceStatus(IResourceStatus.INVALID_VALUE, null, ResourceHandler.Names_cannot_contain_whitespace);
+ }
+ else if (!(token.charAt(i) == '_') && !(token.charAt(i) == '-') && !(token.charAt(i) == '/') && Character.isLetterOrDigit(token.charAt(i)) == false) {
+ String invalidCharString = null;
+ if (UTF16.getCharCount(cp)>1)
+ {
+ invalidCharString = UTF16.valueOf(cp);
+ }
+ else
+ {
+ invalidCharString = (new Character(token.charAt(i))).toString();
+ }
+ Object[] invalidChar = new Object[]{invalidCharString};
+ String errorStatus = ResourceHandler.getString(ResourceHandler.The_character_is_invalid_in_a_context_root, invalidChar);
+ return new ResourceStatus(IResourceStatus.INVALID_VALUE, null, errorStatus);
+ }
+ }
+ }
+ } else
+ {
+ return new ResourceStatus(IResourceStatus.INVALID_VALUE, null, ResourceHandler.Names_cannot_contain_whitespace);
+ }
+ return OK_STATUS;
+ }
+
+ protected IStatus validateFolderName(String folderName) {
+ // the directory is not required, but if the name is entered ensure that it
+ // contains only valid characters.
+ if (folderName == null || folderName.length() == 0) {
+ return OK_STATUS;
+ }
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ IPath path = new Path(folderName);
+ for (int i = 0, max = path.segmentCount(); i < max; i++) {
+ IStatus status = workspace.validateName(path.segment(i), IResource.FOLDER);
+ if (! status.isOK())
+ return status;
+ }
+
+ // all of the potential segments of the folder have been verified
+ return OK_STATUS;
+ }
+}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDelegate.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDelegate.java
new file mode 100644
index 0000000..15276d6
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDelegate.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.project.facet;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
+import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
+import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
+import org.eclipse.wst.common.project.facet.core.IDelegate;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.web.internal.WSTWebPlugin;
+
+public class SimpleWebFacetInstallDelegate implements IDelegate {
+
+ public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
+ if (monitor != null)
+ monitor.beginTask("", 1); //$NON-NLS-1$
+ try {
+ IDataModel model = (IDataModel) config;
+ addNatures(project);
+ final IVirtualComponent c = ComponentCore.createComponent(project, false);
+ c.create(0, null);
+
+ final IWorkspace ws = ResourcesPlugin.getWorkspace();
+ final IPath pjpath = project.getFullPath();
+ final IPath contentdir = setContentPropertyIfNeeded(model, pjpath, project);
+ mkdirs(ws.getRoot().getFolder(contentdir));
+
+ final IVirtualFolder webroot = c.getRootFolder();
+ if (webroot.getProjectRelativePath().equals(new Path("/"))) { //$NON-NLS-1$
+ webroot.createLink(new Path("/" + model.getStringProperty(ISimpleWebFacetInstallDataModelProperties.CONTENT_DIR)), 0, null); //$NON-NLS-1$
+ }
+
+ ComponentUtilities.setServerContextRoot(project,model.getStringProperty(ISimpleWebFacetInstallDataModelProperties.CONTEXT_ROOT));
+
+ try {
+ ((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null);
+ } catch (ExecutionException e) {
+ WSTWebPlugin.logError(e);
+ }
+ } finally {
+ if (monitor != null)
+ monitor.done();
+ }
+ }
+
+ private IPath setContentPropertyIfNeeded(final IDataModel model, final IPath pjpath, IProject project) {
+ IVirtualComponent c = ComponentCore.createComponent(project);
+ if (c.exists()) {
+ if( !c.getRootFolder().getProjectRelativePath().isRoot() ){
+ return c.getRootFolder().getUnderlyingResource().getFullPath();
+ }
+ }
+ return pjpath.append(model.getStringProperty(ISimpleWebFacetInstallDataModelProperties.CONTENT_DIR));
+ }
+
+ private void addNatures(final IProject project) throws CoreException {
+ final IProjectDescription desc = project.getDescription();
+ final String[] current = desc.getNatureIds();
+ final String[] replacement = new String[current.length + 1];
+ System.arraycopy(current, 0, replacement, 0, current.length);
+ replacement[current.length] = IModuleConstants.MODULE_NATURE_ID;
+ desc.setNatureIds(replacement);
+ project.setDescription(desc, null);
+ }
+
+ private static void mkdirs(final IFolder folder) throws CoreException {
+ if (!folder.exists()) {
+ if (folder.getParent() instanceof IFolder) {
+ mkdirs((IFolder) folder.getParent());
+ }
+ folder.create(true, true, null);
+ }
+ }
+
+}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetProjectCreationDataModelProvider.java
new file mode 100644
index 0000000..90020ff
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetProjectCreationDataModelProvider.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.project.facet;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
+import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+
+public class SimpleWebFacetProjectCreationDataModelProvider extends FacetProjectCreationDataModelProvider {
+
+ public SimpleWebFacetProjectCreationDataModelProvider() {
+ super();
+ }
+
+ @Override
+ public void init() {
+ super.init();
+
+ Collection<IProjectFacet> requiredFacets = new ArrayList<IProjectFacet>();
+ requiredFacets.add(ProjectFacetsManager.getProjectFacet(IModuleConstants.WST_WEB_MODULE));
+ setProperty(REQUIRED_FACETS_COLLECTION, requiredFacets);
+ }
+
+}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetUninstallDelegate.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetUninstallDelegate.java
new file mode 100644
index 0000000..2445796
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetUninstallDelegate.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.project.facet;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
+import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
+import org.eclipse.wst.common.project.facet.core.IDelegate;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+
+public class SimpleWebFacetUninstallDelegate implements IDelegate {
+
+ public SimpleWebFacetUninstallDelegate() {
+ super();
+ }
+
+ public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
+ if (monitor != null)
+ monitor.beginTask("", 1); //$NON-NLS-1$
+ try {
+ // Remove the .component file
+ IFile file = project.getFile(StructureEdit.MODULE_META_FILE_NAME);
+ file.delete(true, monitor);
+
+ // Remove the module core nature
+ ProjectUtilities.removeNatureFromProject(project, IModuleConstants.MODULE_NATURE_ID);
+ } finally {
+ if (monitor != null)
+ monitor.done();
+ }
+ }
+}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/DelegateConfigurationElement.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/DelegateConfigurationElement.java
new file mode 100644
index 0000000..7add548
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/DelegateConfigurationElement.java
@@ -0,0 +1,234 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+/*
+ * Created on December 14, 2004
+ */
+package org.eclipse.wst.web.internal;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IContributor;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.InvalidRegistryObjectException;
+
+/**
+ * An object which represents the user-defined contents of an extension in a plug-in manifest.
+ */
+public class DelegateConfigurationElement implements IConfigurationElement {
+
+ private final IConfigurationElement delegateElement;
+ private static final String DELEGATE_NAME = "delegateConfigurationElement"; //$NON-NLS-1$
+ private static final String DELEGATE_NAMESPACE = "delegateConfigurationElementNamespace"; //$NON-NLS-1$
+ private static final String DELEGATE_NULL_STRING = "delegateConfigurationElement: NULL"; //$NON-NLS-1$
+
+ public DelegateConfigurationElement(IConfigurationElement aDelegate) {
+ delegateElement = aDelegate;
+ }
+
+ /**
+ * @param propertyName
+ * @return
+ * @throws org.eclipse.core.runtime.CoreException
+ */
+ public Object createExecutableExtension(String propertyName) throws CoreException {
+ if (delegateElement == null)
+ return null;
+ return delegateElement.createExecutableExtension(propertyName);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (delegateElement == null)
+ return false;
+ return delegateElement.equals(obj);
+ }
+
+ /**
+ * @param name
+ * @return
+ * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
+ */
+ public String getAttribute(String name) throws InvalidRegistryObjectException {
+ if (delegateElement == null)
+ return null;
+ return delegateElement.getAttribute(name);
+ }
+
+ /**
+ * @param name
+ * @return
+ * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
+ */
+ public String getAttributeAsIs(String name) throws InvalidRegistryObjectException {
+ if (delegateElement == null)
+ return null;
+ return delegateElement.getAttributeAsIs(name);
+ }
+
+ /**
+ * @return
+ * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
+ */
+ public String[] getAttributeNames() throws InvalidRegistryObjectException {
+ if (delegateElement == null)
+ return new String[0];
+ return delegateElement.getAttributeNames();
+ }
+
+ /**
+ * @return
+ * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
+ */
+ public IConfigurationElement[] getChildren() throws InvalidRegistryObjectException {
+ if (delegateElement == null)
+ return new IConfigurationElement[0];
+ return delegateElement.getChildren();
+ }
+
+ /**
+ * @param name
+ * @return
+ * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
+ */
+ public IConfigurationElement[] getChildren(String name) throws InvalidRegistryObjectException {
+ if (delegateElement == null)
+ return new IConfigurationElement[0];
+ return delegateElement.getChildren(name);
+ }
+
+ /**
+ * @return
+ * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
+ */
+ public IExtension getDeclaringExtension() throws InvalidRegistryObjectException {
+ if (delegateElement == null)
+ throw new InvalidRegistryObjectException();
+ return delegateElement.getDeclaringExtension();
+ }
+
+ /**
+ * @return
+ * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
+ */
+ public String getName() throws InvalidRegistryObjectException {
+ if (delegateElement == null)
+ return DELEGATE_NAME;
+ return delegateElement.getName();
+ }
+
+ /**
+ * @return
+ * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
+ */
+ public String getNamespace() throws InvalidRegistryObjectException {
+ if (delegateElement == null)
+ return DELEGATE_NAMESPACE;
+ return delegateElement.getNamespace();
+ }
+
+ /**
+ * @return
+ * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
+ */
+ public Object getParent() throws InvalidRegistryObjectException {
+ if (delegateElement == null)
+ return null;
+ return delegateElement.getParent();
+ }
+
+ /**
+ * @return
+ * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
+ */
+ public String getValue() throws InvalidRegistryObjectException {
+ if (delegateElement == null)
+ return null;
+ return delegateElement.getValue();
+ }
+
+ /**
+ * @return
+ * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
+ */
+ public String getValueAsIs() throws InvalidRegistryObjectException {
+ if (delegateElement == null)
+ return null;
+ return delegateElement.getValueAsIs();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#hashCode()
+ */
+ @Override
+ public int hashCode() {
+ if (delegateElement == null)
+ return -1;
+ return delegateElement.hashCode();
+ }
+
+ /**
+ * @return
+ */
+ public boolean isValid() {
+
+ if (delegateElement == null)
+ return false;
+ return delegateElement.isValid();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ if (delegateElement == null)
+ return DELEGATE_NULL_STRING;
+ return delegateElement.toString();
+ }
+
+ public IConfigurationElement toEquinox() {
+ return null;
+ }
+
+ public IContributor getContributor() throws InvalidRegistryObjectException {
+ if (delegateElement == null)
+ throw new InvalidRegistryObjectException();
+ return delegateElement.getContributor();
+ }
+
+ public String getNamespaceIdentifier() throws InvalidRegistryObjectException {
+ if (delegateElement == null)
+ return DELEGATE_NAMESPACE;
+ return delegateElement.getNamespaceIdentifier();
+ }
+
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=296122
+ public String getAttribute(String attrName, String locale) throws InvalidRegistryObjectException {
+ if (delegateElement == null) return null;
+ return delegateElement.getAttribute(attrName, locale);
+ }
+
+ // https://bugs.eclipse.org/bugs/show_bug.cgi?id=296122
+ public String getValue(String locale) throws InvalidRegistryObjectException {
+ if (delegateElement == null) return null;
+ return delegateElement.getValue(locale);
+ }
+
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ISimpleWebModuleConstants.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ISimpleWebModuleConstants.java
new file mode 100644
index 0000000..e58e260
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ISimpleWebModuleConstants.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.wst.web.internal;
+
+
+public interface ISimpleWebModuleConstants
+{
+ public static final String PLUG_IN_ID = "org.eclipse.wst.web"; //$NON-NLS-1$
+ public static final String STATIC_PROJECT_TYPE = "STATIC"; //$NON-NLS-1$
+ public static final String CSS_DIRECTORY = "theme"; //$NON-NLS-1$
+ public static final String INFO_DIRECTORY = "WEB-INF"; //$NON-NLS-1$
+ public static final String LIBRARY_DIRECTORY = "lib"; //$NON-NLS-1$
+ public static final String CLASSES_DIRECTORY = "classes"; //$NON-NLS-1$
+}
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
new file mode 100644
index 0000000..0f4e7aa
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/IWSTWebPreferences.java
@@ -0,0 +1,13 @@
+/***************************************************************************************************
+ * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
+ * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies 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
new file mode 100644
index 0000000..7167724
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ResourceHandler.java
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.web.internal;
+
+import org.eclipse.osgi.util.NLS;
+
+public final class ResourceHandler extends NLS {
+
+ private static final String BUNDLE_NAME = "staticwebproject";//$NON-NLS-1$
+
+ private ResourceHandler() {
+ // Do not instantiate
+ }
+
+ public static String StaticWebProjectCreationWizard_Wizard_Title;
+ public static String StaticWebProjectWizardBasePage_Page_Description;
+ public static String StaticWebSettingsPropertiesPage_Web_Content_Label;
+ public static String StaticContextRootComposite_Context_Root_Label;
+ public static String StaticWebProjectWizardBasePage_Page_Title;
+ public static String StaticWebSettingsPropertiesPage_Not_available_for_closed_projects;
+ public static String TargetRuntime;
+ public static String NewDotDotDot;
+ public static String InvalidServerTarget;
+ public static String ConfigureSettings;
+ public static String Context_Root_cannot_be_empty_2;
+ public static String Names_cannot_contain_whitespace;
+ public static String The_character_is_invalid_in_a_context_root;
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, ResourceHandler.class);
+ }
+
+ public static String getString(String key, Object[] args) {
+ return NLS.bind(key, args);
+ }
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.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
new file mode 100644
index 0000000..d14b6c8
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPlugin.java
@@ -0,0 +1,106 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.wst.web.internal;
+
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import java.lang.Throwable;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.MultiStatus;
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+public class WSTWebPlugin extends Plugin
+{
+ //The shared instance.
+ private static WSTWebPlugin plugin;
+
+ private WSTWebPreferences preferences;
+
+ public static final String 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 ID for this plugin (added automatically by logging quickfix)
+ public static final String PLUGIN_ID = "org.eclipse.wst.web"; //$NON-NLS-1$
+ /**
+ * The constructor.
+ */
+ public WSTWebPlugin() {
+ super();
+ plugin = this;
+ }
+
+ /**
+ * Returns the shared instance.
+ */
+ public static WSTWebPlugin getDefault()
+ {
+ return plugin;
+ }
+
+ public static IWorkspace getWorkspace() {
+ return ResourcesPlugin.getWorkspace();
+ }
+
+ @Override
+ protected void initializeDefaultPluginPreferences() {
+ getWSTWebPreferences().initializeDefaultPreferences();
+ }
+ /**
+ * @return Returns the preferences.
+ */
+ public WSTWebPreferences getWSTWebPreferences() {
+ if (this.preferences == null)
+ this.preferences = new WSTWebPreferences(this);
+ return this.preferences;
+ }
+
+ public static IStatus createStatus(int severity, String message, Throwable exception) {
+ return new Status(severity, PLUGIN_ID, message, exception);
+ }
+
+ public static IStatus createStatus(int severity, String message) {
+ return createStatus(severity, message, null);
+ }
+
+ public static void logError(String message) {
+ Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, message));
+ }
+
+ public static void logError(String message, Throwable exception) {
+ Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, message, exception));
+ }
+
+ public static void logError(String message, CoreException exception) {
+ MultiStatus status = new MultiStatus(PLUGIN_ID,IStatus.ERROR,new IStatus[]{exception.getStatus()},message,exception);
+ Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( status );
+ }
+
+ public static void logError(Throwable exception) {
+ Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception));
+ }
+
+ public static void logError(CoreException exception) {
+ Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
+ }
+}
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
new file mode 100644
index 0000000..fd5256a
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPreferences.java
@@ -0,0 +1,81 @@
+/***************************************************************************************************
+ * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
+ * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies 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
new file mode 100644
index 0000000..efa92d0
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WebPropertiesUtil.java
@@ -0,0 +1,108 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.web.internal;
+
+import com.ibm.icu.util.StringTokenizer;
+
+public class WebPropertiesUtil {
+ private static final char[] BAD_CHARS = {'/', '\\', ':'};
+ /**
+ * @param project
+ * org.eclipse.core.resources.IProject
+ */
+ /**
+ * Returns a error message that states whether a context root is valid or not returns null if
+ * context root is fine
+ *
+ * @return java.lang.String
+ * @param contextRoot
+ * java.lang.String
+ */
+ public static String validateContextRoot(String contextRoot) {
+
+ if (contextRoot == null)
+ return null;
+
+ String errorMessage = null;
+
+ String name = contextRoot;
+ if (name.equals("")) { //$NON-NLS-1$
+ // this was added because the error message shouldnt be shown initially. It should be
+ // shown only if context root field is edited to
+ errorMessage = ResourceHandler.StaticWebProjectWizardBasePage_Page_Title;
+
+ //errorMessage = ProjectSupportResourceHandler.getString("Context_Root_cannot_be_empty_2"); //$NON-NLS-1$
+ return errorMessage;
+ }
+
+ /*******************************************************************************************
+ * // JZ - fix to defect 204264, "/" is valid in context root if (name.indexOf("//") != -1) {
+ * //$NON-NLS-1$ errorMessage = "// are invalid characters in a resource name"; return
+ * errorMessage;
+ * }
+ ******************************************************************************************/
+
+ if (name.trim().equals(name)) {
+ StringTokenizer stok = new StringTokenizer(name, "."); //$NON-NLS-1$
+ outer : while (stok.hasMoreTokens()) {
+ String token = stok.nextToken();
+ for (int i = 0; i < token.length(); i++) {
+ if (!(token.charAt(i) == '_') && !(token.charAt(i) == '-') && !(token.charAt(i) == '/') && Character.isLetterOrDigit(token.charAt(i)) == false) {
+ if (Character.isWhitespace(token.charAt(i))) {
+ //Removed because context roots can contain white space
+ //errorMessage =
+ // ResourceHandler.getString("_Context_root_cannot_conta_UI_");//$NON-NLS-1$
+ // = " Context root cannot contain whitespaces."
+ } else {
+ errorMessage = ResourceHandler.StaticWebProjectWizardBasePage_Page_Title;
+
+ //errorMessage = ProjectSupportResourceHandler.getString("The_character_is_invalid_in_a_context_root", new Object[]{(new Character(token.charAt(i))).toString()}); //$NON-NLS-1$
+ break outer;
+ }
+ }
+ }
+ }
+ } // en/ end of if(name.trim
+ else
+ errorMessage = ResourceHandler.StaticWebProjectWizardBasePage_Page_Title;
+ //errorMessage = ProjectSupportResourceHandler.getString("Names_cannot_begin_or_end_with_whitespace_5"); //$NON-NLS-1$
+
+ return errorMessage;
+ }
+
+
+ /**
+ * Return true if the string contains any of the characters in the array.
+ */
+ private static boolean contains(String str, char[] chars) {
+ for (int i = 0; i < chars.length; i++) {
+ if (str.indexOf(chars[i]) != -1)
+ return true;
+ }
+ return false;
+ }
+
+
+ public static String validateFolderName(String folderName) {
+ if (folderName.length() == 0)
+ return ResourceHandler.StaticWebProjectWizardBasePage_Page_Title;
+
+ //return ProjectSupportResourceHandler.getString("Folder_name_cannot_be_empty_2"); //$NON-NLS-1$
+
+ if (contains(folderName, BAD_CHARS))
+ return ResourceHandler.StaticWebProjectWizardBasePage_Page_Title;
+
+ //return ProjectSupportResourceHandler.getString("Folder_name_is_not_valid", new Object[]{folderName}); //$NON-NLS-1$
+
+ return null;
+ }
+
+}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java
new file mode 100644
index 0000000..251db89
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java
@@ -0,0 +1,429 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.web.internal.deployables;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.common.componentcore.ArtifactEdit;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualContainer;
+import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
+import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.ServerUtil;
+import org.eclipse.wst.server.core.model.IModuleFile;
+import org.eclipse.wst.server.core.model.IModuleFolder;
+import org.eclipse.wst.server.core.model.IModuleResource;
+import org.eclipse.wst.server.core.util.ModuleFile;
+import org.eclipse.wst.server.core.util.ModuleFolder;
+import org.eclipse.wst.server.core.util.ProjectModule;
+
+/**
+ * @deprecated as of WTP 3.2
+ */
+public abstract class ComponentDeployable extends ProjectModule {
+
+ protected IVirtualComponent component = null;
+ protected List<IModuleResource> members = new ArrayList<IModuleResource>();
+
+ public ComponentDeployable(IProject project) {
+ this(project,ComponentCore.createComponent(project));
+ }
+
+ public ComponentDeployable(IProject project, IVirtualComponent aComponent) {
+ super(project);
+ this.component = aComponent;
+ }
+
+ /**
+ * @see org.eclipse.jst.server.core.IJ2EEModule#isBinary()
+ */
+ public boolean isBinary() {
+ if (component==null)
+ return false;
+ return component.isBinary();
+ }
+
+ /**
+ * Add the resources from mr to the existing resources in Module Folder mf
+ * @param ModuleFolder mf
+ * @param IModuleResource[] mr
+ */
+ protected void addMembersToModuleFolder(ModuleFolder mf, IModuleResource[] mr) {
+ // If the folder is null or the resources to add are null or empty, bail and return
+ if (mf == null || mr == null || mr.length==0)
+ return;
+ // Get the existing members in the module folder
+ IModuleResource[] mf_members = mf.members();
+ int mf_size = 0;
+ // Get the length of the existing members in the module folder
+ if (mf_members != null)
+ mf_size = mf_members.length;
+ // Create a new array to set on the module folder which will combine the existing and
+ // new module resources
+ IModuleResource[] res = new IModuleResource[mf_size + mr.length];
+ // Copy the existing members into the array if there are any
+ if (mf_members != null && mf_size > 0)
+ System.arraycopy(mf_members, 0, res, 0, mf_size);
+ // Copy the new members into the array
+ System.arraycopy(mr, 0, res, mf_size, mr.length);
+ // Set the new members array on the module folder
+ mf.setMembers(res);
+ }
+
+ /**
+ * Returns the child modules of this module.
+ *
+ * @return org.eclipse.wst.server.core.model.IModule[]
+ */
+ @Override
+ public IModule[] getChildModules() {
+ return getModules();
+ }
+
+ public IModule[] getModules() {
+ List<IModule> modules = new ArrayList<IModule>();
+ if (component != null) {
+ IVirtualReference[] components = getReferences(component);
+ for (int i = 0; i < components.length; i++) {
+ IVirtualReference reference = components[i];
+ if (reference != null && reference.getDependencyType()==IVirtualReference.DEPENDENCY_TYPE_USES) {
+ IVirtualComponent virtualComp = reference.getReferencedComponent();
+ IModule module = gatherModuleReference(component, virtualComp);
+ if (module != null && !modules.contains(module))
+ modules.add(module);
+ }
+ }
+ }
+ return modules.toArray(new IModule[modules.size()]);
+ }
+
+ protected IVirtualReference[] getReferences(IVirtualComponent aComponent) {
+ return aComponent.getReferences();
+ }
+
+ protected IModule gatherModuleReference(IVirtualComponent component, IVirtualComponent targetComponent ) {
+ // Handle workspace project module components
+ if (targetComponent != null && targetComponent.getProject()!=component.getProject()) {
+ if (!targetComponent.isBinary())
+ return ServerUtil.getModule(targetComponent.getProject());
+ }
+ return null;
+ }
+
+ /**
+ * Find the module resources for a given container and path. Inserts in the java containers
+ * at a given path if not null.
+ *
+ * @param cont a container
+ * @param path the current module relative path
+ * @param javaPath the path where Java resources fit in the root
+ * @param javaCont
+ * @return a possibly-empty array of module resources
+ * @throws CoreException
+ */
+ protected IModuleResource[] getMembers(IContainer cont, IPath path, IPath javaPath, IContainer[] javaCont) throws CoreException {
+ IResource[] res = cont.members();
+ int size2 = res.length;
+ List<IModuleFile> list = new ArrayList<IModuleFile>(size2);
+ for (int j = 0; j < size2; j++) {
+ if (res[j] instanceof IContainer) {
+ IContainer cc = (IContainer) res[j];
+
+ IPath newPath = path.append(cc.getName()).makeRelative();
+ // Retrieve already existing module folder if applicable
+ ModuleFolder mf = (ModuleFolder) getExistingModuleResource(members,newPath);
+ if (mf == null) {
+ mf = new ModuleFolder(cc, cc.getName(), path);
+ ModuleFolder parent = (ModuleFolder) getExistingModuleResource(members, path);
+ if (path.isEmpty())
+ members.add(mf);
+ else {
+ if (parent == null)
+ parent = ensureParentExists(path, cc);
+ addMembersToModuleFolder(parent, new IModuleResource[] {mf});
+ }
+ }
+ IModuleResource[] mr = getMembers(cc, newPath, javaPath, javaCont);
+
+ if (javaPath != null && newPath.isPrefixOf(javaPath))
+ mr = handleJavaPath(path, javaPath, newPath, javaCont, mr, cc);
+
+ addMembersToModuleFolder(mf, mr);
+
+ } else {
+ IFile f = (IFile) res[j];
+ // Handle the default package case
+ if (path.equals(javaPath)) {
+ ModuleFolder mFolder = (ModuleFolder) getExistingModuleResource(members,javaPath);
+ IModuleFile mFile = createModuleFile(f, javaPath);
+ if (mFolder != null)
+ addMembersToModuleFolder(mFolder,new IModuleResource[]{mFile});
+ else
+ list.add(mFile);
+ } else {
+ IModuleFile mf = createModuleFile(f, path);
+ list.add(mf);
+ }
+ }
+ }
+ IModuleResource[] mr = new IModuleResource[list.size()];
+ list.toArray(mr);
+ return mr;
+ }
+
+ protected IModuleFile createModuleFile(final IFile file, final IPath path) {
+ return new ModuleFile(file, file.getName(), path);
+ }
+
+ protected IModuleResource[] getMembers(IVirtualContainer cont, IPath path) throws CoreException {
+ IVirtualResource[] res = cont.members();
+ int size2 = res.length;
+ List<IModuleFile> list = new ArrayList<IModuleFile>(size2);
+ for (int j = 0; j < size2; j++) {
+ if (res[j] instanceof IVirtualContainer) {
+ IVirtualContainer cc = (IVirtualContainer) res[j];
+ // Retrieve already existing module folder if applicable
+ ModuleFolder mf = (ModuleFolder) getExistingModuleResource(members,path.append(new Path(cc.getName()).makeRelative()));
+ if (mf == null) {
+ mf = new ModuleFolder((IContainer)cc.getUnderlyingResource(), cc.getName(), path);
+ ModuleFolder parent = (ModuleFolder) getExistingModuleResource(members, path);
+ if (path.isEmpty())
+ members.add(mf);
+ else {
+ if (parent == null)
+ parent = ensureParentExists(path, (IContainer)cc.getUnderlyingResource());
+ addMembersToModuleFolder(parent, new IModuleResource[] {mf});
+ }
+ }
+ IModuleResource[] mr = getMembers(cc, path.append(cc.getName()));
+ addMembersToModuleFolder(mf, mr);
+ } else {
+ IFile f = (IFile) res[j].getUnderlyingResource();
+ IModuleFile mf = null;
+ if (shouldAddComponentFile(f)) {
+ mf = createModuleFile(f, path);
+ list.add(mf);
+ }
+ }
+ }
+ IModuleResource[] mr = new IModuleResource[list.size()];
+ list.toArray(mr);
+ return mr;
+ }
+
+ protected ModuleFolder ensureParentExists(IPath path, IContainer cc) {
+ ModuleFolder parent = (ModuleFolder) getExistingModuleResource(members, path);
+ if (parent == null) {
+ String folderName = path.lastSegment();
+ IPath folderPath = Path.EMPTY;
+ if (path.segmentCount()>1)
+ folderPath = path.removeLastSegments(1);
+ parent = new ModuleFolder(cc, folderName, folderPath);
+ if (path.segmentCount()>1)
+ addMembersToModuleFolder(ensureParentExists(path.removeLastSegments(1),cc), new IModuleResource[] {parent});
+ else
+ members.add(parent);
+ }
+ return parent;
+ }
+
+ /**
+ * This method is meant to be overridden by subclasses. Return whether or not to add this file
+ * to the members list.
+ *
+ * @param file
+ * @return boolean should add file?
+ */
+ protected boolean shouldAddComponentFile(IFile file) {
+ return true;
+ }
+
+ /**
+ * Check the current cache to see if we already have an existing module resource for
+ * the given path.
+ * @param aList
+ * @param path
+ * @return an existing moduleResource from the cached result
+ */
+
+ protected IModuleResource getExistingModuleResource(List aList, IPath path) {
+ // If the list is empty, return null
+ if (aList==null || aList.isEmpty() || path == null)
+ return null;
+ // Otherwise recursively check to see if given resource matches current resource or if it is a child
+ String[] pathSegments = path.segments();
+ IModuleResource moduleResource = null;
+
+ if(pathSegments.length == 0)
+ return null;
+ for (Iterator iter = aList.iterator(); iter.hasNext();) {
+ moduleResource = (IModuleResource) iter.next();
+ String[] moduleSegments = moduleResource.getModuleRelativePath().segments();
+ // If the last segment in passed in path equals the module resource name
+ // and segment count is the same and the path segments start with the module path segments
+ // then we have a match and we return the existing moduleResource
+ if (pathSegments[pathSegments.length - 1].equals(moduleResource.getName()) &&
+ (moduleSegments.length + 1) == pathSegments.length &&
+ startsWith(moduleSegments, pathSegments))
+ return moduleResource;
+
+ // Otherwise, if it is a folder, check its children for the existing resource path
+ // but only check if the beginning segments are a match
+ if(moduleResource instanceof IModuleFolder &&
+ startsWith(moduleSegments, pathSegments) && pathSegments.length > moduleSegments.length &&
+ moduleResource.getName().equals(pathSegments[moduleSegments.length > 0 ? moduleSegments.length : 0]))
+ if (((IModuleFolder)moduleResource).members()!=null)
+ return getExistingModuleResource(Arrays.asList(((IModuleFolder)moduleResource).members()),path);
+ }
+ return null;
+ }
+
+ /**
+ *
+ * @param beginningSegments
+ * @param testSegments
+ * @return True if beginningSegments[i] == testSegments[i] for all 0<=i<beginningSegments[i]
+ */
+ private boolean startsWith(String[] beginningSegments, String[] testSegments) {
+ for(int i=0; i < beginningSegments.length; i++) {
+ if(!beginningSegments[i].equals(testSegments[i]))
+ return false;
+ }
+ return true;
+ }
+
+ protected IModuleResource[] handleJavaPath(IPath path, IPath javaPath, IPath curPath, IContainer[] javaCont, IModuleResource[] mr, IContainer cc) throws CoreException {
+ //subclasses may override
+ return new IModuleResource[]{};
+ }
+
+ @Override
+ public IModuleResource[] members() throws CoreException {
+ members.clear();
+ IVirtualComponent vc = ComponentCore.createComponent(getProject());
+ if (vc != null) {
+ IVirtualFolder vFolder = vc.getRootFolder();
+ IModuleResource[] mr = getMembers(vFolder, Path.EMPTY);
+ int size = mr.length;
+ for (int j = 0; j < size; j++) {
+ members.add(mr[j]);
+ }
+ addUtilMembers(vc);
+ }
+
+ IModuleResource[] mr = new IModuleResource[members.size()];
+ members.toArray(mr);
+ return mr;
+ }
+
+ protected boolean shouldIncludeUtilityComponent(IVirtualComponent virtualComp, IVirtualReference[] components, ArtifactEdit edit) {
+ return virtualComp != null && virtualComp.isBinary() && virtualComp.getProject()==component.getProject();
+ }
+
+ protected void addUtilMembers(IVirtualComponent vc) {
+ ArtifactEdit edit = null;
+ try {
+ edit = getComponentArtifactEditForRead();
+ IVirtualReference[] components = vc.getReferences();
+ for (int i = 0; i < components.length; i++) {
+ IVirtualReference reference = components[i];
+ IVirtualComponent virtualComp = reference.getReferencedComponent();
+ if (shouldIncludeUtilityComponent(virtualComp,components,edit)) {
+ addUtilMember(vc, reference, reference.getRuntimePath());
+ }
+ }
+ } finally {
+ if (edit!=null)
+ edit.dispose();
+ }
+ }
+
+ protected void addUtilMember(IVirtualComponent parent, IVirtualReference reference, IPath runtimePath) {
+ IModuleFile mf = null;
+ final String archiveName2 = reference.getArchiveName();
+ final String archiveName = new Path(archiveName2).lastSegment();
+ final IVirtualComponent virtualComp = reference.getReferencedComponent();
+ IFile ifile = (IFile)virtualComp.getAdapter(IFile.class);
+ if (ifile != null) { //In Workspace
+ String name = null != archiveName ? archiveName : ifile.getName();
+ mf = new ModuleFile(ifile, name, runtimePath.makeRelative());
+ } else {
+ File extFile = (File)virtualComp.getAdapter(File.class);
+ String name = null != archiveName ? archiveName : extFile.getName();
+ mf = new ModuleFile(extFile, name, runtimePath.makeRelative());
+ }
+ IModuleResource moduleParent = getExistingModuleResource(members, mf.getModuleRelativePath());
+ if (moduleParent != null && moduleParent instanceof ModuleFolder) {
+ addMembersToModuleFolder((ModuleFolder)moduleParent, new IModuleResource[]{mf});
+ } else {
+ if (mf.getModuleRelativePath().isEmpty()) {
+ members.add(mf);
+ } else {
+ if (moduleParent == null) {
+ moduleParent = ensureParentExists(mf.getModuleRelativePath(), (IContainer)parent.getRootFolder().getUnderlyingResource());
+ }
+ addMembersToModuleFolder((ModuleFolder)moduleParent, new IModuleResource[] {mf});
+ }
+ }
+ }
+
+ protected ArtifactEdit getComponentArtifactEditForRead() {
+ return null;
+ }
+
+ protected static boolean isProjectOfType(IProject project, String typeID) {
+ IFacetedProject facetedProject = null;
+ try {
+ facetedProject = ProjectFacetsManager.create(project);
+ } catch (CoreException e) {
+ return false;
+ }
+
+ if (facetedProject !=null && ProjectFacetsManager.isProjectFacetDefined(typeID)) {
+ IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(typeID);
+ return projectFacet!=null && facetedProject.hasProjectFacet(projectFacet);
+ }
+ return false;
+ }
+
+ /**
+ * Returns the root folders for the resources in this module.
+ *
+ * @return a possibly-empty array of resource folders
+ */
+ public IContainer[] getResourceFolders() {
+ IVirtualComponent vc = ComponentCore.createComponent(getProject());
+ if (vc != null) {
+ IVirtualFolder vFolder = vc.getRootFolder();
+ if (vFolder != null)
+ return vFolder.getUnderlyingFolders();
+ }
+ return new IContainer[]{};
+ }
+
+}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/FlatComponentDeployable.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/FlatComponentDeployable.java
new file mode 100644
index 0000000..fb8689b
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/FlatComponentDeployable.java
@@ -0,0 +1,379 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Red Hat and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.web.internal.deployables;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent;
+import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent.FlatComponentTaskModel;
+import org.eclipse.wst.common.componentcore.internal.flat.IChildModuleReference;
+import org.eclipse.wst.common.componentcore.internal.flat.IFlatFile;
+import org.eclipse.wst.common.componentcore.internal.flat.IFlatFolder;
+import org.eclipse.wst.common.componentcore.internal.flat.IFlatResource;
+import org.eclipse.wst.common.componentcore.internal.flat.IFlatVirtualComponent;
+import org.eclipse.wst.common.componentcore.internal.flat.IFlattenParticipant;
+import org.eclipse.wst.common.componentcore.internal.util.VirtualReferenceUtilities;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.ServerUtil;
+import org.eclipse.wst.server.core.model.IModuleFile;
+import org.eclipse.wst.server.core.model.IModuleFolder;
+import org.eclipse.wst.server.core.model.IModuleResource;
+import org.eclipse.wst.server.core.model.ModuleDelegate;
+import org.eclipse.wst.server.core.util.ModuleFile;
+import org.eclipse.wst.server.core.util.ProjectModule;
+
+public abstract class FlatComponentDeployable extends ProjectModule {
+
+ /*
+ * Register an adapt IModule to IVirtualComponent
+ */
+ static {
+ Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {
+ public Class[] getAdapterList() {
+ return new Class[] { IVirtualComponent.class };
+ }
+
+ public Object getAdapter(Object adaptableObject, Class adapterType) {
+ if (adaptableObject instanceof IModule) {
+ IModule module = (IModule) adaptableObject;
+ FlatComponentDeployable deployable = (FlatComponentDeployable) module.loadAdapter(FlatComponentDeployable.class, null);
+ if(deployable != null){
+ IVirtualComponent virtualComponent = deployable.getComponent();
+ return virtualComponent;
+ }
+ }
+ return null;
+ }
+ }, IModule.class);
+ }
+
+ protected IVirtualComponent component = null;
+ protected List<IModuleResource> members = new ArrayList<IModuleResource>();
+
+ public FlatComponentDeployable(IProject project) {
+ this(project,ComponentCore.createComponent(project));
+ }
+
+ public FlatComponentDeployable(IProject project, IVirtualComponent aComponent) {
+ super(project);
+ this.component = aComponent;
+ }
+
+ public IVirtualComponent getComponent() {
+ return component;
+ }
+
+ /**
+ * We will cache the flattened piece here, and instead redirect
+ * the module factories to recreate the modules *whenever* there is
+ * a workspace change. This will still be much more efficient than
+ * traversing the tree each time a call to getResources() or getChildModules().
+ */
+ private FlatVirtualComponent cacheFlattened = null;
+
+
+ public boolean shouldCache() {
+ return false;
+ }
+
+ public void clearCache() {
+ cacheFlattened = null;
+ }
+
+ /**
+ * The export model is what does the grunt of the work
+ * @return
+ */
+ protected IFlatVirtualComponent getFlatComponent() {
+ if( !shouldCache() || cacheFlattened == null ) {
+ FlatComponentTaskModel options = new FlatComponentTaskModel();
+ options.put(FlatVirtualComponent.PARTICIPANT_LIST, Arrays.asList(getParticipants()));
+ FlatVirtualComponent tmp = new FlatVirtualComponent(component, options);
+ if( shouldCache())
+ cacheFlattened = tmp;
+ return tmp;
+ }
+ return cacheFlattened;
+ }
+
+ /**
+ * Subclasses can provide a list of participants who may
+ * be involved in forming the export model
+ *
+ * A deployable with no participant should still properly
+ * consume consumed references and traverse the model appropriately
+ *
+ * @return
+ */
+ protected IFlattenParticipant[] getParticipants() {
+ return new IFlattenParticipant[]{
+ };
+ }
+
+ public boolean isBinary() {
+ return component == null ? false : component.isBinary();
+ }
+
+ @Override
+ public IModuleResource[] members() throws CoreException {
+ if( component.isBinary() )
+ return LEGACY_binaryMembers();
+
+ IFlatVirtualComponent em = getFlatComponent();
+ IFlatResource[] resources = em.fetchResources();
+ return convert(resources);
+
+ }
+
+ protected IModuleResource[] LEGACY_binaryMembers() {
+ IFile ifile = (IFile)component.getAdapter(IFile.class);
+ File file = (File)component.getAdapter(File.class);
+ ModuleFile mf = ifile != null ? new ModuleFile(ifile, ifile.getName(), new Path("")) //$NON-NLS-1$
+ : new ModuleFile(file, file.getName(), new Path("")); //$NON-NLS-1$
+ return new IModuleResource[]{mf};
+ }
+
+ /**
+ * Returns the child modules of this module.
+ *
+ * @return org.eclipse.wst.server.core.model.IModule[]
+ */
+ @Override
+ public IModule[] getChildModules() {
+ return getModules();
+ }
+
+ public /* non api */ IChildModuleReference[] getExportModelChildren() throws CoreException {
+ IFlatVirtualComponent em = getFlatComponent();
+ IChildModuleReference[] children = em.getChildModules();
+ return children;
+ }
+
+ public IModule[] getModules() {
+ // Legacy, here in case the old modules are used
+ if( component.isBinary() )
+ return new IModule[]{};
+
+ try {
+ List<IModule> modules = new ArrayList<IModule>();
+ IChildModuleReference[] children = getExportModelChildren();
+ for( int i = 0; i < children.length; i++ ) {
+ IModule child = gatherModuleReference(component, children[i]);
+ if( child != null )
+ modules.add(child);
+ }
+ return modules.toArray(new IModule[modules.size()]);
+ } catch( CoreException ce ) {
+ }
+ return new IModule[]{};
+ }
+
+ @Override
+ public String getPath(IModule m) {
+ return getURI(m);
+ }
+
+ /**
+ * Returns the URI of the given contained CHILD module.
+ *
+ * SOFT requirements (NOT API!!) in use by some adopters
+ * If the passed in module is equal to this module, return our own deployed name
+ *
+ * @param module a module
+ * @return the URI of the given module, or <code>null</code> if the URI could
+ * not be found
+ */
+ public String getURI(IModule module) {
+ ProjectModule md = (ProjectModule)module.loadAdapter(ProjectModule.class, new NullProgressMonitor());
+ if( md == this ) {
+ // guess my own name
+ return VirtualReferenceUtilities.INSTANCE.getDefaultProjectArchiveName(this.component);
+ }
+ try {
+ FlatComponentDeployable cd = (FlatComponentDeployable)module.loadAdapter(FlatComponentDeployable.class, new NullProgressMonitor());
+ if( cd != null ) {
+ IFlatVirtualComponent em = getFlatComponent();
+ IChildModuleReference[] children = em.getChildModules();
+ for( int i = 0; i < children.length; i++ ) {
+ IModule child = gatherModuleReference(component, children[i]);
+ if( child != null && child.getId().equals(module.getId()))
+ return children[i].getRelativeURI().toString();
+ }
+ }
+ } catch( CoreException ce ) {
+ }
+ return null;
+ }
+
+ /**
+ * If I know how to find an IModule for this child, do so now
+ *
+ * I would love to see this replaced with some API to locate a
+ * possible child module based on a virtual component.
+ *
+ * @param component
+ * @param targetComponent
+ * @return
+ */
+ protected IModule gatherModuleReference(IVirtualComponent component, IChildModuleReference child) {
+ // Handle workspace project module components
+ // Subclasses should extend
+ IVirtualComponent targetComponent = child.getComponent();
+ if (targetComponent != null && targetComponent.getProject()!= component.getProject()) {
+ if (!targetComponent.isBinary()) {
+ return filterModuleDelegates(ServerUtil.getModules(targetComponent.getProject()));
+ }
+ }
+ return null;
+ }
+
+ /**
+ * An extender may wish to override this method in order to control which
+ * delegate is returned in the scenario where more than one exist. By default
+ * the first one found is returned.
+ *
+ * @param IModule[] modules
+ * @return IModule[]
+ */
+ protected IModule filterModuleDelegates(IModule[] modules) {
+ for (int i = 0; i < modules.length; i++) {
+ ModuleDelegate md = (ModuleDelegate)modules[i].loadAdapter(ModuleDelegate.class, new NullProgressMonitor());
+ if (md instanceof ProjectModule) {
+ return modules[i];
+ }
+ }
+ return modules.length > 0 ? modules[0] : null;
+ }
+
+ /*
+ * Below are STATIC utility classes and methods
+ */
+ protected static IModuleResource[] convert(IFlatResource[] resources) {
+ ArrayList<IModuleResource> list = new ArrayList<IModuleResource>();
+ for( int i = 0; i < resources.length; i++ ) {
+ if( resources[i] instanceof IFlatFile)
+ list.add(new ComponentModuleFile(resources[i]));
+ else if( resources[i] instanceof IFlatFolder)
+ list.add(new ComponentModuleFolder(resources[i]));
+ }
+ return list.toArray(new IModuleResource[list.size()]);
+ }
+
+ public static class ComponentModuleResource {
+ protected IFlatResource delegate;
+ public ComponentModuleResource(IFlatResource resource) {
+ this.delegate = resource;
+ }
+ public long getModificationStamp() {
+ return ((IFlatFile)delegate).getModificationStamp();
+ }
+
+ public IPath getModuleRelativePath() {
+ return delegate.getModuleRelativePath();
+ }
+ public String getName() {
+ return delegate.getName();
+ }
+ public Object getAdapter(Class adapter) {
+ return delegate.getAdapter(adapter);
+ }
+ public IModuleResource[] members() {
+ IFlatResource[] children = ((IFlatFolder)delegate).members();
+ return convert(children);
+ }
+ }
+
+ public static class ComponentModuleFile extends ComponentModuleResource implements IModuleFile{
+ public ComponentModuleFile(IFlatResource resource) {
+ super(resource);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == this)
+ return true;
+
+ if (!(obj instanceof IModuleFile))
+ return false;
+
+ IModuleFile mf = (IModuleFile) obj;
+ if (!getName().equals(mf.getName()))
+ return false;
+ if (!getModuleRelativePath().equals(mf.getModuleRelativePath()))
+ return false;
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return getName().hashCode() * 37 + getModuleRelativePath().hashCode();
+ }
+ }
+
+ public static class ComponentModuleFolder extends ComponentModuleResource implements IModuleFolder {
+ public ComponentModuleFolder(IFlatResource resource) {
+ super(resource);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == this)
+ return true;
+
+ if (!(obj instanceof IModuleFolder))
+ return false;
+
+ IModuleFolder mf = (IModuleFolder) obj;
+ if (!getName().equals(mf.getName()))
+ return false;
+ if (!getModuleRelativePath().equals(mf.getModuleRelativePath()))
+ return false;
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return getName().hashCode() * 37 + getModuleRelativePath().hashCode();
+ }
+
+ }
+
+ protected static boolean isProjectOfType(IProject project, String typeID) {
+ IFacetedProject facetedProject = null;
+ try {
+ facetedProject = ProjectFacetsManager.create(project);
+ } catch (CoreException e) {
+ return false;
+ }
+
+ if (facetedProject !=null && ProjectFacetsManager.isProjectFacetDefined(typeID)) {
+ IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(typeID);
+ return projectFacet!=null && facetedProject.hasProjectFacet(projectFacet);
+ }
+ return false;
+ }
+}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/IStaticWebModuleArtifact.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/IStaticWebModuleArtifact.java
new file mode 100644
index 0000000..7fd5bfb
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/IStaticWebModuleArtifact.java
@@ -0,0 +1,14 @@
+/***************************************************************************************************
+ * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
+ * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: IBM Corporation - initial API and implementation
+ **************************************************************************************************/
+
+package org.eclipse.wst.web.internal.deployables;
+
+public interface IStaticWebModuleArtifact {
+
+}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployable.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployable.java
new file mode 100644
index 0000000..a8e0b9a
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployable.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.web.internal.deployables;
+
+import java.util.Properties;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.server.core.util.IStaticWeb;
+
+public class StaticWebDeployable extends FlatComponentDeployable implements IStaticWeb {
+
+ public StaticWebDeployable(IProject project, IVirtualComponent component) {
+ super(project);
+ }
+
+ public String getContextRoot() {
+ Properties props = component.getMetaProperties();
+ if(props.containsKey("context-root")) //$NON-NLS-1$
+ return props.getProperty("context-root"); //$NON-NLS-1$
+ return component.getName();
+ }
+
+ /* TODO This is never called ?? */
+// public String getURI(IModule module) {
+// IVirtualComponent comp = ComponentCore.createComponent(module.getProject());
+// String aURI = null;
+// if (comp !=null) {
+// if (!comp.isBinary() && isProjectOfType(module.getProject(),IModuleConstants.WST_WEB_MODULE)) {
+// IVirtualReference ref = component.getReference(comp.getName());
+// aURI = ref.getRuntimePath().append(comp.getName()+".war").toString(); //$NON-NLS-1$
+// }
+// }
+//
+// if (aURI !=null && aURI.length()>1 && aURI.startsWith("/")) //$NON-NLS-1$
+// aURI = aURI.substring(1);
+// return aURI;
+// }
+
+ public String getVersion() {
+ IFacetedProject facetedProject = null;
+ try {
+ facetedProject = ProjectFacetsManager.create(component.getProject());
+ if (facetedProject !=null && ProjectFacetsManager.isProjectFacetDefined(IModuleConstants.WST_WEB_MODULE)) {
+ IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.WST_WEB_MODULE);
+ return facetedProject.getInstalledVersion(projectFacet).getVersionString();
+ }
+ } catch (Exception e) {
+ //Ignore
+ }
+ return "1.0"; //$NON-NLS-1$
+ }
+
+}
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
new file mode 100644
index 0000000..4c4c6f0
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableFactory.java
@@ -0,0 +1,144 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.web.internal.deployables;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.ModuleCoreNature;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
+import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.model.ModuleDelegate;
+import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate;
+import org.eclipse.wst.web.internal.WSTWebPlugin;
+
+public class StaticWebDeployableFactory extends ProjectModuleFactoryDelegate {
+ private static final String ID = "org.eclipse.wst.web.internal.deployables.static"; //$NON-NLS-1$
+ protected ArrayList moduleDelegates = new ArrayList();
+
+ /*
+ * @see DeployableProjectFactoryDelegate#getFactoryID()
+ */
+ public static String getFactoryId() {
+ return ID;
+ }
+
+ /**
+ * Use {@link #createModules(IProject)} instead.
+ * @deprecated
+ * @param nature
+ * @return
+ */
+ protected IModule[] createModules(ModuleCoreNature nature) {
+ if(nature != null){
+ return createModules(nature.getProject());
+ }
+ return null;
+ }
+ /**
+ * Returns true if the project represents a deployable project of this type.
+ *
+ * @param project
+ * org.eclipse.core.resources.IProject
+ * @return boolean
+ */
+ protected boolean isValidModule(IProject project) {
+ try {
+ IFacetedProject facetedProject = ProjectFacetsManager.create(project);
+ if (facetedProject == null)
+ return false;
+ IProjectFacet webFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.WST_WEB_MODULE);
+ return facetedProject.hasProjectFacet(webFacet);
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.wst.server.core.model.ModuleFactoryDelegate#getModuleDelegate(org.eclipse.wst.server.core.IModule)
+ */
+ @Override
+ 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;
+
+ }
+
+ @Override
+ protected IModule[] createModules(IProject project) {
+ IVirtualComponent component = ComponentCore.createComponent(project);
+ if(component != null){
+ try {
+ return createModuleDelegates(component);
+ } catch (CoreException e) {
+ WSTWebPlugin.logError(e);
+ }
+ }
+ return null;
+ }
+
+ protected IModule[] createModuleDelegates(IVirtualComponent component) throws CoreException {
+ if(component == null){
+ return null;
+ }
+ StaticWebDeployable moduleDelegate = null;
+ IModule module = null;
+ try {
+ if(isValidModule(component.getProject())) {
+ moduleDelegate = new StaticWebDeployable(component.getProject(),component);
+ module = createModule(component.getName(), component.getName(), IModuleConstants.WST_WEB_MODULE, moduleDelegate.getVersion(), moduleDelegate.getProject());
+ moduleDelegate.initialize(module);
+ }
+ } catch (Exception e) {
+ WSTWebPlugin.logError(e);
+ } finally {
+ if (module != null) {
+ if (getModuleDelegate(module) == null)
+ moduleDelegates.add(moduleDelegate);
+ }
+ }
+ if (module == null)
+ return null;
+ return new IModule[] {module};
+ }
+
+ /**
+ * Returns the list of resources that the module should listen to
+ * for state changes. The paths should be project relative paths.
+ * Subclasses can override this method to provide the paths.
+ *
+ * @return a possibly empty array of paths
+ */
+ @Override
+ protected IPath[] getListenerPaths() {
+ return new IPath[] {
+ new Path(".project"), // nature //$NON-NLS-1$
+ new Path(StructureEdit.MODULE_META_FILE_NAME), // component
+ new Path(".settings/org.eclipse.wst.common.project.facet.core.xml") // facets //$NON-NLS-1$
+ };
+ }
+}
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
new file mode 100644
index 0000000..b4ed6ad
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapter.java
@@ -0,0 +1,36 @@
+/***************************************************************************************************
+ * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
+ * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: IBM Corporation - initial API and implementation
+ **************************************************************************************************/
+
+package org.eclipse.wst.web.internal.deployables;
+
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.wst.server.core.IModuleArtifact;
+import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
+
+public class StaticWebDeployableObjectAdapter extends ModuleArtifactAdapterDelegate implements IAdapterFactory
+
+{
+
+ public StaticWebDeployableObjectAdapter() {
+ super();
+ }
+
+ public Object getAdapter(Object adaptableObject, Class adapterType) {
+ return null;
+ }
+
+ public Class[] getAdapterList() {
+ return new Class[]{IStaticWebModuleArtifact.class};
+ }
+
+ @Override
+ 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
new file mode 100644
index 0000000..f179163
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapterUtil.java
@@ -0,0 +1,122 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.wst.web.internal.deployables;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IModuleArtifact;
+import org.eclipse.wst.server.core.ServerUtil;
+import org.eclipse.wst.server.core.util.WebResource;
+
+public class StaticWebDeployableObjectAdapterUtil {
+
+ private final static String[] extensionsToExclude = new String[]{"sql", "xmi"}; //$NON-NLS-1$ //$NON-NLS-2$
+ static String INFO_DIRECTORY = "WEB-INF"; //$NON-NLS-1$
+
+ public static IModuleArtifact getModuleObject(Object obj) {
+ IResource resource = null;
+ if (obj instanceof IResource)
+ resource = (IResource) obj;
+ else if (obj instanceof IAdaptable)
+ resource = (IResource) ((IAdaptable) obj).getAdapter(IResource.class);
+
+ if (resource == null)
+ return null;
+
+ if (resource instanceof IProject) {
+ IProject project = (IProject) resource;
+ if (hasInterestedComponents(project))
+ return new WebResource(getModule(project), new Path("")); //$NON-NLS-1$
+ return null;
+ }
+
+ IProject project = ProjectUtilities.getProject(resource);
+ if (project != null && !hasInterestedComponents(project))
+ return null;
+
+ IVirtualComponent comp = ComponentCore.createComponent(project);
+ // determine path
+ IPath rootPath = comp.getRootFolder().getProjectRelativePath();
+ IPath resourcePath = resource.getProjectRelativePath();
+
+ // Check to make sure the resource is under the webApplication directory
+ if (resourcePath.matchingFirstSegments(rootPath) != rootPath.segmentCount())
+ return null;
+
+ // Do not allow resource under the web-inf directory
+ resourcePath = resourcePath.removeFirstSegments(rootPath.segmentCount());
+ if (resourcePath.segmentCount() > 1 && resourcePath.segment(0).equals(INFO_DIRECTORY))
+ return null;
+
+ if (shouldExclude(resource))
+ return null;
+
+ // return Web resource type
+ return new WebResource(getModule(project), resourcePath);
+
+ }
+
+ /**
+ * Method shouldExclude.
+ *
+ * @param resource
+ * @return boolean
+ */
+ private static boolean shouldExclude(IResource resource) {
+ String fileExt = resource.getFileExtension();
+
+ // Exclude files of certain extensions
+ for (int i = 0; i < extensionsToExclude.length; i++) {
+ String extension = extensionsToExclude[i];
+ if (extension.equalsIgnoreCase(fileExt))
+ return true;
+ }
+ return false;
+ }
+
+ protected static IModule getModule(IProject project) {
+ if (hasInterestedComponents(project))
+ return ServerUtil.getModule(project);
+ return null;
+ }
+
+ protected static boolean hasInterestedComponents(IProject project) {
+ return isProjectOfType(project, IModuleConstants.WST_WEB_MODULE);
+ }
+
+ protected static boolean isProjectOfType(IProject project, String typeID) {
+ IFacetedProject facetedProject = null;
+ try {
+ facetedProject = ProjectFacetsManager.create(project);
+ } catch (CoreException e) {
+ return false;
+ }
+
+ if (facetedProject != null && ProjectFacetsManager.isProjectFacetDefined(typeID)) {
+ IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(typeID);
+ return projectFacet != null && facetedProject.hasProjectFacet(projectFacet);
+ }
+ return false;
+ }
+}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/facet/MappingDescriptor.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/facet/MappingDescriptor.java
new file mode 100644
index 0000000..8b5f3c5
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/facet/MappingDescriptor.java
@@ -0,0 +1,59 @@
+package org.eclipse.wst.web.internal.facet;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+
+public class MappingDescriptor {
+
+ protected IConfigurationElement element = null;
+
+ public MappingDescriptor(IConfigurationElement configurationElement) {
+ this.element = configurationElement;
+ }
+
+ public IConfigurationElement getElement() {
+ return element;
+ }
+
+ public String getID() {
+ return element.getAttribute(RuntimePresetMappingRegistry.ATTRIBUTE_ID);
+ }
+
+ public String getFacetRuntimeTypeID() {
+ return element.getAttribute(RuntimePresetMappingRegistry.ATTRIBUTE_FACET_RUNTIME_TYPE_ID);
+ }
+
+ public String getFacetRuntimeVersion() {
+ return element.getAttribute(RuntimePresetMappingRegistry.ATTRIBUTE_FACET_RUNTIME_VERSION);
+ }
+
+ public String getFacetID() {
+ return element.getAttribute(RuntimePresetMappingRegistry.ATTRIBUTE_FACET_ID);
+ }
+
+ public String getFacetVersion() {
+ return element.getAttribute(RuntimePresetMappingRegistry.ATTRIBUTE_FACET_VERSION);
+ }
+
+ public String getPresetID() {
+ return element.getAttribute(RuntimePresetMappingRegistry.ATTRIBUTE_PRESET_ID);
+ }
+
+ @Override
+ public String toString() {
+ StringBuffer buff = new StringBuffer();
+ buff.append("id:"); //$NON-NLS-1$
+ buff.append(getID());
+ buff.append(" facetRuntimeTypeID:"); //$NON-NLS-1$
+ buff.append(getFacetRuntimeTypeID());
+ buff.append(" facetRuntimeVersion:"); //$NON-NLS-1$
+ buff.append(getFacetRuntimeVersion());
+ buff.append(" facetID:"); //$NON-NLS-1$
+ buff.append(getFacetID());
+ buff.append(" facetVersion:"); //$NON-NLS-1$
+ buff.append(getFacetVersion());
+ buff.append(" presetID:"); //$NON-NLS-1$
+ buff.append(getPresetID());
+ return buff.toString();
+ }
+
+}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/facet/RuntimePresetMappingRegistry.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/facet/RuntimePresetMappingRegistry.java
new file mode 100644
index 0000000..b2bcd0b
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/facet/RuntimePresetMappingRegistry.java
@@ -0,0 +1,261 @@
+package org.eclipse.wst.web.internal.facet;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponentType;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponentVersion;
+import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
+import org.eclipse.wst.web.internal.WSTWebPlugin;
+
+public class RuntimePresetMappingRegistry {
+
+ static final String EXTENSION_POINT = "runtimePresetMappings"; //$NON-NLS-1$
+
+ static final String ELEMENT_MAPPING = "mapping"; //$NON-NLS-1$
+
+ static final String ATTRIBUTE_ID = "id"; //$NON-NLS-1$
+
+ static final String ATTRIBUTE_FACET_RUNTIME_TYPE_ID = "facetRuntimeTypeID"; //$NON-NLS-1$
+
+ static final String ATTRIBUTE_FACET_RUNTIME_VERSION = "facetRuntimeVersion"; //$NON-NLS-1$
+
+ static final String ATTRIBUTE_FACET_ID = "facetID"; //$NON-NLS-1$
+
+ static final String ATTRIBUTE_FACET_VERSION = "facetVersion"; //$NON-NLS-1$
+
+ static final String ATTRIBUTE_PRESET_ID = "presetID"; //$NON-NLS-1$
+
+ public static RuntimePresetMappingRegistry INSTANCE = new RuntimePresetMappingRegistry();
+
+ private List<MappingDescriptor> descriptors = null;
+
+ public String getPresetID(String facetRuntimeTypeID,
+ String facetRuntimeVersion, String facetID, String facetVersion) {
+ if (descriptors == null) {
+ readDescriptors();
+ }
+ for (MappingDescriptor descriptor : descriptors) {
+ if(matches(facetRuntimeTypeID, descriptor.getFacetRuntimeTypeID()) &&
+ matches(facetRuntimeVersion, descriptor.getFacetRuntimeVersion()) &&
+ matches(facetID, descriptor.getFacetID()) &&
+ matches(facetVersion, descriptor.getFacetVersion())){
+ return descriptor.getPresetID();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns true if the value is matched by the pattern The pattern consists
+ * of a common deliminated list of simple patterns Each simple pattern has
+ * an optional starting or ending * so a String.startsWith() or
+ * String.endsWith(). Both may be combined to compute a String.indexOf() !=
+ * -1
+ *
+ * @param value
+ * @param pattern
+ * @return
+ */
+ private static boolean matches(String value, String pattern){
+ StringTokenizer strTok = new StringTokenizer(pattern, ","); //$NON-NLS-1$
+ while(strTok.hasMoreTokens()){
+ String simplePattern = strTok.nextToken().trim();
+ if(simplePattern.startsWith("*")){ //$NON-NLS-1$
+ if(simplePattern.length() < 2){
+ return true; // i.e. *
+ }
+ if(simplePattern.endsWith("*")){ //$NON-NLS-1$
+ if(simplePattern.length() < 3){
+ return true; // i.e. **
+ }
+ if(value.indexOf(simplePattern.substring(1, simplePattern.length()-2)) != -1){
+ return true;
+ }
+ } else {
+ if(value.endsWith(simplePattern.substring(1))){
+ return true;
+ }
+ }
+ } else if(simplePattern.endsWith("*")){ //$NON-NLS-1$
+ if(value.startsWith(simplePattern.substring(0, simplePattern.length()-2))){
+ return true;
+ }
+ } else if(value.equals(simplePattern)){
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static List <String> getStaticTokens(String pattern){
+ List <String> staticTokens = new ArrayList <String> ();
+ StringTokenizer strTok = new StringTokenizer(pattern, ","); //$NON-NLS-1$
+ while(strTok.hasMoreTokens()){
+ String simplePattern = strTok.nextToken().trim();
+ if(!simplePattern.startsWith("*") && !simplePattern.endsWith("*")){ //$NON-NLS-1$ //$NON-NLS-2$
+ staticTokens.add(simplePattern);
+ }
+ }
+ return staticTokens;
+ }
+
+
+ private void readDescriptors() {
+ descriptors = new ArrayList<MappingDescriptor>();
+ IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(WSTWebPlugin.PLUGIN_ID, EXTENSION_POINT);
+ if (point == null)
+ return;
+ IConfigurationElement[] elements = point.getConfigurationElements();
+ for (int i = 0; i < elements.length; i++) {
+ IConfigurationElement element = elements[i];
+ if (ELEMENT_MAPPING.equals(element.getName())) {
+ String id = element.getAttribute(ATTRIBUTE_ID);
+ if (null == id || id.trim().length() == 0) {
+ WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " is missing attribute " + ATTRIBUTE_ID); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ continue;
+ }
+
+ String runtimeID = element.getAttribute(ATTRIBUTE_FACET_RUNTIME_TYPE_ID);
+ if (null == runtimeID || runtimeID.trim().length() == 0) {
+ WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " is missing attribute " + ATTRIBUTE_FACET_RUNTIME_TYPE_ID); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ continue;
+ }
+
+ List <String> staticRuntimeIDs = getStaticTokens(runtimeID);
+ List <IRuntimeComponentType> staticRuntimeTypes = new ArrayList<IRuntimeComponentType>();
+ for(String staticRuntimeID : staticRuntimeIDs){
+ try {
+ IRuntimeComponentType runtimeType = RuntimeManager.getRuntimeComponentType(staticRuntimeID);
+ if(runtimeType != null){
+ staticRuntimeTypes.add(runtimeType);
+ }
+ } catch (IllegalArgumentException e) {
+ WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " defined invalid attribute " + ATTRIBUTE_FACET_RUNTIME_TYPE_ID + ": " + runtimeID +" unable to resolve runtime: "+staticRuntimeID, e); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ }
+ }
+
+ String runtimeVersionStr = element.getAttribute(ATTRIBUTE_FACET_RUNTIME_VERSION);
+ if (null == runtimeVersionStr || runtimeVersionStr.trim().length() == 0) {
+ WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " is missing attribute " + ATTRIBUTE_FACET_RUNTIME_VERSION); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ continue;
+ }
+ if(!staticRuntimeTypes.isEmpty()){
+ List <String> staticRuntimeVersions = getStaticTokens(runtimeVersionStr);
+ for(String staticVersion : staticRuntimeVersions){
+ boolean foundVersion = false;
+ for(int k=0;k<staticRuntimeTypes.size() && !foundVersion;k++){
+ IRuntimeComponentType runtimeType = staticRuntimeTypes.get(k);
+ try {
+ runtimeType.getVersion(staticVersion);
+ foundVersion = true;
+ } catch (IllegalArgumentException e) {
+ //eat it
+ }
+ }
+ if(!foundVersion){
+ StringBuffer validVersions = new StringBuffer(" valid versions include: "); //$NON-NLS-1$
+ for(IRuntimeComponentType runtimeType : staticRuntimeTypes) {
+ validVersions.append("\n"); //$NON-NLS-1$
+ validVersions.append(runtimeType.getId());
+ validVersions.append(": "); //$NON-NLS-1$
+ for (Iterator<IRuntimeComponentVersion> iterator = runtimeType.getVersions().iterator(); iterator.hasNext();) {
+ validVersions.append(iterator.next().getVersionString());
+ if (iterator.hasNext()) {
+ validVersions.append(" "); //$NON-NLS-1$
+ }
+ }
+ }
+ WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " defined invalid attribute " + ATTRIBUTE_FACET_RUNTIME_VERSION + ": " + staticVersion //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ + validVersions);
+ }
+ }
+ }
+
+ String facetID = element.getAttribute(ATTRIBUTE_FACET_ID);
+ if (null == facetID || facetID.trim().length() == 0) {
+ WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " is missing attribute " + ATTRIBUTE_FACET_ID); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ continue;
+ }
+
+ List <String> staticFacetIDs = getStaticTokens(facetID);
+ List <IProjectFacet> staticFacets = new ArrayList <IProjectFacet>();
+ for(String staticFacetID:staticFacetIDs){
+ try {
+ IProjectFacet facet = ProjectFacetsManager.getProjectFacet(staticFacetID);
+ if(null != facet){
+ staticFacets.add(facet);
+ }
+ } catch (IllegalArgumentException e) {
+ WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " defined invalid attribute " + ATTRIBUTE_FACET_ID + ": " + staticFacetID, e); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ }
+ }
+
+ String facetVersionStr = element.getAttribute(ATTRIBUTE_FACET_VERSION);
+ if (null == facetVersionStr || facetVersionStr.trim().length() == 0) {
+ WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " is missing attribute " + ATTRIBUTE_FACET_VERSION); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ continue;
+ }
+ List <String>staticFacetVersionStrs = getStaticTokens(facetVersionStr);
+ if(!staticFacets.isEmpty() && !staticFacetVersionStrs.isEmpty()){
+ for(String staticFacetVersion:staticFacetVersionStrs){
+ boolean foundFacetVersion = false;
+ for(int k=0;k< staticFacets.size() && !foundFacetVersion; k++) {
+ IProjectFacet staticFacet = staticFacets.get(k);
+ try {
+ IProjectFacetVersion staticVersion = staticFacet.getVersion(staticFacetVersion);
+ if(staticVersion != null){
+ foundFacetVersion = true;
+ }
+ } catch (IllegalArgumentException e) {
+ //eat it
+ }
+ }
+ if(!foundFacetVersion){
+ StringBuffer validVersions = new StringBuffer(" valid versions include: "); //$NON-NLS-1$
+ for(IProjectFacet staticFacet:staticFacets){
+ validVersions.append("\n"); //$NON-NLS-1$
+ validVersions.append(staticFacet.getId());
+ validVersions.append(": "); //$NON-NLS-1$
+ for (Iterator<IProjectFacetVersion> iterator = staticFacet.getVersions().iterator(); iterator.hasNext();) {
+ validVersions.append(iterator.next().getVersionString());
+ if (iterator.hasNext()) {
+ validVersions.append(" "); //$NON-NLS-1$
+ }
+ }
+ }
+ WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " defined invalid attribute " + ATTRIBUTE_FACET_VERSION + ": " + staticFacetVersion //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ + validVersions);
+ continue;
+ }
+ }
+ }
+ String presetID = element.getAttribute(ATTRIBUTE_PRESET_ID);
+ if (null == presetID || presetID.trim().length() == 0) {
+ WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " is missing attribute " + ATTRIBUTE_PRESET_ID); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ continue;
+ }
+ try {
+ ProjectFacetsManager.getPreset(presetID);
+ } catch (IllegalArgumentException e) {
+ WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " defined invalid attribute " + ATTRIBUTE_PRESET_ID + ": " + presetID, e); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ continue;
+ }
+ MappingDescriptor descriptor = new MappingDescriptor(element);
+ descriptors.add(descriptor);
+ } else {
+ WSTWebPlugin.logError("Elements must be named: " + ELEMENT_MAPPING + " within the extension: " + EXTENSION_POINT); //$NON-NLS-1$ //$NON-NLS-2$
+ WSTWebPlugin.logError("Element: " + element.getName() + " is invalid within the extension: " + EXTENSION_POINT); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/IWebProjectPropertiesUpdateDataModelProperties.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/IWebProjectPropertiesUpdateDataModelProperties.java
new file mode 100644
index 0000000..5d7622b
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/IWebProjectPropertiesUpdateDataModelProperties.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.web.internal.operation;
+
+import org.eclipse.wst.common.componentcore.datamodel.properties.IServerContextRootDataModelProperties;
+
+/**
+ * @deprecated Replaced by {@link IServerContextRootDataModelProperties}
+ *
+ */
+public interface IWebProjectPropertiesUpdateDataModelProperties {
+
+ public static final String PROJECT = "IWebProjectPropertiesUpdateDataModelProperties.PROJECT"; //$NON-NLS-1$
+ public static final String CONTEXT_ROOT = "IWebProjectPropertiesUpdateDataModelProperties.CONTEXT_ROOT"; //$NON-NLS-1$
+
+}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateDataModelProvider.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateDataModelProvider.java
new file mode 100644
index 0000000..b602f5a
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateDataModelProvider.java
@@ -0,0 +1,45 @@
+package org.eclipse.wst.web.internal.operation;
+
+/*******************************************************************************
+ * Copyright (c) 2003, 2004, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+import java.util.Set;
+
+import org.eclipse.wst.common.componentcore.internal.operation.ServerContextRootDataModelProvider;
+import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
+
+/**
+ * @deprecated Replaced by {@link ServerContextRootDataModelProvider}
+ *
+ */
+public class WebProjectPropertiesUpdateDataModelProvider
+ extends AbstractDataModelProvider
+ implements IWebProjectPropertiesUpdateDataModelProperties{
+
+ public WebProjectPropertiesUpdateDataModelProvider(){
+ super();
+ }
+
+ @Override
+ public Set getPropertyNames() {
+ Set names = super.getPropertyNames();
+ names.add(PROJECT);
+ names.add(CONTEXT_ROOT);
+ return names;
+ }
+
+ @Override
+ public IDataModelOperation getDefaultOperation() {
+ return new WebProjectPropertiesUpdateOperation(model);
+ }
+
+}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateOperation.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateOperation.java
new file mode 100644
index 0000000..71ab6e9
--- /dev/null
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateOperation.java
@@ -0,0 +1,52 @@
+package org.eclipse.wst.web.internal.operation;
+
+/*******************************************************************************
+ * Copyright (c) 2003, 2004, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.wst.common.componentcore.internal.operation.ServerContextRootUpdateOperation;
+import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
+import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+
+
+
+
+/**
+ * @deprecated
+ * Replaced by {@link ServerContextRootUpdateOperation}
+ * @version 1.0
+ * @author
+ */
+public class WebProjectPropertiesUpdateOperation
+ extends AbstractDataModelOperation
+ implements IWebProjectPropertiesUpdateDataModelProperties{
+
+
+ public WebProjectPropertiesUpdateOperation(IDataModel model) {
+ super(model);
+ }
+
+ @Override
+ public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+ IProject project = (IProject)model.getProperty( IWebProjectPropertiesUpdateDataModelProperties.PROJECT );
+ String contextRoot = model.getStringProperty( IWebProjectPropertiesUpdateDataModelProperties.CONTEXT_ROOT );
+ if (contextRoot != null) {
+ ComponentUtilities.setServerContextRoot(project, contextRoot);
+ }
+ return OK_STATUS;
+ }
+
+}
