geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r953271 [1/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
Author: delos
Date: Thu Jun 10 10:26:44 2010
New Revision: 953271

URL: http://svn.apache.org/viewvc?rev=953271&view=rev
Log:
GERONIMODEVTOOLS-644 refactor code for deployment plan editor

Added:
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/AbstractGeronimoDeploymentPlanEditor.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/debug
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/icons/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/icons/obj16/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/icons/obj16/littleG.gif   (with props)
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/plugin.properties
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/target/
    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
      - copied, changed 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
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/.classpath
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/.project
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/.options
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/META-INF/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/META-INF/LICENSE.txt
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/META-INF/NOTICE.txt
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/about.html
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/about_files/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/about_files/LICENSE.txt
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/about_files/NOTICE.txt
    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
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/plugin.properties
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/classes/plugin.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/maven-archiver/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/maven-archiver/pom.properties
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/target/org.apache.geronimo.st.v21.ui-2.2.1.jar   (with props)
Removed:
    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/AbstractGeronimoDeploymentPlanEditor.java
    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/SharedDeploymentPlanEditor.java
    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
    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/AbstractGeronimoDeploymentPlanEditor.java
    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/SharedDeploymentPlanEditor.java
Modified:
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/.classpath
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.classpath
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/plugin.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/plugin.properties
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/plugin.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/schema/actionURLs.exsd
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/IGeronimoFormContentLoader.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/.classpath
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/plugin.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/pom.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/jaxb/JAXB11Utils.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/.classpath
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/plugin.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/pom.xml
    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
    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
    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
    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
    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
    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
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/plugin.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/plugin.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/plugin.properties
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/plugin.xml
    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
    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
    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
    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
    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
    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
    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
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/plugin.xml

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/.classpath?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/.classpath Thu Jun 10 10:26:44 2010
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="var" path="M2_REPO/xmlunit/xmlunit/1.1/xmlunit-1.1.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/test/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>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.classpath?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.classpath Thu Jun 10 10:26:44 2010
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="var" path="M2_REPO/xmlunit/xmlunit/1.1/xmlunit-1.1.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="var" path="M2_REPO/xmlunit/xmlunit/1.1/xmlunit-1.1.jar"/>
+	<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>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/plugin.xml?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/plugin.xml Thu Jun 10 10:26:44 2010
@@ -23,15 +23,6 @@
     <extension-point id="sourcePathComputerMapping" name="Geronimo Deployment Plan Loader" schema="schema/sourcePathComputerMapping.exsd"/>
     <extension-point id="JAXBUtilsProvider" name="Geronimo JAXB Utils" schema="schema/JAXBUtilsProvider.exsd"/>
 
-    <extension point="org.eclipse.debug.core.launchConfigurationTypes">
-        <launchConfigurationType
-            id="org.apache.geronimo.st.core.launchConfigurationType"
-            name="%geronimoLaunchConfigurationType"
-            delegate="org.apache.geronimo.st.core.GeronimoLaunchConfigurationDelegate"
-            modes="run, debug, profile"
-            sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
-            sourcePathComputerId="org.apache.geronimo.st.core.sourcePathComputer"/>
-    </extension>
     
     <extension point="org.eclipse.debug.core.sourcePathComputers">
         <sourcePathComputer
@@ -42,20 +33,6 @@
       
     <!-- 
      |                                                                                           
-     | 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.core.GeronimoLaunchableAdapterDelegate"
-            id="org.eclipse.jst.server.geronimo.web"/>
-    </extension>
-
-
-    <!-- 
-     |                                                                                           
      | Define the runtime component version(s) and the facets supported by each 
      | Geronimo runtime component                                                                       
      |                                                                                           
@@ -152,25 +129,6 @@
         </project-facet>
     </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.core.operations.ImportDeploymentPlanOperation">
-        </operationExtension>
-        <operationExtension
-            id="org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EJBComponentImportOperation"
-            postOperationClass="org.apache.geronimo.st.core.operations.ImportDeploymentPlanOperation">
-        </operationExtension>
-        <operationExtension
-            id="org.eclipse.jst.j2ee.internal.archive.operations.EARComponentImportOperation"
-            postOperationClass="org.apache.geronimo.st.core.operations.ImportDeploymentPlanOperation">
-        </operationExtension>
-        <operationExtension
-            id="org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentImportOperation"
-            postOperationClass="org.apache.geronimo.st.core.operations.ImportDeploymentPlanOperation">
-        </operationExtension>
-    </extension>
     
     <extension
        point="org.eclipse.hyades.trace.ui.launchConfigMechanismAssociator">
@@ -197,8 +155,5 @@
        </association>
    </extension>
    
-   <extension point="org.apache.geronimo.st.core.JAXBUtilsProvider">
-       <provider class="org.apache.geronimo.st.core.jaxb.JAXB21Utils" version="2.0,2.1,2.2"/>
-   </extension>
  
 </plugin>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.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.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF Thu Jun 10 10:26:44 2010
@@ -12,7 +12,7 @@ Require-Bundle: org.apache.geronimo.runt
  org.eclipse.wst.server.core,
  org.eclipse.ui.forms,
  org.eclipse.ui.ide,
- org.eclipse.ui.editors,
+ org.eclipse.ui.editors;visibility:=reexport,
  org.eclipse.ui.views,
  org.eclipse.wst.server.ui,
  org.eclipse.wst.common.project.facet.core,
@@ -21,11 +21,11 @@ Require-Bundle: org.apache.geronimo.runt
  org.eclipse.jdt.debug.ui,
  org.eclipse.wst.common.modulecore,
  org.eclipse.jface;visibility:=reexport,
- org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.workbench.texteditor;visibility:=reexport,
  org.eclipse.jdt.core,
  org.eclipse.ui.workbench,
  org.eclipse.core.resources,
- org.eclipse.wst.sse.ui,
+ org.eclipse.wst.sse.ui;visibility:=reexport,
  org.eclipse.text,
  org.eclipse.jface.text,
  org.eclipse.ltk.core.refactoring;visibility:=reexport,

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/plugin.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/plugin.properties?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/plugin.properties (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/plugin.properties Thu Jun 10 10:26:44 2010
@@ -19,6 +19,4 @@
 pluginName=Geronimo Server Tools UI
 providerName=Apache Software Foundation
 
-PopupMenus.launchconsole=Launch Geronimo Console
-PopupMenus.launchSupport=Launch Geronimo Support
 deploymentPlanEditorName=Geronimo Deployment Plan Editor

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/plugin.xml?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/plugin.xml Thu Jun 10 10:26:44 2010
@@ -78,127 +78,14 @@
                      org.apache.geronimo.runtime.21,
                      org.apache.geronimo.runtime.22"
             class="org.apache.geronimo.st.ui.internal.GeronimoRuntimeWizardFragment"/>
-        <fragment id="org.apache.geronimo.server.wizardFragment"
+        <!-- fragment id="org.apache.geronimo.server.wizardFragment"
             typeIds="org.apache.geronimo.server.11,
             		 org.apache.geronimo.server.20,
                      org.apache.geronimo.server.21,
                      org.apache.geronimo.server.22"
-            class="org.apache.geronimo.st.ui.internal.GeronimoServerWizardFragment"/>
+            class="org.apache.geronimo.st.ui.internal.GeronimoServerWizardFragment"/ -->
     </extension>
 
-    <extension point="org.eclipse.ui.popupMenus">
-        <objectContribution
-                adaptable="true"
-                id="org.apache.geronimo.ui.serveractions"
-                objectClass="org.eclipse.wst.server.core.IServer">
-            <enablement>
-                <test forcePluginActivation="true"
-                    property="org.eclipse.wst.server.ui.serverType"
-                    value="org.apache.geronimo.*" />
-            </enablement>
-            <action id="org.apache.geronimo.ui.launchSupport"
-                label="%PopupMenus.launchSupport" icon="icons/obj16/littleG.gif"
-                class="org.apache.geronimo.st.ui.actions.LaunchGeronimoSupportAction"
-                enablesFor="1">
-            </action>
-        </objectContribution>
-    </extension>
-
-    <extension point="org.eclipse.ui.popupMenus">
-        <objectContribution
-                adaptable="true"
-                id="org.apache.geronimo.ui.serveractions"
-                objectClass="org.eclipse.wst.server.core.IServer">
-            <enablement>
-                <test forcePluginActivation="true"
-                    property="org.eclipse.wst.server.ui.serverType"
-                    value="org.apache.geronimo.*" />
-            </enablement>
-            <action id="org.apache.geronimo.ui.launchconsole"
-                label="%PopupMenus.launchconsole" icon="icons/obj16/littleG.gif"
-                class="org.apache.geronimo.st.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.*"
-            class="org.apache.geronimo.st.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.*"
-            class="org.apache.geronimo.st.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.*"
-            class="org.apache.geronimo.st.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.*"
-            class="org.apache.geronimo.st.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.*"
-            class="org.apache.geronimo.st.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.*"
-            class="org.apache.geronimo.st.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.*"
-            class="org.apache.geronimo.st.ui.sections.ServerEditorTestEnvSection">
-        </section>
-    </extension>
-    
-    <!-- 
-     |
-     | Define the Web editor class for the various Geronimo-specific XML files
-     | (except for geronimo-application-client.xml)
-     |   
-     -->
-    <extension point="org.eclipse.ui.editors">
-        <editor class="org.apache.geronimo.st.ui.editors.SharedDeploymentPlanEditor"
-            default="true" 
-            filenames="geronimo-web.xml,
-                       geronimo-application.xml,    
-                       openejb-jar.xml,
-                       geronimo-application-client.xml,
-                       geronimo-ra.xml"
-            icon="icons/obj16/littleG.gif"
-            id="org.apache.geronimo.ui.editors.WebEditor" 
-            name="%deploymentPlanEditorName">
-        </editor>
-    </extension>
-    
-    
     <extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
         <launchConfigurationTypeImage
             id="org.apache.geronimo.st.ui.launchConfigurationTypeImage"
@@ -234,4 +121,24 @@
 			</enablement>        
 		</renameParticipant>    
 	</extension>
+	
+	 <!-- 
+     |
+     | Define the Web editor class for the various Geronimo-specific XML files
+     | (except for geronimo-application-client.xml)
+     |   
+     -->
+    <extension point="org.eclipse.ui.editors">
+        <editor class="org.apache.geronimo.st.ui.editors.SharedDeploymentPlanEditor"
+            default="true"
+            filenames="geronimo-web.xml,
+                       geronimo-application.xml,    
+                       openejb-jar.xml,
+                       geronimo-application-client.xml,
+                       geronimo-ra.xml"
+            icon="icons/obj16/littleG.gif"
+            id="org.apache.geronimo.ui.editors.WebEditor" 
+            name="%deploymentPlanEditorName">
+        </editor>
+    </extension>
 </plugin>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/schema/actionURLs.exsd
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/schema/actionURLs.exsd?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/schema/actionURLs.exsd (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/schema/actionURLs.exsd Thu Jun 10 10:26:44 2010
@@ -1,29 +1,10 @@
 <?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$ -->
-
 <!-- Schema file written by PDE -->
 <schema targetNamespace="org.apache.geronimo.st.ui" xmlns="http://www.w3.org/2001/XMLSchema">
 <annotation>
-      <appinfo>
+      <appInfo>
          <meta.schema plugin="org.apache.geronimo.st.ui" id="actionURLs" name="Action ID and URL"/>
-      </appinfo>
+      </appInfo>
       <documentation>
          Provide server prefix and URLs for pop-up menu actions.
       </documentation>
@@ -31,11 +12,15 @@
 
    <element name="extension">
       <annotation>
-         <appinfo>
+         <appInfo>
             <meta.element />
-         </appinfo>
+         </appInfo>
       </annotation>
       <complexType>
+         <sequence>
+            <element ref="server_prefix" minOccurs="1" maxOccurs="unbounded"/>
+            <element ref="action_URL" minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
          <attribute name="point" type="string" use="required">
             <annotation>
                <documentation>
@@ -55,9 +40,9 @@
                <documentation>
                   
                </documentation>
-               <appinfo>
+               <appInfo>
                   <meta.attribute translatable="true"/>
-               </appinfo>
+               </appInfo>
             </annotation>
          </attribute>
       </complexType>
@@ -98,18 +83,18 @@
    </element>
 
    <annotation>
-      <appinfo>
+      <appInfo>
          <meta.section type="since"/>
-      </appinfo>
+      </appInfo>
       <documentation>
          2.1.3
       </documentation>
    </annotation>
 
    <annotation>
-      <appinfo>
+      <appInfo>
          <meta.section type="examples"/>
-      </appinfo>
+      </appInfo>
       <documentation>
          &lt;extension
          point=&quot;org.apache.geronimo.st.ui.actionURLs&quot;&gt;
@@ -121,27 +106,27 @@
    </annotation>
 
    <annotation>
-      <appinfo>
+      <appInfo>
          <meta.section type="apiinfo"/>
-      </appinfo>
+      </appInfo>
       <documentation>
          [Enter API information here.]
       </documentation>
    </annotation>
 
    <annotation>
-      <appinfo>
+      <appInfo>
          <meta.section type="implementation"/>
-      </appinfo>
+      </appInfo>
       <documentation>
          [Enter information about supplied implementation of this extension point.]
       </documentation>
    </annotation>
 
    <annotation>
-      <appinfo>
+      <appInfo>
          <meta.section type="copyright"/>
-      </appinfo>
+      </appInfo>
       <documentation>
          Copyright 2008-2009 The Apache Software Foundation.
       </documentation>

Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/AbstractGeronimoDeploymentPlanEditor.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/AbstractGeronimoDeploymentPlanEditor.java?rev=953271&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/AbstractGeronimoDeploymentPlanEditor.java (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/AbstractGeronimoDeploymentPlanEditor.java Thu Jun 10 10:26:44 2010
@@ -0,0 +1,285 @@
+/*
+ * 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.
+ */
+package org.apache.geronimo.st.ui.editors;
+
+
+import java.io.InputStream;
+import java.util.ArrayList;
+
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.st.ui.internal.Messages;
+import org.apache.geronimo.st.ui.internal.Trace;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+import org.eclipse.ui.forms.editor.IFormPage;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
+import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
+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.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.sse.ui.StructuredTextEditor;
+
+/**
+ * @version $Rev: 819870 $ $Date: 2009-09-29 17:44:09 +0800 (Tue, 29 Sep 2009) $
+ */
+public abstract class AbstractGeronimoDeploymentPlanEditor extends FormEditor {
+
+    protected JAXBElement deploymentPlan;
+
+    public AbstractGeronimoDeploymentPlanEditor() {
+        super();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.ui.part.EditorPart#doSave(org.eclipse.core.runtime.IProgressMonitor)
+     */
+    public void doSave(IProgressMonitor monitor) {
+        InputStream is = null;
+        try {
+            IEditorInput input = getEditorInput();
+            if (input instanceof IFileEditorInput) {
+                IFileEditorInput fei = (IFileEditorInput) input;
+                if (deploymentPlan != null) {
+                    saveDeploymentPlan(fei.getFile());
+                    commitFormPages(true);
+                }
+
+                if (getActiveEditor() == null) {
+                    editorDirtyStateChanged();
+                } else {
+                    getActiveEditor().doSave(monitor);
+                    if (deploymentPlan != null) {
+//                        if (deploymentPlan.eResource() != null) {
+//                            deploymentPlan.eResource().unload();
+//                        }
+                        // TODO not sure if this is the best way to refresh
+                        // model
+                        deploymentPlan = loadDeploymentPlan(fei.getFile());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            Trace.trace(Trace.SEVERE, "Error saving", e);
+            MessageDialog.openError(Display.getCurrent().getActiveShell(), "Error saving", e.getMessage());
+        } finally {
+            try {
+                if (is != null)
+                    is.close();
+            } catch (Exception e) {
+            	Trace.trace(Trace.SEVERE, "Error saving", e);
+            	MessageDialog.openError(Display.getCurrent().getActiveShell(), "Error saving", e.getMessage());
+            }
+        }
+    }
+
+//    private void saveEditors(IFile file) throws IOException, JAXBException {
+//        JAXBContext jb = JAXBContext.newInstance( "org.apache.geronimo.xml.ns.j2ee.web_2_0:org.apache.geronimo.xml.ns.j2ee.application_2:org.apache.geronimo.xml.ns.deployment_1:org.apache.geronimo.j2ee.naming", Activator.class.getClassLoader() );
+//        jb.createMarshaller().marshal( deploymentPlan, new File( file.getLocationURI().toURL().getFile()) );
+//        commitFormPages(true);
+//    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.ui.forms.editor.FormEditor#addPages()
+     */
+    protected void addPages() {
+        try {
+            doAddPages();
+        } catch (PartInitException e1) {
+            e1.printStackTrace();
+        }
+    }
+
+    abstract public void doAddPages() throws PartInitException;
+    
+    abstract protected StructuredTextEditor getDeploymentPlanSourcePage();
+
+    abstract protected IDataModelOperation getImportDeploymentPlanOperation(
+            IDataModel model) ;
+
+    abstract protected IDataModelProvider getImportDeploymentPlanDataModelProvider();
+	
+    abstract  protected void refreshPage(IFormPage page) ;
+
+    abstract protected boolean isValidPage(IFormPage page) ;
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.ui.part.EditorPart#doSaveAs()
+     */
+    public final void doSaveAs() {
+        // do nothing
+    }
+
+    protected void addSourcePage() throws PartInitException {
+    	StructuredTextEditor source = getDeploymentPlanSourcePage();
+        int index = addPage(source, getEditorInput());
+        setPageText(index, Messages.editorTabSource);
+    }
+
+
+    
+    
+	/*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.ui.part.EditorPart#isSaveAsAllowed()
+     */
+    public boolean isSaveAsAllowed() {
+        return false;
+    }
+
+    public void commitFormPages(boolean onSave) {
+        IFormPage[] pages = getPages();
+        for (int i = 0; i < pages.length; i++) {
+            IFormPage page = pages[i];
+            IManagedForm mform = page.getManagedForm();
+            if (mform != null && mform.isDirty())
+                mform.commit(true);
+        }
+    }
+
+    public IFormPage[] getPages() {
+        ArrayList formPages = new ArrayList();
+        for (int i = 0; i < pages.size(); i++) {
+            Object page = pages.get(i);
+            if (page instanceof IFormPage)
+                formPages.add(page);
+        }
+        return (IFormPage[]) formPages.toArray(new IFormPage[formPages.size()]);
+    }
+
+    public JAXBElement getDeploymentPlan() {
+        return deploymentPlan;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.eclipse.ui.IEditorPart#init(org.eclipse.ui.IEditorSite,
+     *      org.eclipse.ui.IEditorInput)
+     */
+    public void init(IEditorSite site, IEditorInput input) throws PartInitException {
+        super.init(site, input);
+        if (input instanceof IFileEditorInput) {
+            IFileEditorInput fei = (IFileEditorInput) input;
+            try {
+				deploymentPlan = loadDeploymentPlan(fei.getFile());
+			} catch (Exception e1) {
+				// throw new PartInitException("Error in loading deployment plan");
+				// if catching an exception , it will try to correct the plan 
+				// or open the plan with default editor
+				e1.printStackTrace();
+			}
+            
+            boolean fix = false;
+            if(deploymentPlan == null) {
+                fix = MessageDialog.openQuestion(Display.getDefault().getActiveShell(), Messages.errorOpenDialog, Messages.editorCorrect);
+            }
+            
+            if(fix) {
+                IProject project = fei.getFile().getProject();
+                IDataModel model = DataModelFactory.createDataModel(getImportDeploymentPlanDataModelProvider());
+                model.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, project.getName());
+                try {
+                    IFacetedProject facetedProject = ProjectFacetsManager.create(project);
+                    model.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, facetedProject.getPrimaryRuntime());
+                    IDataModelOperation op = getImportDeploymentPlanOperation(model);
+                    op.execute(new NullProgressMonitor(), null);
+                } catch (Exception e) {
+                   throw new PartInitException(e.getMessage());
+                }
+                
+                try {
+					deploymentPlan = loadDeploymentPlan(fei.getFile());
+				} catch (Exception e) {
+					throw new PartInitException("Error in loading deployment plan");
+				}
+                
+                if (deploymentPlan == null) {    
+                    MessageDialog.openInformation(Display.getDefault().getActiveShell(), Messages.errorOpenDialog, Messages.editorDefault);
+                }
+            }
+        }
+    }
+
+  
+
+	public void reloadDeploymentPlan() throws Exception {
+        IEditorInput input = getEditorInput();
+        if (input instanceof IFileEditorInput) {
+            IFileEditorInput fei = (IFileEditorInput) input;
+            if (deploymentPlan != null) {
+                deploymentPlan = loadDeploymentPlan(fei.getFile());
+                IFormPage[] pages = getPages();
+                for (int i = 0; i < pages.length; i++) {
+                    IFormPage page = pages[i];
+                    IManagedForm mform = page.getManagedForm();
+                    if (mform != null) {
+                        if (isValidPage(page)) {
+                        	refreshPage(page);
+                           
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+   
+	@Override
+    protected void pageChange(int newPageIndex) {
+        if (isDirty()) {
+            IFormPage[] pages = getPages();
+            IFormPage active = getActivePageInstance();
+            int curr = getCurrentPage();
+            if (getCurrentPage() == newPageIndex) {
+                return;
+            }
+            // if the old or the new page are the source page, don't allow the page change 
+            if (newPageIndex == pages.length || getCurrentPage() == pages.length) {
+                setActivePage(curr);
+                MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), Messages.savePageTitle, Messages.savePageMessage);
+                return;
+            }
+        }
+        super.pageChange(newPageIndex);
+    }
+
+    abstract public JAXBElement loadDeploymentPlan(IFile file) throws Exception;
+    abstract public void saveDeploymentPlan(IFile file) throws Exception;
+
+}

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/IGeronimoFormContentLoader.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/IGeronimoFormContentLoader.java?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/IGeronimoFormContentLoader.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/IGeronimoFormContentLoader.java Thu Jun 10 10:26:44 2010
@@ -16,23 +16,38 @@
  */
 package org.apache.geronimo.st.ui.editors;
 
-import java.io.IOException;
-
 import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
 
 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$
  */
 public interface IGeronimoFormContentLoader {
-	
+
 	public JAXBElement loadDeploymentPlan(IFile file) throws Exception;
-	public void saveDeploymentPlan(JAXBElement deploymentPlan, IFile file) throws Exception;
-	
+
+	public void saveDeploymentPlan(JAXBElement deploymentPlan, IFile file)
+	        throws Exception;
+
 	public void doAddPages(FormEditor editor) throws PartInitException;
 
+	public StructuredTextEditor getDeploymentPlanSourcePage(AbstractGeronimoDeploymentPlanEditor editor);
+
+	public IDataModelOperation getImportDeploymentPlanOperation(
+	        IDataModel model);
+
+	public IDataModelProvider getImportDeploymentPlanDataModelProvider();
+	
+	public void refreshPage(IFormPage page);
+
+	public boolean isValidPage(IFormPage page);
+
 }

Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java?rev=953271&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/editors/SharedDeploymentPlanEditor.java Thu Jun 10 10:26:44 2010
@@ -0,0 +1,171 @@
+/*
+ * 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.
+ */
+package org.apache.geronimo.st.ui.editors;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.st.ui.Activator;
+import org.apache.geronimo.st.ui.internal.Trace;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jst.server.core.FacetUtil;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.PartInitException;
+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.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.sse.ui.StructuredTextEditor;
+
+/**
+ * @version $Rev: 817996 $ $Date: 2009-09-23 16:04:12 +0800 (Wed, 23 Sep 2009) $
+ */
+public class SharedDeploymentPlanEditor extends AbstractGeronimoDeploymentPlanEditor {
+
+	private static Map loaders = new HashMap();
+
+	private IGeronimoFormContentLoader currentLoader = null;
+
+	static {
+		loadExtensionPoints();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor#doAddPages()
+	 */
+	public void doAddPages() throws PartInitException {
+        Trace.tracePoint("ENTRY", "SharedDeploymentPlanEditor.doAddPages");
+
+		if (getDeploymentPlan() != null && getLoader() != null) {
+			currentLoader.doAddPages(this);
+		}
+		addSourcePage();
+
+        Trace.tracePoint("EXIT", "SharedDeploymentPlanEditor.doAddPages");
+	}
+
+	private static synchronized void loadExtensionPoints() {
+        Trace.tracePoint("ENTRY", "SharedDeploymentPlanEditor.loadExtensionPoints");
+
+		IExtensionRegistry registry = Platform.getExtensionRegistry();
+		IConfigurationElement[] cf = registry.getConfigurationElementsFor(Activator.PLUGIN_ID, "loader");
+		for (int i = 0; i < cf.length; i++) {
+			IConfigurationElement element = cf[i];
+			if ("loader".equals(element.getName())) {
+				try {
+					IGeronimoFormContentLoader loader = (IGeronimoFormContentLoader) element.createExecutableExtension("class");
+					String version = element.getAttribute("version");
+					loaders.put(version, loader);
+				} catch (CoreException e) {
+                    Trace.tracePoint("CoreException", "SharedDeploymentPlanEditor.loadExtensionPoints");
+					e.printStackTrace();
+				}
+			}
+		}
+
+        Trace.tracePoint("EXIT", "SharedDeploymentPlanEditor.loadExtensionPoints");
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor#loadDeploymentPlan(org.eclipse.core.resources.IFile)
+	 */
+	public JAXBElement loadDeploymentPlan(IFile file) throws Exception {
+        Trace.tracePoint("ENTRY", "SharedDeploymentPlanEditor.loadDeploymentPlan", file);
+        JAXBElement jaxbElement = getLoader() != null ? currentLoader.loadDeploymentPlan(file) : null;
+        Trace.tracePoint("EXIT", "SharedDeploymentPlanEditor.loadDeploymentPlan", jaxbElement);
+		return jaxbElement;
+	}
+	
+	public void saveDeploymentPlan(IFile file) throws Exception {
+		if (getLoader() != null) {
+			getLoader().saveDeploymentPlan(deploymentPlan, file);
+		}
+	}
+
+	private IGeronimoFormContentLoader getLoader() {
+        Trace.tracePoint("ENTRY", "SharedDeploymentPlanEditor.getLoader");
+
+		if (currentLoader == null) {
+			IEditorInput input = getEditorInput();
+			if (input instanceof IFileEditorInput) {
+				IProject project = ((IFileEditorInput) input).getFile().getProject();
+				try {
+					IFacetedProject fp = ProjectFacetsManager.create(project);
+					if (fp == null) return null;
+					IRuntime runtime = FacetUtil.getRuntime(fp.getPrimaryRuntime());
+					if (runtime == null) return null;
+					String version = runtime.getRuntimeType().getVersion();
+					currentLoader = (IGeronimoFormContentLoader) loaders.get(version);
+				} catch (CoreException e) {
+                    Trace.tracePoint("CoreException", "SharedDeploymentPlanEditor.getLoader");
+					e.printStackTrace();
+				} catch (IllegalArgumentException ie) {
+                    Trace.tracePoint("IllegalArgumentException", "SharedDeploymentPlanEditor.getLoader");
+				    throw new IllegalArgumentException("The project [" + project.getName() + "] does not have a Targeted Runtime specified.");
+                }
+			}
+		}
+
+        Trace.tracePoint("EXIT", "SharedDeploymentPlanEditor.getLoader", currentLoader);
+		return currentLoader;
+	}
+
+	@Override
+    protected StructuredTextEditor getDeploymentPlanSourcePage() {
+		return getLoader().getDeploymentPlanSourcePage(this);
+    }
+
+
+	@Override
+    protected IDataModelOperation getImportDeploymentPlanOperation(
+            IDataModel model) {
+	    return getLoader().getImportDeploymentPlanOperation(model);
+    }
+
+	@Override
+    protected boolean isValidPage(IFormPage page) {
+	    return getLoader().isValidPage(page);
+    }
+
+	@Override
+    protected void refreshPage(IFormPage page) {
+		getLoader().refreshPage(page);
+	    
+    }
+
+	@Override
+    protected IDataModelProvider getImportDeploymentPlanDataModelProvider() {
+	    return getLoader().getImportDeploymentPlanDataModelProvider();
+    }
+	
+	
+}

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/.classpath?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/.classpath Thu Jun 10 10:26:44 2010
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/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"/>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/plugin.xml?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/plugin.xml Thu Jun 10 10:26:44 2010
@@ -72,7 +72,7 @@
         <project-facet-version facet="org.apache.geronimo.facet" version="1.1">
             <action type="install" id="geronimo.plan.install.v11">
                 <delegate class="org.apache.geronimo.st.v11.core.operations.GeronimoV11FacetInstallDelegate"/>
-                <config-factory class="org.apache.geronimo.st.v21.core.DeploymentPlanInstallConfig$Factory"/>
+                <config-factory class="org.apache.geronimo.st.core.DeploymentPlanInstallConfig$Factory"/>
             </action>
             <constraint>
                 <or>
@@ -113,4 +113,46 @@
     <extension point="org.apache.geronimo.st.core.JAXBUtilsProvider">
         <provider class="org.apache.geronimo.st.v11.core.jaxb.JAXB11Utils" version="1.1"/>
     </extension>
+    
+     <extension point="org.eclipse.debug.core.launchConfigurationTypes">
+        <launchConfigurationType
+            id="org.apache.geronimo.st.core.launchConfigurationType"
+            name="%geronimoLaunchConfigurationType"
+            delegate="org.apache.geronimo.st.v11.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.v11.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.v11.core.operations.ImportDeploymentPlanOperation">
+        </operationExtension>
+        <operationExtension
+            id="org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EJBComponentImportOperation"
+            postOperationClass="org.apache.geronimo.st.v11.core.operations.ImportDeploymentPlanOperation">
+        </operationExtension>
+        <operationExtension
+            id="org.eclipse.jst.j2ee.internal.archive.operations.EARComponentImportOperation"
+            postOperationClass="org.apache.geronimo.st.v11.core.operations.ImportDeploymentPlanOperation">
+        </operationExtension>
+        <operationExtension
+            id="org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentImportOperation"
+            postOperationClass="org.apache.geronimo.st.v11.core.operations.ImportDeploymentPlanOperation">
+        </operationExtension>
+    </extension>
 </plugin>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/pom.xml?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/pom.xml Thu Jun 10 10:26:44 2010
@@ -137,23 +137,11 @@
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.core</artifactId>
             <version>${version}</version>
-            <exclusions>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
-                    </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.j2ee.v11.jaxbmodel</artifactId>
             <version>${version}</version>
-             <exclusions>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
-                    </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
@@ -170,12 +158,6 @@
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.runtime.common</artifactId>
             <version>${version}</version>
-            <exclusions>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
-                    </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/jaxb/JAXB11Utils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/jaxb/JAXB11Utils.java?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/jaxb/JAXB11Utils.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/jaxb/JAXB11Utils.java Thu Jun 10 10:26:44 2010
@@ -18,7 +18,6 @@ package org.apache.geronimo.st.v11.core.
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
@@ -45,9 +44,9 @@ import javax.xml.transform.dom.DOMSource
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamResult;
 
+import org.apache.geronimo.st.core.jaxb.IJAXBUtilsProvider;
 import org.apache.geronimo.st.v11.core.Activator;
 import org.apache.geronimo.st.v11.core.internal.Trace;
-import org.apache.geronimo.st.core.jaxb.IJAXBUtilsProvider;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -70,17 +69,17 @@ public class JAXB11Utils implements IJAX
     private static JAXBContext newJAXBContext() {
         try {
             return JAXBContext.newInstance( 
-                    "org.apache.geronimo.xml.ns.deployment_1:" +
-                    "org.apache.geronimo.xml.ns.j2ee.application_1:" +
-                    "org.apache.geronimo.xml.ns.j2ee.application_client_1:" +
-                    "org.apache.geronimo.xml.ns.j2ee.connector_1:" +
-                    "org.apache.geronimo.xml.ns.j2ee.web_1:" +
-                    "org.apache.geronimo.xml.ns.naming_1:" +
-                    "org.apache.geronimo.xml.ns.security_1:" +
-                    "org.openejb.xml.ns.openejb_jar_2:"+
-                    "org.openejb.xml.ns.pkgen_2:"+
-                    "org.openejb.xml.ns.corba_css_config_2:"+
-                    "org.openejb.xml.ns.corba_tss_config_2:", Activator.class.getClassLoader() );
+                    "org.apache.geronimo.j2ee.deployment:" +
+                    "org.apache.geronimo.j2ee.application:" +
+                    "org.apache.geronimo.j2ee.applicationclient:" +
+                    "org.apache.geronimo.j2ee.connector:" +
+                    "org.apache.geronimo.j2ee.web:" +
+                    "org.apache.geronimo.j2ee.naming:" +
+                    "org.apache.geronimo.j2ee.security:" +
+                    "org.apache.geronimo.j2ee.openejb_jar:"+
+                    "org.apache.geronimo.j2ee.pkgen:"+
+                    "org.apache.geronimo.j2ee.corba_css_config:"+
+                    "org.apache.geronimo.j2ee.corba_tss_config:", Activator.class.getClassLoader() );
         } catch (JAXBException e) {
             Trace.tracePoint("JAXBException", "JAXBContext.newInstance");
             e.printStackTrace();

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/.classpath?rev=953271&r1=953270&r2=953271&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/.classpath Thu Jun 10 10:26:44 2010
@@ -1,7 +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>
+<?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>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.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.v11.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF Thu Jun 10 10:26:44 2010
@@ -1,16 +1,15 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Geronimo Server Tools V11 UI Plug-in
+Bundle-Name: Geronimo Server Tools V11 UI Plug-in 
 Bundle-SymbolicName: org.apache.geronimo.st.v11.ui;singleton:=true
 Bundle-Version: 2.2.1
-Bundle-Activator: org.apache.geronimo.st.v21.ui.Activator
-Bundle-Vendor: Apache.org
-Bundle-Localization: plugin
-Require-Bundle: org.apache.geronimo.runtime.common,
- org.apache.geronimo.runtime.v11;bundle-version="2.2.0",
+Bundle-Activator: org.apache.geronimo.st.v11.ui.Activator
+Bundle-Vendor: Apache.org 
+Require-Bundle: org.apache.geronimo.j2ee.v11.jaxbmodel, 
+ org.apache.geronimo.runtime.v11,
+ org.apache.geronimo.st.core,
  org.apache.geronimo.st.v11.core,
- org.apache.geronimo.st.ui,
- org.apache.geronimo.j2ee.v11.jaxbmodel,
+ org.apache.geronimo.st.ui, 
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.commands,
@@ -21,9 +20,7 @@ Require-Bundle: org.apache.geronimo.runt
  org.eclipse.wst.server.core,
  org.eclipse.ui.ide,
  org.eclipse.wst.common.modulecore,
- org.eclipse.wst.sse.ui,
  org.eclipse.jface.text,
  org.eclipse.debug.ui,
  org.eclipse.jdt.debug.ui
 Bundle-ActivationPolicy: lazy
-Import-Package: org.apache.geronimo.st.v21.core.jaxb



Mime
View raw message