geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r953271 [3/4] - in /geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins: org.apache.geronimo.j2ee.v11.jaxbmodel/ org.apache.geronimo.jee.v21.jaxbmodel/ org.apache.geronimo.st.core/ org.apache.geronimo.st.ui/ org.apache.geronimo.st.ui/ME...
Date Thu, 10 Jun 2010 10:26:46 GMT
Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/icons/obj16/littleG.gif
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/icons/obj16/littleG.gif?rev=953271&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/icons/obj16/littleG.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/plugin.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/plugin.properties?rev=953271&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/plugin.properties (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/plugin.properties Thu Jun 10 10:26:44 2010
@@ -0,0 +1,24 @@
+#
+# 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: 733867 $ $Date: 2009-01-13 02:56:29 +0800 (Tue, 13 Jan 2009) $
+#
+serverEditorPluginPage=Plugin
+
+PopupMenus.launchconsole=Launch Geronimo Console
+PopupMenus.launchSupport=Launch Geronimo Support
+
+deploymentPlanEditorName=Geronimo Deployment Plan Editor
\ No newline at end of file

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/plugin.xml?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/plugin.xml Thu Jun 10 10:26:44 2010
@@ -36,5 +36,114 @@
   		</wizard-pages>
 	</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.server.v11.wizardFragment"
+            typeIds="org.apache.geronimo.server.11"
+            class="org.apache.geronimo.st.v11.ui.internal.GeronimoServerWizardFragment"/>
+    </extension>
+    
+     <extension point="org.eclipse.ui.popupMenus">
+        <objectContribution
+                adaptable="true"
+                id="org.apache.geronimo.v11.ui.serveractions"
+                objectClass="org.eclipse.wst.server.core.IServer">
+            <enablement>
+                <test forcePluginActivation="true"
+                    property="org.eclipse.wst.server.ui.serverType"
+                    value="org.apache.geronimo.server.11" />
+            </enablement>
+            <action id="org.apache.geronimo.v11.ui.launchSupport"
+                label="%PopupMenus.launchSupport" icon="icons/obj16/littleG.gif"
+                class="org.apache.geronimo.st.v11.ui.actions.LaunchGeronimoSupportAction"
+                enablesFor="1">
+            </action>
+        </objectContribution>
+    </extension>
+
+    <extension point="org.eclipse.ui.popupMenus">
+        <objectContribution
+                adaptable="true"
+                id="org.apache.geronimo.v11.ui.serveractions"
+                objectClass="org.eclipse.wst.server.core.IServer">
+            <enablement>
+                <test forcePluginActivation="true"
+                    property="org.eclipse.wst.server.ui.serverType"
+                    value="org.apache.geronimo.server.11" />
+            </enablement>
+            <action id="org.apache.geronimo.v11.ui.launchconsole"
+                label="%PopupMenus.launchconsole" icon="icons/obj16/littleG.gif"
+                class="org.apache.geronimo.st.v11.ui.actions.LaunchGeronimoConsoleAction"
+                enablesFor="1">
+            </action>
+        </objectContribution>
+    </extension>
+    
+    <extension point="org.eclipse.wst.server.ui.editorPageSections">
+        <section id="org.apache.server.geronimo.security" order="10"
+            insertionId="org.eclipse.wst.server.editor.overview.left"
+            typeIds="org.apache.geronimo.server.11"
+            class="org.apache.geronimo.st.v11.ui.sections.ServerEditorSecuritySection">
+        </section>
+    </extension>
+    
+    <extension point="org.eclipse.wst.server.ui.editorPageSections">
+        <section id="org.apache.server.geronimo.publishAdvanced" order="10"
+            insertionId="org.eclipse.wst.server.editor.overview.right"
+            typeIds="org.apache.geronimo.server.11*"
+            class="org.apache.geronimo.st.v11.ui.sections.ServerEditorPublishAdvancedSection">
+        </section>
+    </extension>
+    
+    <extension point="org.eclipse.wst.server.ui.editorPageSections">
+        <section id="org.apache.server.geronimo.port" order="10"
+            insertionId="org.eclipse.wst.server.editor.overview.right"
+            typeIds="org.apache.geronimo.server.11"
+            class="org.apache.geronimo.st.v11.ui.sections.ServerEditorPortsSection">
+        </section>
+    </extension>
+    
+    <extension point="org.eclipse.wst.server.ui.editorPageSections">
+        <section id="org.apache.server.geronimo.loglevel" order="20"
+            insertionId="org.eclipse.wst.server.editor.overview.right"
+            typeIds="org.apache.geronimo.server.11"
+            class="org.apache.geronimo.st.v11.ui.sections.ServerEditorLogLevelSection">
+        </section>
+    </extension>
+    
+    <extension point="org.eclipse.wst.server.ui.editorPageSections">
+        <section id="org.apache.server.geronimo.security" order="30"
+            insertionId="org.eclipse.wst.server.editor.overview.right"
+            typeIds="org.apache.geronimo.server.11"
+            class="org.apache.geronimo.st.v11.ui.sections.ServerEditorStartupSection">
+        </section>
+    </extension>
+    
+    <extension point="org.eclipse.wst.server.ui.editorPageSections">
+        <section id="org.apache.server.geronimo.vmargs" order="40"
+            insertionId="org.eclipse.wst.server.editor.overview.right"
+            typeIds="org.apache.geronimo.server.11"
+            class="org.apache.geronimo.st.v11.ui.sections.ServerVMArgsSection">
+        </section>
+    </extension>
+    
+    <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"
+            class="org.apache.geronimo.st.v11.ui.sections.ServerEditorTestEnvSection">
+        </section>
+    </extension>
+    
+    
+    
 
 </plugin>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/pom.xml?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/pom.xml Thu Jun 10 10:26:44 2010
@@ -139,21 +139,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.st.v21.core</artifactId>
-            <version>${version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.ui</artifactId>
             <version>${version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.st.v21.ui</artifactId>
-            <version>${version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.runtime.v11</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.java?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/editors/GeronimoFormContentLoader.java Thu Jun 10 10:26:44 2010
@@ -20,7 +20,7 @@ import javax.xml.bind.JAXBElement;
 
 import org.apache.geronimo.st.core.jaxb.JAXBUtils;
 import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.st.v11.ui.editors.AbstractGeronimoDeploymentPlanEditor;
+import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
 import org.apache.geronimo.st.v11.ui.editors.AbstractGeronimoFormContentLoader;
 import org.apache.geronimo.st.v11.core.GeronimoServerInfo;
 import org.apache.geronimo.st.v11.core.GeronimoV11Utils;
@@ -32,9 +32,18 @@ import org.apache.geronimo.st.v11.ui.pag
 import org.apache.geronimo.st.v11.ui.pages.NamingFormPage;
 import org.apache.geronimo.st.v11.ui.pages.SecurityPage;
 import org.apache.geronimo.st.v11.ui.pages.WebGeneralPage;
+import org.apache.geronimo.st.v11.core.operations.ImportDeploymentPlanDataModelProvider;
+import org.apache.geronimo.st.v11.core.operations.ImportDeploymentPlanOperation;
+import org.apache.geronimo.st.v11.ui.pages.AbstractGeronimoFormPage;
+import org.apache.geronimo.st.v11.ui.pages.DeploymentPlanSourcePage;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.forms.editor.FormEditor;
+import org.eclipse.ui.forms.editor.IFormPage;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
+import org.eclipse.wst.sse.ui.StructuredTextEditor;
 
 /**
  * @version $Rev$ $Date$
@@ -124,4 +133,26 @@ public class GeronimoFormContentLoader e
     public void triggerGeronimoServerInfoUpdate() {
         GeronimoServerInfo.getInstance().updateInfo();
     }
+
+    public StructuredTextEditor getDeploymentPlanSourcePage(AbstractGeronimoDeploymentPlanEditor editor) {
+	    return new DeploymentPlanSourcePage(editor);
+    }
+
+	public IDataModelProvider getImportDeploymentPlanDataModelProvider() {
+	    return new ImportDeploymentPlanDataModelProvider();
+    }
+
+	public IDataModelOperation getImportDeploymentPlanOperation(IDataModel model) {
+	    return new ImportDeploymentPlanOperation(model);
+    }
+
+	public boolean isValidPage(IFormPage page) {
+	    return page instanceof AbstractGeronimoFormPage;
+    }
+
+	public void refreshPage(IFormPage page) {
+		   AbstractGeronimoFormPage geronimoPage = (AbstractGeronimoFormPage)page;
+           geronimoPage.refresh();
+	    
+    }
 }

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/AbstractGeronimoFormPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/AbstractGeronimoFormPage.java?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/AbstractGeronimoFormPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/AbstractGeronimoFormPage.java Thu Jun 10 10:26:44 2010
@@ -21,7 +21,7 @@ import javax.xml.bind.JAXBElement;
 import org.apache.geronimo.st.core.DeploymentDescriptorUtils;
 import org.apache.geronimo.st.core.descriptor.AbstractDeploymentDescriptor;
 import org.apache.geronimo.st.ui.Activator;
-import org.apache.geronimo.st.v11.ui.editors.AbstractGeronimoDeploymentPlanEditor;
+import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IToolBarManager;

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/DeploymentPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/DeploymentPage.java?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/DeploymentPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/DeploymentPage.java Thu Jun 10 10:26:44 2010
@@ -17,7 +17,7 @@
 package org.apache.geronimo.st.v11.ui.pages;
 
 import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.st.v11.ui.editors.AbstractGeronimoDeploymentPlanEditor;
+import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
 import org.apache.geronimo.st.v11.ui.pages.AbstractGeronimoFormPage;
 import org.apache.geronimo.st.v11.core.GeronimoServerInfo;
 import org.apache.geronimo.st.v11.core.jaxb.JAXBModelUtils;

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/DeploymentPlanSourcePage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/DeploymentPlanSourcePage.java?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/DeploymentPlanSourcePage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/DeploymentPlanSourcePage.java Thu Jun 10 10:26:44 2010
@@ -16,7 +16,7 @@
  */
 package org.apache.geronimo.st.v11.ui.pages;
 
-import org.apache.geronimo.st.v11.ui.editors.AbstractGeronimoDeploymentPlanEditor;
+import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Display;

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/NamingFormPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/NamingFormPage.java?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/NamingFormPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/pages/NamingFormPage.java Thu Jun 10 10:26:44 2010
@@ -17,7 +17,7 @@
 package org.apache.geronimo.st.v11.ui.pages;
 
 import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.st.v11.ui.editors.AbstractGeronimoDeploymentPlanEditor;
+import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
 import org.apache.geronimo.st.v11.ui.pages.AbstractGeronimoFormPage;
 import org.apache.geronimo.st.v11.core.GeronimoServerInfo;
 import org.apache.geronimo.st.v11.ui.sections.EjbLocalRefSection;

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/GBeanRefSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/GBeanRefSection.java?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/GBeanRefSection.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/src/main/java/org/apache/geronimo/st/v11/ui/sections/GBeanRefSection.java Thu Jun 10 10:26:44 2010
@@ -23,7 +23,7 @@ import javax.xml.bind.JAXBElement;
 
 import org.apache.geronimo.st.ui.CommonMessages;
 import org.apache.geronimo.st.ui.sections.AbstractTreeSection;
-import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils;
+import org.apache.geronimo.st.v11.core.jaxb.JAXBModelUtils;
 import org.apache.geronimo.st.v11.ui.Activator;
 import org.apache.geronimo.st.v11.ui.wizards.GBeanRefWizard;
 import org.apache.geronimo.j2ee.deployment.PatternType;

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/plugin.xml?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/plugin.xml Thu Jun 10 10:26:44 2010
@@ -67,7 +67,7 @@
         <project-facet-version facet="org.apache.geronimo.facet" version="1.2">
             <action type="install" id="geronimo.plan.install.v20">
                 <delegate class="org.apache.geronimo.st.v21.core.operations.GeronimoV21FacetInstallDelegate"/>
-                <config-factory class="org.apache.geronimo.st.v21.core.DeploymentPlanInstallConfig$Factory"/>
+                <config-factory class="org.apache.geronimo.st.core.DeploymentPlanInstallConfig$Factory"/>
             </action>
             <constraint>
                 <or>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF Thu Jun 10 10:26:44 2010
@@ -7,7 +7,7 @@ Bundle-Activator: org.apache.geronimo.st
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.apache.geronimo.jee.v21.jaxbmodel,
- org.apache.geronimo.runtime.v21,
+ org.apache.geronimo.runtime.v22,
  org.apache.geronimo.st.core,
  org.eclipse.jst.j2ee,
  org.eclipse.core.runtime,

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/plugin.xml?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/plugin.xml Thu Jun 10 10:26:44 2010
@@ -93,7 +93,7 @@
         <project-facet-version facet="org.apache.geronimo.facet" version="1.2">
             <action type="install" id="geronimo.plan.install.v21">
                 <delegate class="org.apache.geronimo.st.v21.core.operations.GeronimoV21FacetInstallDelegate"/>
-                <config-factory class="org.apache.geronimo.st.v21.core.DeploymentPlanInstallConfig$Factory"/>
+                <config-factory class="org.apache.geronimo.st.core.DeploymentPlanInstallConfig$Factory"/>
             </action>
             <constraint>
                 <or>
@@ -137,5 +137,53 @@
             <facet id="org.apache.geronimo.facet" version="1.2"/>
         </default-facets>
     </extension>
+    
+    
+    <extension point="org.apache.geronimo.st.core.JAXBUtilsProvider"> 
+       <provider class="org.apache.geronimo.st.v21.core.jaxb.JAXB21Utils" version="2.0,2.1,2.2"/>
+    </extension>
+    
+   <extension point="org.eclipse.debug.core.launchConfigurationTypes">
+        <launchConfigurationType
+            id="org.apache.geronimo.st.core.launchConfigurationType"
+            name="%geronimoLaunchConfigurationType"
+            delegate="org.apache.geronimo.st.v21.core.GeronimoLaunchConfigurationDelegate"
+            modes="run, debug, profile"
+            sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
+            sourcePathComputerId="org.apache.geronimo.st.core.sourcePathComputer"/>
+    </extension>
+    
+    <!-- 
+     |                                                                                           
+     | This extension point provides a way for a server to support the "Run on Server" scenario. 
+     | The id specifies a unique identifier for this extension point, and the class specifies the 
+     | fully qualified name of the Java class that extends LaunchableAdapterDelegate. 
+     |                                                                                           
+     --> 
+    <extension point="org.eclipse.wst.server.core.launchableAdapters">
+        <launchableAdapter
+            class="org.apache.geronimo.st.v21.core.GeronimoLaunchableAdapterDelegate"
+            id="org.eclipse.jst.server.geronimo.v11.web"/>
+    </extension>
+    
+    <extension id="GeronimoOpExtensions" name="GeronimoOpExtensions" point="org.eclipse.wst.common.frameworks.OperationExtension">
+        <operationExtension
+            id="org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentImportOperation"
+            postOperationClass="org.apache.geronimo.st.v21.core.operations.ImportDeploymentPlanOperation">
+        </operationExtension>
+        <operationExtension
+            id="org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EJBComponentImportOperation"
+            postOperationClass="org.apache.geronimo.st.v21.core.operations.ImportDeploymentPlanOperation">
+        </operationExtension>
+        <operationExtension
+            id="org.eclipse.jst.j2ee.internal.archive.operations.EARComponentImportOperation"
+            postOperationClass="org.apache.geronimo.st.v21.core.operations.ImportDeploymentPlanOperation">
+        </operationExtension>
+        <operationExtension
+            id="org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentImportOperation"
+            postOperationClass="org.apache.geronimo.st.v21.core.operations.ImportDeploymentPlanOperation">
+        </operationExtension>
+    </extension>
+
 
 </plugin>

Copied: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/jaxb/JAXB21Utils.java (from r952535, geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/JAXB21Utils.java)
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/jaxb/JAXB21Utils.java?p2=geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/jaxb/JAXB21Utils.java&p1=geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/JAXB21Utils.java&r1=952535&r2=953271&rev=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/JAXB21Utils.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/jaxb/JAXB21Utils.java Thu Jun 10 10:26:44 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.geronimo.st.v21.core.internal;
+package org.apache.geronimo.st.v21.core.jaxb;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -45,12 +45,10 @@ import javax.xml.transform.dom.DOMSource
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.geronimo.st.core.Activator;
+import org.apache.geronimo.st.v21.core.Activator;
 import org.apache.geronimo.st.core.internal.Trace;
 import org.apache.geronimo.st.core.jaxb.IJAXBUtilsProvider;
 import org.apache.geronimo.st.core.jaxb.NamespaceFilter;
-import org.apache.geronimo.st.v21.core.jaxb.MarshallerListener;
-import org.apache.geronimo.st.v21.core.jaxb.NamespacePrefix;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/META-INF/MANIFEST.MF?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/META-INF/MANIFEST.MF Thu Jun 10 10:26:44 2010
@@ -8,6 +8,7 @@ Bundle-Localization: plugin
 Require-Bundle: org.apache.geronimo.runtime.common,
  org.apache.geronimo.jee.v21.jaxbmodel,
  org.apache.geronimo.st.v21.core,
+ org.apache.geronimo.st.core,
  org.apache.geronimo.st.ui,
  org.apache.geronimo.runtime.v22,
  org.eclipse.ui,

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/plugin.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/plugin.properties?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/plugin.properties (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/plugin.properties Thu Jun 10 10:26:44 2010
@@ -17,3 +17,8 @@
 # $Rev$ $Date$
 #
 serverEditorPluginPage=Plugin
+
+PopupMenus.launchconsole=Launch Geronimo Console
+PopupMenus.launchSupport=Launch Geronimo Support
+
+deploymentPlanEditorName=Geronimo Deployment Plan Editor
\ No newline at end of file

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/plugin.xml?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/plugin.xml Thu Jun 10 10:26:44 2010
@@ -51,15 +51,114 @@
             class="org.apache.geronimo.st.v21.ui.sections.ServerPluginSection">
         </section>
     </extension>
-    <extension
-          point="org.eclipse.debug.core.statusHandlers">
-       <statusHandler
-	   id="com.example.ExampleIdentifier"
-	   class="com.example.ExampleStatusHandler"
-	   plugin="com.example.ExamplePluginId"
-	   code="123">
-  </statusHandler>
-
+    
+    <!-- 
+     |
+     | 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.server.v21.wizardFragment"
+            typeIds="org.apache.geronimo.server.20,
+                     org.apache.geronimo.server.21,
+                     org.apache.geronimo.server.22"
+            class="org.apache.geronimo.st.v21.ui.internal.GeronimoServerWizardFragment"/>
+    </extension>
+    
+     <extension point="org.eclipse.ui.popupMenus">
+        <objectContribution
+                adaptable="true"
+                id="org.apache.geronimo.v21.ui.serveractions"
+                objectClass="org.eclipse.wst.server.core.IServer">
+            <enablement>
+                <test forcePluginActivation="true"
+                    property="org.eclipse.wst.server.ui.serverType"
+                    value="org.apache.geronimo.server.2*" />
+            </enablement>
+            <action id="org.apache.geronimo.v21.ui.launchSupport"
+                label="%PopupMenus.launchSupport" icon="icons/obj16/littleG.gif"
+                class="org.apache.geronimo.st.v21.ui.actions.LaunchGeronimoSupportAction"
+                enablesFor="1">
+            </action>
+        </objectContribution>
     </extension>
 
+    <extension point="org.eclipse.ui.popupMenus">
+        <objectContribution
+                adaptable="true"
+                id="org.apache.geronimo.v21.ui.serveractions"
+                objectClass="org.eclipse.wst.server.core.IServer">
+            <enablement>
+                <test forcePluginActivation="true"
+                    property="org.eclipse.wst.server.ui.serverType"
+                    value="org.apache.geronimo.server.2*" />
+            </enablement>
+            <action id="org.apache.geronimo.v21.ui.launchconsole"
+                label="%PopupMenus.launchconsole" icon="icons/obj16/littleG.gif"
+                class="org.apache.geronimo.st.v21.ui.actions.LaunchGeronimoConsoleAction"
+                enablesFor="1">
+            </action>
+        </objectContribution>
+    </extension>
+    
+    <extension point="org.eclipse.wst.server.ui.editorPageSections">
+        <section id="org.apache.server.geronimo.security" order="10"
+            insertionId="org.eclipse.wst.server.editor.overview.left"
+            typeIds="org.apache.geronimo.server.2*"
+            class="org.apache.geronimo.st.v21.ui.sections.ServerEditorSecuritySection">
+        </section>
+    </extension>
+    
+    <extension point="org.eclipse.wst.server.ui.editorPageSections">
+        <section id="org.apache.server.geronimo.publishAdvanced" order="10"
+            insertionId="org.eclipse.wst.server.editor.overview.right"
+            typeIds="org.apache.geronimo.server.2*"
+            class="org.apache.geronimo.st.v21.ui.sections.ServerEditorPublishAdvancedSection">
+        </section>
+    </extension>
+    
+    <extension point="org.eclipse.wst.server.ui.editorPageSections">
+        <section id="org.apache.server.geronimo.port" order="10"
+            insertionId="org.eclipse.wst.server.editor.overview.right"
+            typeIds="org.apache.geronimo.server.2*"
+            class="org.apache.geronimo.st.v21.ui.sections.ServerEditorPortsSection">
+        </section>
+    </extension>
+    
+    <extension point="org.eclipse.wst.server.ui.editorPageSections">
+        <section id="org.apache.server.geronimo.loglevel" order="20"
+            insertionId="org.eclipse.wst.server.editor.overview.right"
+            typeIds="org.apache.geronimo.server.2*"
+            class="org.apache.geronimo.st.v21.ui.sections.ServerEditorLogLevelSection">
+        </section>
+    </extension>
+    
+    <extension point="org.eclipse.wst.server.ui.editorPageSections">
+        <section id="org.apache.server.geronimo.security" order="30"
+            insertionId="org.eclipse.wst.server.editor.overview.right"
+            typeIds="org.apache.geronimo.server.2*"
+            class="org.apache.geronimo.st.v21.ui.sections.ServerEditorStartupSection">
+        </section>
+    </extension>
+    
+    <extension point="org.eclipse.wst.server.ui.editorPageSections">
+        <section id="org.apache.server.geronimo.vmargs" order="40"
+            insertionId="org.eclipse.wst.server.editor.overview.right"
+            typeIds="org.apache.geronimo.server.2*"
+            class="org.apache.geronimo.st.v21.ui.sections.ServerVMArgsSection">
+        </section>
+    </extension>
+    
+    <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.2*"
+            class="org.apache.geronimo.st.v21.ui.sections.ServerEditorTestEnvSection">
+        </section>
+    </extension>
+    
+   
 </plugin>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/editors/GeronimoFormContentLoader.java Thu Jun 10 10:26:44 2010
@@ -23,16 +23,20 @@ import javax.xml.bind.JAXBException;
 
 import org.apache.geronimo.st.core.jaxb.JAXBUtils;
 import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.st.v21.ui.editors.AbstractGeronimoDeploymentPlanEditor;
+import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
 import org.apache.geronimo.st.v21.ui.editors.AbstractGeronimoFormContentLoader;
 import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
 import org.apache.geronimo.st.v21.core.GeronimoV21Utils;
+import org.apache.geronimo.st.v21.core.operations.ImportDeploymentPlanDataModelProvider;
+import org.apache.geronimo.st.v21.core.operations.ImportDeploymentPlanOperation;
+import org.apache.geronimo.st.v21.ui.pages.AbstractGeronimoFormPage;
 import org.apache.geronimo.st.v21.ui.pages.AppClientGeneralPage;
 import org.apache.geronimo.st.v21.ui.pages.AppClientSecurityPage;
 import org.apache.geronimo.st.v21.ui.pages.AppGeneralPage;
 import org.apache.geronimo.st.v21.ui.pages.ConnectorOverviewPage;
 import org.apache.geronimo.st.v21.ui.pages.ConnectorPage;
 import org.apache.geronimo.st.v21.ui.pages.DeploymentPage;
+import org.apache.geronimo.st.v21.ui.pages.DeploymentPlanSourcePage;
 import org.apache.geronimo.st.v21.ui.pages.EjbOverviewPage;
 import org.apache.geronimo.st.v21.ui.pages.NamingFormPage;
 import org.apache.geronimo.st.v21.ui.pages.SecurityPage;
@@ -40,6 +44,11 @@ import org.apache.geronimo.st.v21.ui.pag
 import org.eclipse.core.resources.IFile;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.forms.editor.FormEditor;
+import org.eclipse.ui.forms.editor.IFormPage;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
+import org.eclipse.wst.sse.ui.StructuredTextEditor;
 
 /**
  * @version $Rev$ $Date$
@@ -130,4 +139,27 @@ public class GeronimoFormContentLoader e
     public void triggerGeronimoServerInfoUpdate() {
         GeronimoServerInfo.getInstance().updateInfo();
     }
+
+	public StructuredTextEditor getDeploymentPlanSourcePage(AbstractGeronimoDeploymentPlanEditor editor) {
+	    return new DeploymentPlanSourcePage(editor);
+    }
+
+	public IDataModelProvider getImportDeploymentPlanDataModelProvider() {
+	    return new ImportDeploymentPlanDataModelProvider();
+    }
+
+	public IDataModelOperation getImportDeploymentPlanOperation(IDataModel model) {
+	    return new ImportDeploymentPlanOperation(model);
+    }
+
+	public boolean isValidPage(IFormPage page) {
+	    return page instanceof AbstractGeronimoFormPage;
+    }
+
+	public void refreshPage(IFormPage page) {
+		   AbstractGeronimoFormPage geronimoPage = (AbstractGeronimoFormPage)page;
+           geronimoPage.refresh();
+	    
+    }
+
 }

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AbstractGeronimoFormPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AbstractGeronimoFormPage.java?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AbstractGeronimoFormPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/AbstractGeronimoFormPage.java Thu Jun 10 10:26:44 2010
@@ -20,8 +20,8 @@ import javax.xml.bind.JAXBElement;
 
 import org.apache.geronimo.st.core.DeploymentDescriptorUtils;
 import org.apache.geronimo.st.core.descriptor.AbstractDeploymentDescriptor;
+import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
 import org.apache.geronimo.st.v21.ui.Activator;
-import org.apache.geronimo.st.v21.ui.editors.AbstractGeronimoDeploymentPlanEditor;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IToolBarManager;

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorPage.java?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/ConnectorPage.java Thu Jun 10 10:26:44 2010
@@ -18,7 +18,7 @@ package org.apache.geronimo.st.v21.ui.pa
 
 import org.apache.geronimo.jee.application.Application;
 import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.st.v21.ui.editors.AbstractGeronimoDeploymentPlanEditor;
+import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
 import org.apache.geronimo.st.v21.ui.pages.AbstractGeronimoFormPage;
 
 import org.apache.geronimo.st.v21.core.GeronimoServerInfo;

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPage.java Thu Jun 10 10:26:44 2010
@@ -20,7 +20,7 @@ import org.apache.geronimo.jee.applicati
 import org.apache.geronimo.jee.applicationclient.ApplicationClient;
 import org.apache.geronimo.jee.connector.Connector;
 import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.st.v21.ui.editors.AbstractGeronimoDeploymentPlanEditor;
+import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
 import org.apache.geronimo.st.v21.ui.pages.AbstractGeronimoFormPage;
 import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
 import org.apache.geronimo.st.v21.core.jaxb.JAXBModelUtils;

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPlanSourcePage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPlanSourcePage.java?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPlanSourcePage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/DeploymentPlanSourcePage.java Thu Jun 10 10:26:44 2010
@@ -16,7 +16,7 @@
  */
 package org.apache.geronimo.st.v21.ui.pages;
 
-import org.apache.geronimo.st.v21.ui.editors.AbstractGeronimoDeploymentPlanEditor;
+import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Display;

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/NamingFormPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/NamingFormPage.java?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/NamingFormPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/pages/NamingFormPage.java Thu Jun 10 10:26:44 2010
@@ -20,7 +20,7 @@ import org.apache.geronimo.jee.applicati
 import org.apache.geronimo.jee.openejb.OpenejbJar;
 import org.apache.geronimo.jee.web.WebApp;
 import org.apache.geronimo.st.ui.CommonMessages;
-import org.apache.geronimo.st.v21.ui.editors.AbstractGeronimoDeploymentPlanEditor;
+import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
 import org.apache.geronimo.st.v21.ui.pages.AbstractGeronimoFormPage;
 import org.apache.geronimo.st.v21.core.GeronimoServerInfo;
 import org.apache.geronimo.st.v21.ui.sections.EjbLocalRefSection;

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/wizards/FacetInstallPage.java Thu Jun 10 10:26:44 2010
@@ -88,6 +88,7 @@ public class FacetInstallPage extends Ab
 		artifactText = new Text(composite, SWT.BORDER);
 		artifactText.setLayoutData(createGridData());
 		
+		
 		Label versionLabel = new Label(composite, SWT.NONE);
 		versionLabel.setText(CommonMessages.version);
 

Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/.classpath?rev=953271&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/.classpath (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/.classpath Thu Jun 10 10:26:44 2010
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/.project
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/.project?rev=953271&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/.project (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/.project Thu Jun 10 10:26:44 2010
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.apache.geronimo.st.v21.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/.options
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/.options?rev=953271&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/.options (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/.options Thu Jun 10 10:26:44 2010
@@ -0,0 +1 @@
+org.apache.geronimo.st.v21.ui/debug=true
\ No newline at end of file

Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/META-INF/LICENSE.txt?rev=953271&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/META-INF/LICENSE.txt (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/META-INF/LICENSE.txt Thu Jun 10 10:26:44 2010
@@ -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.

Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/META-INF/NOTICE.txt?rev=953271&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/META-INF/NOTICE.txt (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/META-INF/NOTICE.txt Thu Jun 10 10:26:44 2010
@@ -0,0 +1,12 @@
+Apache Geronimo 
+Copyright 2003-2010 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of the Eclipse Geronimo Server Adapter were originally 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".
+

Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/about.html
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/about.html?rev=953271&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/about.html (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/about.html Thu Jun 10 10:26:44 2010
@@ -0,0 +1,17 @@
+<html>
+<body>
+<h2>About This Content</h2>
+<p>Version: 2.2.1-20100609155424</p>
+<h3>License</h3>
+The license for this plugin is found here in the <a href="about_files/LICENSE.txt">about_files/LICENSE.txt</a> file.
+<h3>Notices</h3>
+The notices for this plugin are found here in the <a href="about_files/NOTICE.txt">about_files/NOTICE.txt</a> file.
+<h3>Release Notes</h3>
+For detailed information about this feature, see these
+<a href="about_files/PLUGIN_RELEASE-NOTES-2.2.1.txt">Release Notes</a>.
+<h3>The Geronimo Devtools project</h3>
+For more information on using this feature, getting the source code and/or contributing to the project,
+visit the project home page 
+<a href="http://geronimo.apache.org/development-tools.html">http://geronimo.apache.org/development-tools.html</a>.
+</body>
+</html>

Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/about_files/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/about_files/LICENSE.txt?rev=953271&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/about_files/LICENSE.txt (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/about_files/LICENSE.txt Thu Jun 10 10:26:44 2010
@@ -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.

Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/about_files/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/about_files/NOTICE.txt?rev=953271&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/about_files/NOTICE.txt (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/about_files/NOTICE.txt Thu Jun 10 10:26:44 2010
@@ -0,0 +1,12 @@
+Apache Geronimo 
+Copyright 2003-2010 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of the Eclipse Geronimo Server Adapter were originally 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".
+

Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/about_files/PLUGIN_RELEASE-NOTES-2.2.1.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/about_files/PLUGIN_RELEASE-NOTES-2.2.1.txt?rev=953271&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/about_files/PLUGIN_RELEASE-NOTES-2.2.1.txt (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/about_files/PLUGIN_RELEASE-NOTES-2.2.1.txt Thu Jun 10 10:26:44 2010
@@ -0,0 +1,115 @@
+Release Notes -- Apache Geronimo Eclipse Plugin -- Version 2.2.1 -- 20100609155424
+
+
+Helpful URLs
+------------
+Geronimo Devtools:                          http://geronimo.apache.org/development-tools.html
+Geronimo Eclipse Update Site:               http://www.apache.org/dist/geronimo/eclipse/updates
+Bug Tracking:                               http://issues.apache.org/jira/browse/GERONIMODEVTOOLS
+Quick start - fast and easy development:    http://cwiki.apache.org/GMOxDOC22/quick-start-fast-and-easy-development.html
+5-minute Tutorial using GEP:                http://cwiki.apache.org/GMOxDOC22/5-minute-tutorial-on-enterprise-application-development-with-eclipse-and-geronimo.html
+
+
+System Requirements
+-------------------
+1. Java J2SE 1.5.0 or greater, and a platform that supports it
+
+2. Eclipse IDE for Java EE Developers (Galileo or Ganymede), which is platform-specific
+
+   -- Get Eclipse from http://www.eclipse.org/downloads/
+
+3. Geronimo server (1.1.x, 2.0.x, 2.1.x or 2.2.x)
+
+   -- Get a Geronimo server from http://geronimo.apache.org/downloads.html
+
+
+
+Notes
+-----
+You will likely need to increase the default setting for maximum PermGen size
+for your Eclipse installation (especially for Sun's JDK 1.5.0_x on the Windows
+platform) to prevent "java.lang.OutOfMemoryError: PermGen" errors. From the
+command line you can use:
+
+        eclipse -vmargs -Xms128m -Xmx512m -XX:MaxPermSize=128m
+
+Or you can edit your eclipse.ini file. An example is shown below but remember
+that each argument has to be on seperate lines:
+
+        -vmargs
+        -Xms128m
+        -Xmx512m
+        -XX:MaxPermSize=128m
+
+
+
+Geronimo Eclipse Plugin Version 2.2.1 Enhancements
+--------------------------------------------------
+
+1. Numerous enhancements to the Geronimo deployment plan editors
+
+2. Inegrate v1.1.x server adapter in GEP 2.2. See details in online release notes
+
+
+
+Installation Instructions
+-------------------------
+
+See http://cwiki.apache.org/GMOxDOC22/installing-geronimo-eclipse-plugin.html
+
+
+Bug Fixed and New Features
+--------------------------
+
+GERONIMODEVTOOLS-598	Support builds on Linux x86_64 based systems
+GERONIMODEVTOOLS-594	Geronimo server can't be deleted when it has been stopped in GEP
+GERONIMODEVTOOLS-593	"tptp.runtime-TPTP-4.6.0.zip " download URL is incorrect in build.xml
+GERONIMODEVTOOLS-592	Extend "rename" for ejb/connector/ear project,too, meanwhile rename artifactId in these deployment plans.
+GERONIMODEVTOOLS-591	"Next" can go to next step without application chosen after click "back" button.
+GERONIMODEVTOOLS-590	org.eclipse.ltk.core.refactoring added in Require-Bundle must be set visibility:=reexport,
+GERONIMODEVTOOLS-587	Using GEP to convert an application to a plugin, if add prerequisite module,will encouter an error when install the plugin
+GERONIMODEVTOOLS-586	Index.jsp can not find servlet in the same project when use <jsp:include page="/ConverterHandler" />
+GERONIMODEVTOOLS-585	Make GEP generate standard JEE deployment descriptor by default
+GERONIMODEVTOOLS-582	Plugin list contains non-car modules when create plugin
+GERONIMODEVTOOLS-581	GEP 2.2 can't be installed on WTP 3.1 used by Eclipse 3.5 Galileo
+GERONIMODEVTOOLS-579	java specs are not included into G server runtime by default
+GERONIMODEVTOOLS-577	Appclient server and client environment module ID are the same resulting in deployment error.
+GERONIMODEVTOOLS-575	GEP errors that are logged to the Eclipse error log are not always seen by end-user
+GERONIMODEVTOOLS-571	"Next" or "Finish" Button displays when required fields are not selected or checked during convert plugin
+GERONIMODEVTOOLS-567	EJB projected created by WTP without openejb-jar.xml cannot be published to Geronimo 2.1.4 server via GEP 2.1.4
+GERONIMODEVTOOLS-563	Start geronimo server in profiling mode
+GERONIMODEVTOOLS-510	Deployment plan editor warning message when opening source tab for openejb-jar.xml file
+GERONIMODEVTOOLS-504	advanced security section does not allow setting of credential store
+GERONIMODEVTOOLS-456	Add Security Realm Wizard to GEP to deploy security realm directly from GEP
+GERONIMODEVTOOLS-455	Add Database pool wizard in GEP to enable application specific pools
+GERONIMODEVTOOLS-453	JAXB Classes support for schema geronimo-login-config-2.0.xsd
+GERONIMODEVTOOLS-362	GEP DependencyHelper not interrogating server for already-deployed dependencies
+GERONIMODEVTOOLS-361	GEP DependencyHelper not interrogating all contents of EAR files for dependencies
+GERONIMODEVTOOLS-320	Provide facility to change id/pw associated with server instance (withing creating a new instance of the server)
+GERONIMODEVTOOLS-289	Unable to deploy EJB application on AG 2.1 through Eclipse
+GERONIMODEVTOOLS-283	Refactoring a Dynamic Web Project's name doesn't refactor it's artifact id & context root
+GERONIMODEVTOOLS-255	Can deploy and EAR file from the admin console without an application.xml file, but fails from the Eclipse plugin
+GERONIMODEVTOOLS-578	Integrate server adapter 1.1 in GEP 2.2
+GERONIMODEVTOOLS-573	<sec:security/> was added to plan after add a resource-ref via GEP UI
+GERONIMODEVTOOLS-568	Trunk build failed: should remove "snapshot" for 2.1 runtime dependency package
+GERONIMODEVTOOLS-541	move all Abbot testcases to run during a single server install/uninstall
+GERONIMODEVTOOLS-519	Document the Deployment Plan editors
+GERONIMODEVTOOLS-512	When running the testsuite from maven, the Geronimo branding does not show up
+GERONIMODEVTOOLS-481	Convert all Junit testcases to use the new NamespacePrefix class (instead of NamespacePrefixMapper)
+GERONIMODEVTOOLS-454	Add support to GEP for various Admin Console wizards like Database pool, Security realm etc
+GERONIMODEVTOOLS-433	Tasklist for Ganymede-specific problems
+GERONIMODEVTOOLS-432	Intermittent IllegalArgumentExceptions when starting a new run configuration using Ganymede
+GERONIMODEVTOOLS-424	Port Plan Creator work into GEP Deployment Plan Editor
+GERONIMODEVTOOLS-400	editing and saving the deployment plan XML doesn't get reflected back into the editor pages.
+GERONIMODEVTOOLS-383	unable to set enterprise-beans
+GERONIMODEVTOOLS-379	unable to set cmp-connection-factory"
+GERONIMODEVTOOLS-378	EJB deployment plan editor improvements
+GERONIMODEVTOOLS-355	devtools web page out of date. refers GEP v2.0.0, not lastest v2.1.1
+GERONIMODEVTOOLS-344	Cannot utilize the xpp3-1.1.3.4.O jar in GEP
+GERONIMODEVTOOLS-319	GEP security exception when attempting to use password that is not the default for the server
+GERONIMODEVTOOLS-292	manual install of plugin broken
+GERONIMODEVTOOLS-198	Daytrader deployment exception in Eclipse
+
+Release Notes -- Apache Geronimo Eclipse Plugin -- Version 2.2.1 -- 20100609155424
+
+@version $Rev: 897145 $ $Date: 2010-01-08 17:38:07 +0800 (Fri, 08 Jan 2010) $

Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/plugin.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/plugin.properties?rev=953271&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/plugin.properties (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/plugin.properties Thu Jun 10 10:26:44 2010
@@ -0,0 +1,19 @@
+#
+# 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: 733867 $ $Date: 2009-01-13 02:56:29 +0800 (Tue, 13 Jan 2009) $
+#
+serverEditorPluginPage=Plugin



Mime
View raw message