You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2008/01/12 03:38:27 UTC

svn commit: r611355 [1/5] - in /geronimo/devtools/eclipse-plugin/trunk/plugins: ./ org.apache.geronimo.runtime.v21/ org.apache.geronimo.runtime.v21/META-INF/ org.apache.geronimo.st.core/ org.apache.geronimo.st.ui/ org.apache.geronimo.st.ui/src/org/apac...

Author: mcconne
Date: Fri Jan 11 18:38:22 2008
New Revision: 611355

URL: http://svn.apache.org/viewvc?rev=611355&view=rev
Log:
plugins changes for 2.1 server support

Added:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/.project
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/LICENSE
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/NOTICE
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/classpathXmlTemplate.vm
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/.options
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/.project
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.properties
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/Activator.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/DeploymentPlanInstallConfig.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/GeronimoRuntime.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/GeronimoServer.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/GeronimoServerBehaviour.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/GeronimoV21VersionHandler.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/internal/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/internal/Trace.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/operations/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/operations/GeronimoV21FacetInstallDelegate.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/.options
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/.project
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/META-INF/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/Activator.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/editors/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/internal/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/internal/EMFEditorContext.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/internal/Messages.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/internal/Messages.properties
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/internal/Trace.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/pages/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/pages/AppGeneralPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/pages/ConnectorOverviewPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/pages/EjbOverviewPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/pages/NamingFormPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/pages/SecurityPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/pages/WebGeneralPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/AppGeneralSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/CommonGeneralSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/ConnectorGeneralSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/DependencySection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/EjbLocalRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/EjbRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/GBeanRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/GBeanSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/ImportSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/OpenEjbJarGeneralSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/ResourceEnvRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/ResourceRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/SecurityRootSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/SecuritySection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/ServiceRefSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/WebContainerSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/sections/WebGeneralSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/wizards/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/wizards/DependencyWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/wizards/EjbLocalRefWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/wizards/EjbRefWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/wizards/GBeanRefWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/wizards/GBeanWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/wizards/ImportWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/wizards/ResourceEnvRefWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/wizards/ResourceRefWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/wizards/SecurityRoleWizard.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/org/apache/geronimo/st/v21/ui/wizards/ServiceRefWizard.java
Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/.project
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/.project?rev=611355&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/.project (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/.project Fri Jan 11 18:38:22 2008
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.apache.geronimo.runtime.v21</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/LICENSE?rev=611355&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/LICENSE (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/LICENSE Fri Jan 11 18:38:22 2008
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) 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. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF?rev=611355&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF Fri Jan 11 18:38:22 2008
@@ -0,0 +1,179 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Geronimo V21 Runtime Plug-in
+Bundle-SymbolicName: org.apache.geronimo.runtime.v21;singleton:=true
+Bundle-Version: 2.1.0
+Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport
+Bundle-ClassPath: lib/geronimo-common-2.1-SNAPSHOT.jar,
+ lib/geronimo-connector-builder-2.1-SNAPSHOT.jar,
+ lib/geronimo-deploy-jsr88-2.1-SNAPSHOT.jar,
+ lib/geronimo-deployment-2.1-SNAPSHOT.jar,
+ lib/geronimo-j2ee-builder-2.1-SNAPSHOT.jar,
+ lib/geronimo-j2ee-schema-2.1-SNAPSHOT.jar,
+ lib/geronimo-kernel-2.1-SNAPSHOT.jar,
+ lib/geronimo-naming-builder-2.1-SNAPSHOT.jar,
+ lib/geronimo-plugin-2.1-SNAPSHOT.jar,
+ lib/geronimo-security-builder-2.1-SNAPSHOT.jar,
+ lib/geronimo-service-builder-2.1-SNAPSHOT.jar,
+ lib/geronimo-system-2.1-SNAPSHOT.jar,
+ lib/geronimo-util-2.1-SNAPSHOT.jar,
+ lib/geronimo-web-2.5-builder-2.1-SNAPSHOT.jar,
+ lib/geronimo-schema-jee_5-1.1.jar,
+ lib/geronimo-deploy-config-2.1-SNAPSHOT.jar,
+ lib/geronimo-openejb-builder-2.1-SNAPSHOT.jar,
+ lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar,
+ lib/plexus-archiver-1.0-alpha-7.jar
+Export-Package: 
+ javax.enterprise.deploy.model,
+ javax.enterprise.deploy.model.exceptions,
+ javax.enterprise.deploy.shared,
+ javax.enterprise.deploy.shared.factories,
+ javax.enterprise.deploy.spi,
+ javax.enterprise.deploy.spi.exceptions,
+ javax.enterprise.deploy.spi.factories,
+ javax.enterprise.deploy.spi.status,
+ org.apache.geronimo.common,
+ org.apache.geronimo.common.propertyeditor,
+ org.apache.geronimo.connector.deployment,
+ org.apache.geronimo.connector.deployment.dconfigbean,
+ org.apache.geronimo.connector.deployment.jsr88,
+ org.apache.geronimo.deployment,
+ org.apache.geronimo.deployment.javabean.xbeans,
+ org.apache.geronimo.deployment.javabean.xbeans.impl,
+ org.apache.geronimo.deployment.plugin,
+ org.apache.geronimo.deployment.plugin.factories,
+ org.apache.geronimo.deployment.plugin.jmx,
+ org.apache.geronimo.deployment.plugin.local,
+ org.apache.geronimo.deployment.plugin.remote,
+ org.apache.geronimo.deployment.service,
+ org.apache.geronimo.deployment.service.jsr88,
+ org.apache.geronimo.deployment.util,
+ org.apache.geronimo.deployment.xbeans,
+ org.apache.geronimo.deployment.xbeans.impl,
+ org.apache.geronimo.deployment.xml,
+ org.apache.geronimo.deployment.xmlbeans,
+ org.apache.geronimo.gbean,
+ org.apache.geronimo.gbean.runtime,
+ org.apache.geronimo.j2ee,
+ org.apache.geronimo.j2ee.deployment,
+ org.apache.geronimo.j2ee.deployment.annotation,
+ org.apache.geronimo.j2ee.jsr88,
+ org.apache.geronimo.kernel,
+ org.apache.geronimo.kernel.basic,
+ org.apache.geronimo.kernel.classloader,
+ org.apache.geronimo.kernel.config,
+ org.apache.geronimo.kernel.config.xstream,
+ org.apache.geronimo.kernel.lifecycle,
+ org.apache.geronimo.kernel.log,
+ org.apache.geronimo.kernel.management,
+ org.apache.geronimo.kernel.proxy,
+ org.apache.geronimo.kernel.repository,
+ org.apache.geronimo.kernel.rmi,
+ org.apache.geronimo.kernel.util,
+ org.apache.geronimo.naming.deployment,
+ org.apache.geronimo.naming.deployment.jsr88,
+ org.apache.geronimo.openejb.deployment,
+ org.apache.geronimo.openejb.xbeans.ejbjar,
+ org.apache.geronimo.openejb.xbeans.ejbjar.impl,
+ org.apache.geronimo.schema,
+ org.apache.geronimo.security.deployment,
+ org.apache.geronimo.system.configuration,
+ org.apache.geronimo.system.configuration.cli,
+ org.apache.geronimo.system.configuration.condition,
+ org.apache.geronimo.system.jmx,
+ org.apache.geronimo.system.logging,
+ org.apache.geronimo.system.logging.log4j,
+ org.apache.geronimo.system.main,
+ org.apache.geronimo.system.plugin.model,
+ org.apache.geronimo.system.properties,
+ org.apache.geronimo.system.repository,
+ org.apache.geronimo.system.resolver,
+ org.apache.geronimo.system.serverinfo,
+ org.apache.geronimo.system.sharedlib,
+ org.apache.geronimo.system.threads,
+ org.apache.geronimo.system.util,
+ org.apache.geronimo.util,
+ org.apache.geronimo.util.asn1,
+ org.apache.geronimo.util.asn1.cryptopro,
+ org.apache.geronimo.util.asn1.misc,
+ org.apache.geronimo.util.asn1.oiw,
+ org.apache.geronimo.util.asn1.pkcs,
+ org.apache.geronimo.util.asn1.sec,
+ org.apache.geronimo.util.asn1.util,
+ org.apache.geronimo.util.asn1.x509,
+ org.apache.geronimo.util.asn1.x9,
+ org.apache.geronimo.util.crypto,
+ org.apache.geronimo.util.crypto.digests,
+ org.apache.geronimo.util.crypto.modes,
+ org.apache.geronimo.util.crypto.params,
+ org.apache.geronimo.util.encoders,
+ org.apache.geronimo.util.jce,
+ org.apache.geronimo.util.jce.interfaces,
+ org.apache.geronimo.util.jce.provider,
+ org.apache.geronimo.web.deployment,
+ org.apache.geronimo.xbeans.geronimo,
+ org.apache.geronimo.xbeans.geronimo.credentialstore,
+ org.apache.geronimo.xbeans.geronimo.credentialstore.impl,
+ org.apache.geronimo.xbeans.geronimo.impl,
+ org.apache.geronimo.xbeans.geronimo.j2ee,
+ org.apache.geronimo.xbeans.geronimo.j2ee.impl,
+ org.apache.geronimo.xbeans.geronimo.loginconfig,
+ org.apache.geronimo.xbeans.geronimo.loginconfig.impl,
+ org.apache.geronimo.xbeans.geronimo.naming,
+ org.apache.geronimo.xbeans.geronimo.naming.impl,
+ org.apache.geronimo.xbeans.geronimo.security,
+ org.apache.geronimo.xbeans.geronimo.security.impl,
+ org.apache.geronimo.xbeans.geronimo.security.subjectinfo,
+ org.apache.geronimo.xbeans.geronimo.security.subjectinfo.impl,
+ org.apache.geronimo.xbeans.geronimo.web,
+ org.apache.geronimo.xbeans.geronimo.web.impl,
+ schemaorg_apache_xmlbeans.element.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E2,
+ schemaorg_apache_xmlbeans.element.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fjavaee,
+ schemaorg_apache_xmlbeans.element.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fpersistence,
+ schemaorg_apache_xmlbeans.element.URI_SHA_1_4EE4D506BDA8CFCEAFAFBABA17529CAACCEC8090,
+ schemaorg_apache_xmlbeans.element.URI_SHA_1_8DCD24914FA7339D843DAA772A1D3DFB2612C786,
+ schemaorg_apache_xmlbeans.element.URI_SHA_1_97C4A572840A175E4D78F77FA6E49A5BD52F7632,
+ schemaorg_apache_xmlbeans.element.URI_SHA_1_70451B7785DCF15F72581E297E60DBA28AAF376A,
+ schemaorg_apache_xmlbeans.element.URI_SHA_1_B56AE14CFEC276EEEED37F97D9C564ADCA69C9F8,
+ schemaorg_apache_xmlbeans.element.URI_SHA_1_DD11D3463E5BAAF740BE0AEBF1D38B014DD1AA20,
+ schemaorg_apache_xmlbeans.identityconstraint.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fjavaee,
+ schemaorg_apache_xmlbeans.identityconstraint.URI_SHA_1_B56AE14CFEC276EEEED37F97D9C564ADCA69C9F8,
+ schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.deployment.javabean.xbeans,
+ schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.deployment.xbeans,
+ schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.openejb.xbeans.ejbjar,
+ schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo,
+ schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.j2ee,
+ schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.naming,
+ schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.geronimo.web,
+ schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.javaee, 
+ schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.persistence, 
+ schemaorg_apache_xmlbeans.javaname.org.apache.geronimo.xbeans.persistence.PersistenceDocument.Persistence.PersistenceUnit.Properties,
+ schemaorg_apache_xmlbeans.modelgroup.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E2,
+ schemaorg_apache_xmlbeans.modelgroup.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fjavaee,
+ schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E2,
+ schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fjavaee,
+ schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fpersistence,
+ schemaorg_apache_xmlbeans.namespace.URI_SHA_1_4EE4D506BDA8CFCEAFAFBABA17529CAACCEC8090,
+ schemaorg_apache_xmlbeans.namespace.URI_SHA_1_8DCD24914FA7339D843DAA772A1D3DFB2612C786,
+ schemaorg_apache_xmlbeans.namespace.URI_SHA_1_97C4A572840A175E4D78F77FA6E49A5BD52F7632,
+ schemaorg_apache_xmlbeans.namespace.URI_SHA_1_70451B7785DCF15F72581E297E60DBA28AAF376A,
+ schemaorg_apache_xmlbeans.namespace.URI_SHA_1_B56AE14CFEC276EEEED37F97D9C564ADCA69C9F8,
+ schemaorg_apache_xmlbeans.namespace.URI_SHA_1_DD11D3463E5BAAF740BE0AEBF1D38B014DD1AA20,
+ schemaorg_apache_xmlbeans.src,
+ schemaorg_apache_xmlbeans.system.s8AF8E0CE57F2BB021E91A9ABBD290FAF,
+ schemaorg_apache_xmlbeans.system.s14F95BA84765AD427FCCE00E72BA0596,
+ schemaorg_apache_xmlbeans.system.s89707DCAF3CBDF7238EB45FA6C3735CD,
+ schemaorg_apache_xmlbeans.system.s07396805C0C071F46DCDFA4074210AF5,
+ schemaorg_apache_xmlbeans.system.sD8D2E0C4E01E2FBE03F334B17DEB7DCF,
+ schemaorg_apache_xmlbeans.system.sDF9A228CF97621FEF7F6C23DADCB01C3,
+ schemaorg_apache_xmlbeans.system.sFC1B21DD8C2E5CDC383C4EF0CC55DD0C,
+ schemaorg_apache_xmlbeans.type.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E2,
+ schemaorg_apache_xmlbeans.type.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fjavaee,
+ schemaorg_apache_xmlbeans.type.http_3A_2F_2Fjava_2Esun_2Ecom_2Fxml_2Fns_2Fpersistence,
+ schemaorg_apache_xmlbeans.type.URI_SHA_1_4EE4D506BDA8CFCEAFAFBABA17529CAACCEC8090,
+ schemaorg_apache_xmlbeans.type.URI_SHA_1_8DCD24914FA7339D843DAA772A1D3DFB2612C786,
+ schemaorg_apache_xmlbeans.type.URI_SHA_1_97C4A572840A175E4D78F77FA6E49A5BD52F7632,
+ schemaorg_apache_xmlbeans.type.URI_SHA_1_70451B7785DCF15F72581E297E60DBA28AAF376A,
+ schemaorg_apache_xmlbeans.type.URI_SHA_1_B56AE14CFEC276EEEED37F97D9C564ADCA69C9F8,
+ schemaorg_apache_xmlbeans.type.URI_SHA_1_DD11D3463E5BAAF740BE0AEBF1D38B014DD1AA20
+Bundle-Vendor: Apache.org

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/NOTICE?rev=611355&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/NOTICE (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/NOTICE Fri Jan 11 18:38:22 2008
@@ -0,0 +1,8 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of the Eclipse Geronimo Server Adapter were orginally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant and Corporate Contribution License Agreement",
+informally known as the "Eclipse Geronimo Server Adapter CLA".
\ No newline at end of file

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/classpathXmlTemplate.vm
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/classpathXmlTemplate.vm?rev=611355&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/classpathXmlTemplate.vm (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/classpathXmlTemplate.vm Fri Jan 11 18:38:22 2008
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!-- $Rev$ $Date$ -->
+
+<classpath>
+#set($libs = $libDir.listFiles() )
+#foreach( $lib in $libs )
+	<classpathentry exported="true" kind="lib" path="lib/$lib.getName()"/>
+#end
+</classpath>
\ No newline at end of file

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml?rev=611355&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml Fri Jan 11 18:38:22 2008
@@ -0,0 +1,320 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- $Rev: 610511 $ $Date: 2008-01-09 13:50:47 -0500 (Wed, 09 Jan 2008) $ -->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apache.geronimo.runtime.v21</artifactId>
+    <packaging>jar</packaging>
+    <name>${artifactId}</name>
+    <parent>
+        <groupId>org.apache.geronimo.devtools</groupId>
+        <artifactId>eclipse-plugins-parent</artifactId>
+        <version>2.1.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <properties>
+        <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
+    </properties>
+    <build>
+        <resources>
+            <resource>
+                <directory>.</directory>
+                <includes>
+                    <include>plugin.xml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>lib</directory>
+                <targetPath>lib</targetPath>
+                <includes>
+                    <include>*.jar</include>
+                </includes>
+            </resource>
+            <resource>
+                <targetPath>META-INF</targetPath>
+                <directory>.</directory>
+                <includes>
+                    <include>LICENSE</include>
+                    <include>NOTICE</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-kernel</artifactId>
+                                    <version>${geronimoVersion}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-util</artifactId>
+                                    <version>${geronimoVersion}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-deploy-jsr88</artifactId>
+                                    <version>${geronimoVersion}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-common</artifactId>
+                                    <version>${geronimoVersion}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-j2ee-schema</artifactId>
+                                    <version>${geronimoVersion}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-service-builder</artifactId>
+                                    <version>${geronimoVersion}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-connector-builder</artifactId>
+                                    <version>${geronimoVersion}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-web-2.5-builder</artifactId>
+                                    <version>${geronimoVersion}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.schema</groupId>
+                                    <artifactId>geronimo-schema-jee_5</artifactId>
+                                    <version>1.1</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-naming-builder</artifactId>
+                                    <version>${geronimoVersion}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-j2ee-builder</artifactId>
+                                    <version>${geronimoVersion}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-openejb-builder</artifactId>
+                                    <version>${geronimoVersion}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-security-builder</artifactId>
+                                    <version>${geronimoVersion}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-system</artifactId>
+                                    <version>${geronimoVersion}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-plugin</artifactId>
+                                    <version>${geronimoVersion}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-deployment</artifactId>
+                                    <version>${geronimoVersion}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-deploy-config</artifactId>
+                                    <version>${geronimoVersion}</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.specs</groupId>
+                                    <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+                                    <version>1.0</version>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.codehaus.plexus</groupId>
+                                    <artifactId>plexus-archiver</artifactId>
+                                    <version>1.0-alpha-7</version>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.geronimo.devtools</groupId>
+                <artifactId>maven-eclipsepde-plugin</artifactId>
+                <configuration>
+                    <libDir>lib</libDir>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>generate-classpath</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>classpath</goal>
+                        </goals>
+                        <configuration>
+                            <templateFile>classpathXmlTemplate.vm</templateFile>
+                            <destFile>.classpath</destFile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>${pom.basedir}</directory>
+                            <includes>
+                                <include>.classpath</include>
+                                <include>lib</include>
+                                <include>bin</include>
+                            </includes>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>eclipse</artifactId>
+            <version>${version}</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-util</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-schema</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector-builder</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-web-2.5-builder</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.schema</groupId>
+            <artifactId>geronimo-schema-jee_5</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-openejb-builder</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security-builder</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-plugin</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deployment</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-config</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>org.apache.geronimo.runtime.common</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-archiver</artifactId>
+            <version>1.0-alpha-7</version>
+        </dependency>
+    </dependencies>
+</project>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml?rev=611355&r1=611354&r2=611355&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml Fri Jan 11 18:38:22 2008
@@ -45,13 +45,19 @@
          	id="org.eclipse.jst.server.generic.web"/>
  	</extension>
 
+
+    <!-- ======================================================================================= -->
+    <!--                                                                                         -->
+    <!-- Define the runtime component version(s) and the facets supported by each Geronimo       -->
+    <!-- runtime component                                                                       -->
+    <!--                                                                                         -->
+    <!-- ======================================================================================= -->
 	<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
         <runtime-component-type id="org.apache.geronimo.runtime"/>
-        
         <runtime-component-version type="org.apache.geronimo.runtime" version="1.0"/>
         <runtime-component-version type="org.apache.geronimo.runtime" version="1.1"/>
         <runtime-component-version type="org.apache.geronimo.runtime" version="2.0"/>
-        
+        <runtime-component-version type="org.apache.geronimo.runtime" version="2.1"/>
         <adapter>
             <runtime-component id="org.apache.geronimo.runtime"/>
             <factory
@@ -59,7 +65,6 @@
             <type
                 class="org.eclipse.jst.common.project.facet.core.IClasspathProvider"/>
         </adapter>
-        
         <supported>
             <runtime-component id="org.apache.geronimo.runtime" version="1.0"/>
             <facet id="org.apache.geronimo.facet" version="1.0"/>
@@ -69,7 +74,6 @@
             <facet id="jst.connector" version="1.0,1.5"/>
             <facet id="jst.appclient" version="1.2,1.3,1.4"/>
         </supported>
-            
         <supported>
             <runtime-component id="org.apache.geronimo.runtime" version="1.1"/>
             <facet id="org.apache.geronimo.facet" version="1.1"/>
@@ -80,7 +84,6 @@
             <facet id="jst.appclient" version="1.2,1.3,1.4"/>
             <facet id="jst.utility" version="1.0"/>
         </supported>
-        
         <supported>
             <runtime-component id="org.apache.geronimo.runtime" version="2.0"/>
             <facet id="org.apache.geronimo.facet" version="1.1"/>
@@ -91,21 +94,49 @@
             <facet id="jst.appclient" version="1.2,1.3,1.4,5.0"/>
             <facet id="jst.utility" version="1.0"/>
         </supported>
-        
+        <supported>
+            <runtime-component id="org.apache.geronimo.runtime" version="2.1"/>
+            <facet id="org.apache.geronimo.facet" version="1.1"/>
+            <facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
+            <facet id="jst.ejb" version="1.1,2.0,2.1,3.0"/>
+            <facet id="jst.ear" version="1.2,1.3,1.4,5.0"/>
+            <facet id="jst.connector" version="1.0,1.5"/>
+            <facet id="jst.appclient" version="1.2,1.3,1.4,5.0"/>
+            <facet id="jst.utility" version="1.0"/>
+        </supported>
     </extension>
     
+    
+    <!-- ======================================================================================= -->
+    <!--                                                                                         -->
+    <!-- The Geronimo implementation of the WTP runtimeClasspathProvider will be used to         -->
+    <!-- provide the libraries required for the development of a Web project targeted for the    -->
+    <!-- Geronimo runtime                                                                        -->
+    <!--                                                                                         -->
+    <!-- ======================================================================================= -->
 	<extension point="org.eclipse.jst.server.core.runtimeClasspathProviders">
 		<runtimeClasspathProvider id="org.apache.geronimo.runtimeClasspathProvider"
 			runtimeTypeIds="org.apache.geronimo.runtime.*"
 			class="org.apache.geronimo.st.core.GeronimoServerRuntimeTargetHandler"/>
     </extension>
     
+    
+    <!-- ======================================================================================= -->
+    <!--                                                                                         -->
+    <!-- Declare the "Geronimo Deployment" <project-facet> to be displayed in the                -->
+    <!-- "Project Facets" wizard when deploying a project to the Geronimo Target Runtime. This   -->
+    <!-- facet will be further refined in the various version declarations (see the              -->
+    <!-- <project-facet-verion> declarations that refer to this specific facet with the          -->
+    <!-- facet="org.apache.geronimo.facet" element).                                             -->
+    <!--                                                                                         -->
+    <!-- ======================================================================================= -->
     <extension point="org.eclipse.wst.common.project.facet.core.facets">
         <project-facet id="org.apache.geronimo.facet">
             <label>%geronimo-facet-label</label>
             <description>%geronimo-facet-description</description>
         </project-facet>
     </extension>
+
 
     <extension id="GeronimoOpExtensions" name="GeronimoOpExtensions" point="org.eclipse.wst.common.frameworks.OperationExtension">
         <operationExtension

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml?rev=611355&r1=611354&r2=611355&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml Fri Jan 11 18:38:22 2008
@@ -23,44 +23,69 @@
 
  	<extension-point id="loader" name="Source Path Computer Mapping" schema="schema/loader.exsd"/>
  	
- 	<extension point="org.eclipse.wst.common.project.facet.ui.images">
-        <image facet="org.apache.geronimo.facet"
-            path="icons/obj16/littleG.gif"/>
+ 	
+    <!-- ======================================================================================= -->
+    <!--                                                                                         -->
+    <!-- Define the icon for the Geronimo <runtime-component-type> and the "Geronimo Deployment" -->
+    <!-- <project-facet>, which are declared in org.apache.geronimo.st.core\plugin.xml           -->
+    <!--                                                                                         -->
+    <!-- ======================================================================================= -->
+    <extension point="org.eclipse.wst.common.project.facet.ui.images">
         <image runtime-component-type="org.apache.geronimo.runtime"
             path="icons/obj16/littleG.gif"/>
+        <image facet="org.apache.geronimo.facet"
+            path="icons/obj16/littleG.gif"/>
     </extension>
     
+
+    <!-- ======================================================================================= -->
+    <!--                                                                                         -->
+    <!-- Define the icon for the Geronimo runtime and server types                               -->
+    <!-- (defined in plugins\org.apache.geronimo.st.v*.core\plugin.xml)                          --> 
+    <!--                                                                                         -->
+    <!-- ======================================================================================= -->
     <extension point="org.eclipse.wst.server.ui.serverImages">
+
     	<image id="org.apache.geronimo.runtime.image" 
     		icon="icons/obj16/littleG.gif"
             typeIds="org.apache.geronimo.runtime.10,
             		 org.apache.geronimo.runtime.11,
-            		 org.apache.geronimo.runtime.12,
-            		 org.apache.geronimo.runtime.20"/>
-     
+            		 org.apache.geronimo.runtime.20,
+            		 org.apache.geronimo.runtime.21"/>
+
         <image id="org.apache.geronimo.server.image" 
         	icon="icons/obj16/littleG.gif"
             typeIds="org.apache.geronimo.server.10,
             		 org.apache.geronimo.server.11,
-            		 org.apache.geronimo.server.12,
-            		 org.apache.geronimo.server.20"/>
+            		 org.apache.geronimo.server.20,
+            		 org.apache.geronimo.server.21"/>
     </extension>
 
+
+    <!-- ======================================================================================= -->
+    <!--                                                                                         -->
+    <!-- Extend WTP wizardFragments to include the Geronimo runtime and server types             -->
+    <!-- (defined in plugins\org.apache.geronimo.st.v*.core\plugin.xml) when defining either a   --> 
+    <!-- new Geronimo runtime (e.g., via Window->Preferences->Server->Installed Runtimes->Add)   --> 
+    <!-- or a new Geronimo server (e.g., via File->New->Other->Server)                           -->
+    <!--                                                                                         -->
+    <!-- ======================================================================================= -->
     <extension point="org.eclipse.wst.server.ui.wizardFragments">
         <fragment id="org.apache.geronimo.runtime.wizardFragment"
             typeIds="org.apache.geronimo.runtime.10,
             		 org.apache.geronimo.runtime.11,
-            		 org.apache.geronimo.runtime.12,
-            		 org.apache.geronimo.runtime.20"
+            		 org.apache.geronimo.runtime.20,
+                     org.apache.geronimo.runtime.21"
             class="org.apache.geronimo.st.ui.internal.GeronimoRuntimeWizardFragment"/>
         <fragment id="org.apache.geronimo.server.wizardFragment"
             typeIds="org.apache.geronimo.server.10,
             		 org.apache.geronimo.server.11,
-            		 org.apache.geronimo.server.12,
-            		 org.apache.geronimo.server.20"
+            		 org.apache.geronimo.server.20,
+                     org.apache.geronimo.server.21"
             class="org.apache.geronimo.st.ui.internal.GeronimoServerWizardFragment"/>
     </extension>
 
+
 	<extension point="org.eclipse.ui.popupMenus">
 		<objectContribution
 	      		adaptable="true"
@@ -122,7 +147,9 @@
     <extension point="org.eclipse.wst.server.ui.editorPageSections">
         <section id="org.apache.server.geronimo.testenv" order="20"
             insertionId="org.eclipse.wst.server.editor.overview.left"
-            typeIds="org.apache.geronimo.server.11, org.apache.geronimo.server.12, org.apache.geronimo.server.20"
+            typeIds="org.apache.geronimo.server.11, 
+                     org.apache.geronimo.server.20,
+                     org.apache.geronimo.server.21"
             class="org.apache.geronimo.st.ui.sections.ServerEditorTestEnvSection">
         </section>
     </extension>