geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r955877 [1/6] - in /geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins: org.apache.geronimo.runtime.common/ org.apache.geronimo.runtime.common/META-INF/ org.apache.geronimo.runtime.v20/ org.apache.geronimo.runtime.v20/META-INF/ org.apa...
Date Fri, 18 Jun 2010 08:10:16 GMT
Author: delos
Date: Fri Jun 18 08:10:13 2010
New Revision: 955877

URL: http://svn.apache.org/viewvc?rev=955877&view=rev
Log:
GERONIMODEVTOOLS-644 Due to v21.core dependent on runtime.v21, even if non-v21 adapter is used, runtime.v21 is still in use. To avoid this, copy all runtime specific code into v20.core and v22.core. Then, each adapter will only use the runtime of its own.

Added:
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/GeronimoServer.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/GeronimoServerBehaviour.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/GeronimoV20ServerInfo.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/GeronimoV20VersionHandler.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/internal/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/internal/Trace.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/schema/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/schema/geronimoinfo.exsd
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServerInfoManager.java
      - copied, changed from r953557, geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServerInfo.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/GeronimoV21ServerInfo.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/IGeronimoServerInfo.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/src/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/src/main/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/src/main/java/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/GeronimoServer.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/GeronimoServerBehaviour.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/GeronimoV22ServerInfo.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/GeronimoV22VersionHandler.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/internal/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/internal/Trace.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/operations/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/operations/GeronimoServerPluginManager.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/plugin.properties
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/src/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/src/mainjava/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/src/mainjava/org/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/src/mainjava/org/apache/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/src/mainjava/org/apache/geronimo/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/src/mainjava/org/apache/geronimo/st/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/src/mainjava/org/apache/geronimo/st/v22/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/src/mainjava/org/apache/geronimo/st/v22/ui/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/src/mainjava/org/apache/geronimo/st/v22/ui/pages/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/src/mainjava/org/apache/geronimo/st/v22/ui/pages/ServerPluginPage.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/src/mainjava/org/apache/geronimo/st/v22/ui/sections/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/src/mainjava/org/apache/geronimo/st/v22/ui/sections/ServerPluginSection.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/src/mainjava/org/apache/geronimo/st/v22/ui/wizards/
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/src/mainjava/org/apache/geronimo/st/v22/ui/wizards/LicenseWizard.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/src/mainjava/org/apache/geronimo/st/v22/ui/wizards/PrerequisiteWizard.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/src/mainjava/org/apache/geronimo/st/v22/ui/wizards/ServerCustomAssemblyWizard.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/src/mainjava/org/apache/geronimo/st/v22/ui/wizards/ServerPluginManagerDialog.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/src/mainjava/org/apache/geronimo/st/v22/ui/wizards/ServerPluginManagerWizard.java
Removed:
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServerInfo.java
Modified:
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/pom.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v20/pom.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v21/pom.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v22/pom.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
    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/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/IGeronimoFormContentLoader.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.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTableSection.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/plugin.properties
    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.ui/plugin.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.v20.core/.classpath
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/plugin.properties
    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.properties
    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.core/pom.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.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v21.ui/pom.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/AbstractGeronimoFormContentLoader.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/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/AppClientGeneralPage.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/AppClientSecurityPage.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/AppGeneralPage.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/ConnectorOverviewPage.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/EjbOverviewPage.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/pages/SecurityPage.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/WebGeneralPage.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/sections/DependencySection.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/sections/SecurityAdvancedSection.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/sections/SecurityRealmSection.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/sections/SecurityRoleMappingSection.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/sections/ServerVMArgsSection.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/DependencyWizard.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/SecurityRealmWizard.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/SecurityRoleMappingWizard.java
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/.classpath
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/plugin.properties
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.core/plugin.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/.classpath
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/plugin.xml
    geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v22.ui/pom.xml

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF Fri Jun 18 08:10:13 2010
@@ -5,13 +5,13 @@ Bundle-SymbolicName: org.apache.geronimo
 Bundle-Version: 2.2.1
 Bundle-ClassPath: 
  lib/geronimo-jaxb_2.1_spec-1.0.jar,
- lib/geronimo-j2ee-deployment_1.1_spec-1.0.jar,
  lib/commons-logging-1.0.4.jar,
  lib/cglib-nodep-2.1_3.jar,
  lib/geronimo-jaxb_2.1_spec-1.0.jar,
  lib/jaxb-impl-2.1.12.jar,
  lib/geronimo-stax-api_1.0_spec-1.0.1.jar,
- lib/geronimo-activation_1.1_spec-1.0.2.jar
+ lib/geronimo-activation_1.1_spec-1.0.2.jar,
+ lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar
 Export-Package: 
  com.sun.istack,
  com.sun.xml.bind,
@@ -40,15 +40,71 @@ Export-Package: 
  com.sun.xml.txw2,
  com.sun.xml.txw2.annotation,
  com.sun.xml.txw2.output,
+ javax.enterprise.deploy.model,
+ javax.enterprise.deploy.model.exceptions,
+ javax.enterprise.deploy.shared,
+ javax.enterprise.deploy.shared.factories,
+ javax.enterprise.deploy.spi,
+ javax.enterprise.deploy.spi.exceptions,
+ javax.enterprise.deploy.spi.factories,
+ javax.enterprise.deploy.spi.status,
  javax.xml.bind,
- javax.xml.bind.annotation,
- javax.xml.bind.annotation.adapters,
- javax.xml.bind.attachment,
- javax.xml.bind.helpers,
- javax.xml.bind.util,
- javax.xml.stream,
- javax.xml.stream.events,
- javax.xml.stream.util,
+ javax.xml.bind.annotation;
+  x-friends:="org.apache.geronimo.st.v20.core,
+   org.apache.geronimo.st.v20.ui,
+   org.apache.geronimo.st.v21.core,
+   org.apache.geronimo.st.v21.ui,
+   org.apache.geronimo.st.v22.core,
+   org.apache.geronimo.st.v22.ui",
+ javax.xml.bind.annotation.adapters;
+  x-friends:="org.apache.geronimo.st.v20.core,
+   org.apache.geronimo.st.v20.ui,
+   org.apache.geronimo.st.v21.core,
+   org.apache.geronimo.st.v21.ui,
+   org.apache.geronimo.st.v22.core,
+   org.apache.geronimo.st.v22.ui",
+ javax.xml.bind.attachment;
+  x-friends:="org.apache.geronimo.st.v20.core,
+   org.apache.geronimo.st.v20.ui,
+   org.apache.geronimo.st.v21.core,
+   org.apache.geronimo.st.v21.ui,
+   org.apache.geronimo.st.v22.core,
+   org.apache.geronimo.st.v22.ui",
+ javax.xml.bind.helpers;
+  x-friends:="org.apache.geronimo.st.v20.core,
+   org.apache.geronimo.st.v20.ui,
+   org.apache.geronimo.st.v21.core,
+   org.apache.geronimo.st.v21.ui,
+   org.apache.geronimo.st.v22.core,
+   org.apache.geronimo.st.v22.ui",
+ javax.xml.bind.util;
+  x-friends:="org.apache.geronimo.st.v20.core,
+   org.apache.geronimo.st.v20.ui,
+   org.apache.geronimo.st.v21.core,
+   org.apache.geronimo.st.v21.ui,
+   org.apache.geronimo.st.v22.core,
+   org.apache.geronimo.st.v22.ui",
+ javax.xml.stream;
+  x-friends:="org.apache.geronimo.st.v20.core,
+   org.apache.geronimo.st.v20.ui,
+   org.apache.geronimo.st.v21.core,
+   org.apache.geronimo.st.v21.ui,
+   org.apache.geronimo.st.v22.core,
+   org.apache.geronimo.st.v22.ui",
+ javax.xml.stream.events;
+  x-friends:="org.apache.geronimo.st.v20.core,
+   org.apache.geronimo.st.v20.ui,
+   org.apache.geronimo.st.v21.core,
+   org.apache.geronimo.st.v21.ui,
+   org.apache.geronimo.st.v22.core,
+   org.apache.geronimo.st.v22.ui",
+ javax.xml.stream.util;
+  x-friends:="org.apache.geronimo.st.v20.core,
+   org.apache.geronimo.st.v20.ui,
+   org.apache.geronimo.st.v21.core,
+   org.apache.geronimo.st.v21.ui,
+   org.apache.geronimo.st.v22.core,
+   org.apache.geronimo.st.v22.ui",
  net.sf.cglib.asm,
  net.sf.cglib.asm.attrs,
  net.sf.cglib.beans,

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/pom.xml?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/pom.xml Fri Jun 18 08:10:13 2010
@@ -122,6 +122,10 @@
                                     <groupId>org.apache.geronimo.specs</groupId>
                                     <artifactId>geronimo-activation_1.1_spec</artifactId>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.specs</groupId>
+                                    <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF Fri Jun 18 08:10:13 2010
@@ -11,17 +11,8 @@ Bundle-ClassPath: lib/geronimo-common-2.
  lib/geronimo-kernel-2.0.2.jar,
  lib/geronimo-system-2.0.2.jar,
  lib/geronimo-util-2.0.2.jar,
- lib/geronimo-deploy-config-2.0.2.jar,
- lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar
+ lib/geronimo-deploy-config-2.0.2.jar
 Export-Package: 
- javax.enterprise.deploy.model,
- javax.enterprise.deploy.model.exceptions,
- javax.enterprise.deploy.shared,
- javax.enterprise.deploy.shared.factories,
- javax.enterprise.deploy.spi,
- javax.enterprise.deploy.spi.exceptions,
- javax.enterprise.deploy.spi.factories,
- javax.enterprise.deploy.spi.status,
  org.apache.geronimo.common,
  org.apache.geronimo.common.propertyeditor,
  org.apache.geronimo.deployment,

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v20/pom.xml?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v20/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v20/pom.xml Fri Jun 18 08:10:13 2010
@@ -138,10 +138,6 @@
                                     <artifactId>geronimo-deploy-config</artifactId>
                                     <version>${geronimoVersion}</version>
                                 </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.specs</groupId>
-                                    <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-                                </artifactItem>
                             </artifactItems>
                             <outputDirectory>lib</outputDirectory>
                         </configuration>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF Fri Jun 18 08:10:13 2010
@@ -13,21 +13,11 @@ Bundle-ClassPath: lib/geronimo-common-2.
  lib/geronimo-system-2.1.5.jar,
  lib/geronimo-util-2.1.5.jar,
  lib/geronimo-deploy-config-2.1.5.jar,
- lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar,
  lib/plexus-archiver-1.0-alpha-7.jar,
  lib/geronimo-crypto-2.1.5.jar,
  lib/slf4j-api-1.4.3.jar,
  lib/slf4j-simple-1.4.3.jar
-Export-Package: 
- javax.enterprise.deploy.model,
- javax.enterprise.deploy.model.exceptions,
- javax.enterprise.deploy.shared,
- javax.enterprise.deploy.shared.factories,
- javax.enterprise.deploy.spi,
- javax.enterprise.deploy.spi.exceptions,
- javax.enterprise.deploy.spi.factories,
- javax.enterprise.deploy.spi.status,
- org.apache.geronimo.common,
+Export-Package: org.apache.geronimo.common,
  org.apache.geronimo.common.propertyeditor,
  org.apache.geronimo.deployment,
  org.apache.geronimo.deployment.plugin,

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v21/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v21/pom.xml?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v21/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v21/pom.xml Fri Jun 18 08:10:13 2010
@@ -144,10 +144,6 @@
                                     <version>${geronimoVersion}</version>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.apache.geronimo.specs</groupId>
-                                    <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-                                </artifactItem>
-                                <artifactItem>
                                     <groupId>org.codehaus.plexus</groupId>
                                     <artifactId>plexus-archiver</artifactId>
                                 </artifactItem>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF Fri Jun 18 08:10:13 2010
@@ -13,20 +13,11 @@ Bundle-ClassPath: lib/geronimo-common-2.
  lib/geronimo-system-2.2.1-SNAPSHOT.jar,
  lib/geronimo-util-2.2.1-SNAPSHOT.jar,
  lib/geronimo-deploy-config-2.2.1-SNAPSHOT.jar,
- lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar,
  lib/plexus-archiver-1.0-alpha-7.jar,
  lib/geronimo-crypto-2.2.1-SNAPSHOT.jar,
  lib/slf4j-api-1.4.3.jar,
  lib/slf4j-simple-1.4.3.jar
 Export-Package: 
- javax.enterprise.deploy.model,
- javax.enterprise.deploy.model.exceptions,
- javax.enterprise.deploy.shared,
- javax.enterprise.deploy.shared.factories,
- javax.enterprise.deploy.spi,
- javax.enterprise.deploy.spi.exceptions,
- javax.enterprise.deploy.spi.factories,
- javax.enterprise.deploy.spi.status,
  org.apache.geronimo.common,
  org.apache.geronimo.common.propertyeditor,
  org.apache.geronimo.deployment,

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v22/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v22/pom.xml?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v22/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v22/pom.xml Fri Jun 18 08:10:13 2010
@@ -144,10 +144,6 @@
                                     <version>${geronimoVersion}</version>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.apache.geronimo.specs</groupId>
-                                    <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-                                </artifactItem>
-                                <artifactItem>
                                     <groupId>org.codehaus.plexus</groupId>
                                     <artifactId>plexus-archiver</artifactId>
                                 </artifactItem>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF Fri Jun 18 08:10:13 2010
@@ -26,10 +26,10 @@ Require-Bundle: org.apache.geronimo.runt
  org.eclipse.jem.util,
  org.eclipse.jst.j2ee.core,
  org.eclipse.emf.ecore,
- org.eclipse.hyades.trace.ui;resolution:=optional,
- org.eclipse.tptp.trace.jvmti.client;resolution:=optional,
- org.eclipse.tptp.platform.profile.server.core;resolution:=optional,
- org.eclipse.tptp.platform.jvmti.client;resolution:=optional
+ org.eclipse.hyades.trace.ui;resolution:=optional;visibility:=reexport,
+ org.eclipse.tptp.trace.jvmti.client;resolution:=optional;visibility:=reexport,
+ org.eclipse.tptp.platform.profile.server.core;resolution:=optional;visibility:=reexport,
+ org.eclipse.tptp.platform.jvmti.client;resolution:=optional;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Export-Package: org.apache.geronimo.st.core,
  org.apache.geronimo.st.core.commands,

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=955877&r1=955876&r2=955877&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 Fri Jun 18 08:10:13 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ Licensed to the Apache Software Foundation (ASF) under oneb 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
@@ -130,30 +130,4 @@
     </extension>
 
     
-    <extension
-       point="org.eclipse.hyades.trace.ui.launchConfigMechanismAssociator">
-       <association            
-           launchConfigID = "org.apache.geronimo.st.core.launchConfigurationType">
-   
-           <mechanism mechanismID = "org.eclipse.tptp.trace.ui.jvmpiMechanism"> 
-               <configuration
-                   launchDelegate = "org.eclipse.tptp.trace.ui.internal.launcher.deleg.application.PIAttachLauncherDelegate"
-                   configurationId = "org.eclipse.tptp.trace.ui.jvmpiConfiguration"
-                   associatedAgent = "org.eclipse.tptp.trace.ui.jvmpiAgent"        
-                   filter = "org.eclipse.tptp.platform.profile.server.core.internal.PICollectorFiltration">                
-               </configuration>            
-           </mechanism>        
-           
-           <mechanism mechanismID = "org.eclipse.tptp.trace.jvmti.jvmtiMechanism"> 
-               <configuration
-                   launchDelegate = "org.eclipse.tptp.platform.jvmti.client.internal.launcher.TIAttachLauncherDelegate"
-                   configurationId = "org.eclipse.tptp.trace.jvmti.tiConfiguration"
-                   associatedAgent = "org.eclipse.tptp.platform.jvmti.TIAgent"
-                   filter = "org.eclipse.tptp.platform.profile.server.core.internal.TICollectorFiltration">                            
-               </configuration>            
-           </mechanism>    
-       </association>
-   </extension>
-   
- 
 </plugin>

Modified: 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=955877&r1=955876&r2=955877&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/AbstractGeronimoDeploymentPlanEditor.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/AbstractGeronimoDeploymentPlanEditor.java Fri Jun 18 08:10:13 2010
@@ -16,7 +16,6 @@
  */
 package org.apache.geronimo.st.ui.editors;
 
-
 import java.io.InputStream;
 import java.util.ArrayList;
 
@@ -53,233 +52,253 @@ import org.eclipse.wst.sse.ui.Structured
  */
 public abstract class AbstractGeronimoDeploymentPlanEditor extends FormEditor {
 
-    protected JAXBElement deploymentPlan;
+	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();
+	public AbstractGeronimoDeploymentPlanEditor() {
+		super();
+	}
 
-    abstract protected IDataModelOperation getImportDeploymentPlanOperation(
-            IDataModel model) ;
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @seeorg.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);
+				}
 
-    abstract protected IDataModelProvider getImportDeploymentPlanDataModelProvider();
-	
-    abstract  protected void refreshPage(IFormPage page) ;
+				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());
+			}
+		}
+	}
 
-    abstract protected boolean isValidPage(IFormPage page) ;
+	// 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.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.forms.editor.FormEditor#addPages()
+	 */
+	protected void addPages() {
+		try {
+			doAddPages();
+		} catch (PartInitException e1) {
+			e1.printStackTrace();
+		}
+	}
 
+	/*
+	 * (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 {
+	 * (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 
+				// 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 {
+
+			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");
+					throw new PartInitException(
+							"Error in loading deployment plan");
 				}
-                
-                if (deploymentPlan == null) {    
-                    MessageDialog.openInformation(Display.getDefault().getActiveShell(), Messages.errorOpenDialog, Messages.editorDefault);
-                }
-            }
-        }
-    }
 
-  
+				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);
-                           
-                        }
-                    }
-                }
-            }
-        }
-    }
+		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);
-    }
+	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;
+	abstract public JAXBElement loadDeploymentPlan(IFile file) throws Exception;
+
+	abstract public void saveDeploymentPlan(IFile file) throws Exception;
+
+	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);
+	
+	abstract protected String getRuntimeVersion();
 
 }

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=955877&r1=955876&r2=955877&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 Fri Jun 18 08:10:13 2010
@@ -49,5 +49,5 @@ public interface IGeronimoFormContentLoa
 	public void refreshPage(IFormPage page);
 
 	public boolean isValidPage(IFormPage page);
-
+	
 }

Modified: 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=955877&r1=955876&r2=955877&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/SharedDeploymentPlanEditor.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/SharedDeploymentPlanEditor.java Fri Jun 18 08:10:13 2010
@@ -50,6 +50,8 @@ public class SharedDeploymentPlanEditor 
 	private static Map loaders = new HashMap();
 
 	private IGeronimoFormContentLoader currentLoader = null;
+	
+	private String runtimeVersion = null;
 
 	static {
 		loadExtensionPoints();
@@ -125,6 +127,7 @@ public class SharedDeploymentPlanEditor 
 					if (runtime == null) return null;
 					String version = runtime.getRuntimeType().getVersion();
 					currentLoader = (IGeronimoFormContentLoader) loaders.get(version);
+					runtimeVersion = version;
 				} catch (CoreException e) {
                     Trace.tracePoint("CoreException", "SharedDeploymentPlanEditor.getLoader");
 					e.printStackTrace();
@@ -138,6 +141,10 @@ public class SharedDeploymentPlanEditor 
         Trace.tracePoint("EXIT", "SharedDeploymentPlanEditor.getLoader", currentLoader);
 		return currentLoader;
 	}
+	
+	public String getRuntimeVersion(){
+		return runtimeVersion;
+	}
 
 	@Override
     protected StructuredTextEditor getDeploymentPlanSourcePage() {

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTableSection.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/sections/AbstractTableSection.java?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTableSection.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/AbstractTableSection.java Fri Jun 18 08:10:13 2010
@@ -47,7 +47,8 @@ public abstract class AbstractTableSecti
 
     protected String[] COLUMN_NAMES = new String[] {};
 
-    public Listener sortListener = null;
+    public Listener sortListener = null;   
+    
     
     public AbstractTableSection(Section section) {
         super(section);

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/plugin.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/plugin.properties?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/plugin.properties (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/plugin.properties Fri Jun 18 08:10:13 2010
@@ -18,6 +18,7 @@
 #
 pluginName=Geronimo Server Tools V11 Core Plug-in
 providerName=Apache Software Foundation
+geronimoLaunchConfigurationType=Apache Geronimo
 
 runtimeTypeName=Apache Geronimo v1.1
 runtimeTypeDescription=Apache Geronimo v1.1 supports J2EE 1.2, 1.3 and 1.4.

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=955877&r1=955876&r2=955877&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 Fri Jun 18 08:10:13 2010
@@ -41,27 +41,12 @@
             initialState="stopped" supportsRemoteHosts="true"
             startTimeout="240000" stopTimeout="30000" startBeforePublish="true"
             runtimeTypeId="org.apache.geronimo.runtime.11"
-            launchConfigId="org.apache.geronimo.st.core.launchConfigurationType"
+            launchConfigId="org.apache.geronimo.st.v11.core.launchConfigurationType"
             behaviourClass="org.apache.geronimo.st.v11.core.GeronimoServerBehaviour"
             hasConfiguration="false" launchModes="run,debug,profile">
         </serverType>
     </extension>
     
-    <!-- extension point="org.eclipse.wst.server.core.installableRuntimes">
-        <installableRuntime id="org.apache.geronimo.runtime.tomcat.11"
-            featureVersion="1.1.1"
-            featureId="org.apache.geronimo.installableruntime.tomcat.feature"
-            featureSite="http://www.apache.org/dist/geronimo/eclipse/updates/"
-            path="geronimo-tomcat-j2ee-1.1.1.zip">
-        </installableRuntime>
-        <installableRuntime id="org.apache.geronimo.runtime.jetty.11"
-            featureVersion="1.1.1"
-            featureId="org.apache.geronimo.installableruntime.jetty.feature"
-            featureSite="http://www.apache.org/dist/geronimo/eclipse/updates/"
-            path="geronimo-jetty-j2ee-1.1.1.zip">
-        </installableRuntime>
-    </extension -->
-    
     <extension point="org.eclipse.jst.server.core.runtimeFacetMappings">
         <runtimeFacetMapping
             runtimeTypeId="org.apache.geronimo.runtime.11"
@@ -155,4 +140,29 @@
             postOperationClass="org.apache.geronimo.st.v11.core.operations.ImportDeploymentPlanOperation">
         </operationExtension>
     </extension>
+    
+    <extension
+       point="org.eclipse.hyades.trace.ui.launchConfigMechanismAssociator">
+       <association            
+           launchConfigID = "org.apache.geronimo.st.v11.core.launchConfigurationType">
+   
+           <mechanism mechanismID = "org.eclipse.tptp.trace.ui.jvmpiMechanism"> 
+               <configuration
+                   launchDelegate = "org.eclipse.tptp.trace.ui.internal.launcher.deleg.application.PIAttachLauncherDelegate"
+                   configurationId = "org.eclipse.tptp.trace.ui.jvmpiConfiguration"
+                   associatedAgent = "org.eclipse.tptp.trace.ui.jvmpiAgent"        
+                   filter = "org.eclipse.tptp.platform.profile.server.core.internal.PICollectorFiltration">                
+               </configuration>            
+           </mechanism>        
+           
+           <mechanism mechanismID = "org.eclipse.tptp.trace.jvmti.jvmtiMechanism"> 
+               <configuration
+                   launchDelegate = "org.eclipse.tptp.platform.jvmti.client.internal.launcher.TIAttachLauncherDelegate"
+                   configurationId = "org.eclipse.tptp.trace.jvmti.tiConfiguration"
+                   associatedAgent = "org.eclipse.tptp.platform.jvmti.TIAgent"
+                   filter = "org.eclipse.tptp.platform.profile.server.core.internal.TICollectorFiltration">                            
+               </configuration>            
+           </mechanism>    
+       </association>
+   </extension>
 </plugin>

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=955877&r1=955876&r2=955877&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 Fri Jun 18 08:10:13 2010
@@ -51,23 +51,6 @@
             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

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=955877&r1=955876&r2=955877&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 Fri Jun 18 08:10:13 2010
@@ -155,4 +155,5 @@ public class GeronimoFormContentLoader e
            geronimoPage.refresh();
 	    
     }
+
 }

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/.classpath?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/.classpath Fri Jun 18 08:10:13 2010
@@ -1,5 +1,6 @@
 <?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"/>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF Fri Jun 18 08:10:13 2010
@@ -7,7 +7,7 @@ Bundle-Activator: org.apache.geronimo.st
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.apache.geronimo.runtime.v20,
- org.apache.geronimo.st.v21.core,
+ org.apache.geronimo.st.v21.core;visibility:=reexport,
  org.apache.geronimo.st.core,
  org.apache.geronimo.jee.v21.jaxbmodel,
  org.eclipse.core.runtime,

Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/plugin.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/plugin.properties?rev=955877&r1=955876&r2=955877&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/plugin.properties (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/plugin.properties Fri Jun 18 08:10:13 2010
@@ -18,6 +18,7 @@
 #
 pluginName=Geronimo v2.0 Server Adapter
 providerName=Apache Software Foundation
+geronimoLaunchConfigurationType=Apache Geronimo
 
 runtimeTypeName=Apache Geronimo v2.0
 runtimeTypeDescription=Apache Geronimo v2.0 supports Java EE 5.0.

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=955877&r1=955876&r2=955877&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 Fri Jun 18 08:10:13 2010
@@ -43,7 +43,7 @@
             initialState="stopped" supportsRemoteHosts="true"
             startTimeout="240000" stopTimeout="30000" startBeforePublish="true"
             runtimeTypeId="org.apache.geronimo.runtime.20"
-            launchConfigId="org.apache.geronimo.st.core.launchConfigurationType"
+            launchConfigId="org.apache.geronimo.st.v20.core.launchConfigurationType"
             behaviourClass="org.apache.geronimo.st.v21.core.GeronimoServerBehaviour"
             hasConfiguration="false" launchModes="run,debug,profile">
         </serverType>
@@ -111,5 +111,38 @@
             <facet id="org.apache.geronimo.facet" version="1.2"/>
         </default-facets>
     </extension>
+    
+     <extension
+          point="org.apache.geronimo.st.v21.core.geronimoinfo">
+       <provider
+             class="org.apache.geronimo.st.v20.core.GeronimoV20ServerInfo"
+             versions="2.0">
+       </provider>
+    </extension>
+  
   
+     <extension
+       point="org.eclipse.hyades.trace.ui.launchConfigMechanismAssociator">
+       <association            
+           launchConfigID = "org.apache.geronimo.st.v20.core.launchConfigurationType">
+   
+           <mechanism mechanismID = "org.eclipse.tptp.trace.ui.jvmpiMechanism"> 
+               <configuration
+                   launchDelegate = "org.eclipse.tptp.trace.ui.internal.launcher.deleg.application.PIAttachLauncherDelegate"
+                   configurationId = "org.eclipse.tptp.trace.ui.jvmpiConfiguration"
+                   associatedAgent = "org.eclipse.tptp.trace.ui.jvmpiAgent"        
+                   filter = "org.eclipse.tptp.platform.profile.server.core.internal.PICollectorFiltration">                
+               </configuration>            
+           </mechanism>        
+           
+           <mechanism mechanismID = "org.eclipse.tptp.trace.jvmti.jvmtiMechanism"> 
+               <configuration
+                   launchDelegate = "org.eclipse.tptp.platform.jvmti.client.internal.launcher.TIAttachLauncherDelegate"
+                   configurationId = "org.eclipse.tptp.trace.jvmti.tiConfiguration"
+                   associatedAgent = "org.eclipse.tptp.platform.jvmti.TIAgent"
+                   filter = "org.eclipse.tptp.platform.profile.server.core.internal.TICollectorFiltration">                            
+               </configuration>            
+           </mechanism>    
+       </association>
+   </extension>
 </plugin>

Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/GeronimoServer.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/GeronimoServer.java?rev=955877&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/GeronimoServer.java (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/GeronimoServer.java Fri Jun 18 08:10:13 2010
@@ -0,0 +1,207 @@
+/*
+ * 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.v20.core;
+
+import java.io.File;
+import javax.enterprise.deploy.spi.DeploymentManager;
+import javax.enterprise.deploy.spi.factories.DeploymentFactory;
+
+import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl;
+import org.apache.geronimo.deployment.plugin.jmx.JMXDeploymentManager;
+import org.apache.geronimo.st.core.GeronimoRuntimeDelegate;
+import org.apache.geronimo.st.v21.core.GeronimoServerDelegate;
+import org.apache.geronimo.st.v21.core.GeronimoV21Utils;
+import org.apache.geronimo.st.v21.core.IGeronimoVersionHandler;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.jdt.launching.LibraryLocation;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.util.SocketUtil;
+
+/**
+ * @version $Rev: 554980 $ $Date: 2007-07-10 11:35:58 -0400 (Tue, 10 Jul 2007) $
+ */
+public class GeronimoServer extends GeronimoServerDelegate {
+
+    public static final String PROPERTY_IN_PLACE_SHARED_LIB = "inPlaceSharedLib";
+    public static final String PROPERTY_RUN_FROM_WORKSPACE = "runFromWorkspace";
+
+    private static IGeronimoVersionHandler versionHandler = null;
+
+    private static DeploymentFactory deploymentFactory;
+
+    static {
+        deploymentFactory = new DeploymentFactoryImpl();
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.geronimo.st.core.GenericGeronimoServer#getContextRoot(org.eclipse.wst.server.core.IModule)
+     */
+    public String getContextRoot(IModule module) throws Exception {
+        return GeronimoV21Utils.getContextRoot(module);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.apache.geronimo.st.v21.core.IGeronimoServer#getDeployerURL()
+     */
+    public String getDeployerURL() {
+        return "deployer:geronimo:jmx://" + getServer().getHost() + ":" + getRMINamingPort();
+    }
+
+    @Override
+    public String getVMArgs() {
+        String superVMArgs = super.getVMArgs();
+        if (superVMArgs != null && superVMArgs.trim().length() > 0) {
+            return superVMArgs;
+        }
+
+        String runtimeLocation = getServer().getRuntime().getLocation().toString();
+        GeronimoRuntimeDelegate geronimoRuntimeDelegate = (GeronimoRuntimeDelegate) getServer().getRuntime().getAdapter(GeronimoRuntimeDelegate.class);
+        if (geronimoRuntimeDelegate == null) {
+            geronimoRuntimeDelegate = (GeronimoRuntimeDelegate) getServer().getRuntime().loadAdapter(GeronimoRuntimeDelegate.class,new NullProgressMonitor());
+        }
+        IVMInstall vmInstall = geronimoRuntimeDelegate.getVMInstall();
+
+        LibraryLocation[] libLocations = JavaRuntime.getLibraryLocations(vmInstall);
+        IPath vmLibDir = null;
+        for(int i = 0; i < libLocations.length; i++) {
+            LibraryLocation loc = libLocations[i];
+            IPath libDir = loc.getSystemLibraryPath().removeLastSegments(2);
+            if(libDir.toOSString().endsWith("lib")) {
+                vmLibDir = libDir;
+                break;
+            }
+        }
+
+        String cp = System.getProperty("path.separator");
+
+        //-javaagent:"GERONIMO_BASE/bin/jpa.jar"
+        String javaagent = "";
+        File jpaJar = new File(runtimeLocation + "/bin/jpa.jar");
+        if (jpaJar.exists()) {
+            javaagent = "-javaagent:\"" + runtimeLocation + "/bin/jpa.jar\"";
+        }
+
+        //-Djava.ext.dirs="GERONIMO_BASE/lib/ext;JRE_HOME/lib/ext"
+        String javaExtDirs = "-Djava.ext.dirs=\"" + runtimeLocation + "/lib/ext" + cp + vmLibDir.append("ext").toOSString() + "\"";
+
+        //-Djava.endorsed.dirs="GERONIMO_BASE/lib/endorsed;JRE_HOME/lib/endorsed"
+        String javaEndorsedDirs = "-Djava.endorsed.dirs=\"" + runtimeLocation + "/lib/endorsed" + cp + vmLibDir.append("endorsed").toOSString() + "\"";
+
+        // Specify the minimum memory options for the Geronimo server
+        String memoryOpts = "-Xms256m -Xmx512m -XX:MaxPermSize=128m";
+
+        // Specify GERONIMO_BASE
+        String homeDirectory = "-Dorg.apache.geronimo.home.dir=\"" + runtimeLocation;
+
+        return javaagent + " " + javaExtDirs + " " + javaEndorsedDirs + " " + memoryOpts + " " + homeDirectory;
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.apache.geronimo.st.v21.core.IGeronimoServer#getJMXServiceURL()
+     */
+    public String getJMXServiceURL() {
+        String host = getServer().getHost();
+        return "service:jmx:rmi://" + host + "/jndi/rmi://" + host + ":" + getRMINamingPort() + "/JMXConnector";
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.apache.geronimo.st.v21.core.IGeronimoServer#getJSR88DeployerJar()
+     */
+    public IPath getJSR88DeployerJar() {
+        return getServer().getRuntime().getLocation().append("/lib/jsr88-deploymentfactory.jar");
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.apache.geronimo.st.v21.core.IGeronimoServer#getDeploymentFactory()
+     */
+    public DeploymentFactory getDeploymentFactory() {
+        return deploymentFactory;
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.apache.geronimo.st.v21.core.IGeronimoServer#configureDeploymentManager(javax.enterprise.deploy.spi.DeploymentManager)
+     */
+    public void configureDeploymentManager(DeploymentManager dm) {
+        ((JMXDeploymentManager) dm).setLogConfiguration(true, true);
+        boolean enableInPlace = SocketUtil.isLocalhost(getServer().getHost()) && isRunFromWorkspace();
+        setInPlaceDeployment(dm, enableInPlace);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.apache.geronimo.st.v21.core.IGeronimoServer#getVersionHandler()
+     */
+    public IGeronimoVersionHandler getVersionHandler() {
+        if (versionHandler == null)
+            versionHandler = new GeronimoV20VersionHandler();
+        return versionHandler;
+    }
+
+    public void setInPlaceDeployment(DeploymentManager dm, boolean enable) {
+        ((JMXDeploymentManager) dm).setInPlace(enable);
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.geronimo.st.v21.core.IGeronimoServer#isInPlace()
+     */
+    public boolean isInPlaceSharedLib() {
+        return getAttribute(PROPERTY_IN_PLACE_SHARED_LIB, false);
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.geronimo.st.v21.core.IGeronimoServer#isRunFromWorkspace()
+     */
+    public boolean isRunFromWorkspace() {
+        return getAttribute(PROPERTY_RUN_FROM_WORKSPACE, false);
+    }
+
+    public void setInPlaceSharedLib(boolean enable) {
+        setAttribute(PROPERTY_IN_PLACE_SHARED_LIB, enable);
+    }
+
+    public void setRunFromWorkspace(boolean enable) {
+        setAttribute(PROPERTY_RUN_FROM_WORKSPACE, enable);
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.geronimo.st.core.GeronimoServerDelegate#setDefaults(org.eclipse.core.runtime.IProgressMonitor)
+     */
+    public void setDefaults(IProgressMonitor monitor) {
+        super.setDefaults(monitor);
+        setInPlaceSharedLib(false);
+        setRunFromWorkspace(false);
+    }
+
+    public boolean isNotRedeployJSPFiles() {
+        return getAttribute(PROPERTY_NOT_REDEPLOY_JSP_FILES,false);
+    }
+}
\ No newline at end of file

Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/GeronimoServerBehaviour.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/GeronimoServerBehaviour.java?rev=955877&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/GeronimoServerBehaviour.java (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v20.core/src/main/java/org/apache/geronimo/st/v20/core/GeronimoServerBehaviour.java Fri Jun 18 08:10:13 2010
@@ -0,0 +1,235 @@
+/*
+ * 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.v20.core;
+
+import java.net.URL;
+import java.util.List;
+import java.util.Set;
+
+import javax.management.MBeanServerConnection;
+import javax.naming.directory.NoSuchAttributeException;
+
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.kernel.GBeanNotFoundException;
+import org.apache.geronimo.kernel.InternalKernelException;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.config.Configuration;
+import org.apache.geronimo.kernel.config.InvalidConfigException;
+import org.apache.geronimo.kernel.config.PersistentConfigurationList;
+import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.st.v21.core.Activator;
+import org.apache.geronimo.st.v21.core.GeronimoServerBehaviourDelegate;
+import org.apache.geronimo.st.v21.core.internal.DependencyHelper;
+import org.apache.geronimo.st.v21.core.internal.Trace;
+import org.apache.geronimo.system.jmx.KernelDelegate;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.internal.IModulePublishHelper;
+
+/**
+ * @version $Rev: 540136 $ $Date: 2007-05-21 09:15:31 -0400 (Mon, 21 May 2007) $
+ */
+public class GeronimoServerBehaviour extends GeronimoServerBehaviourDelegate implements IModulePublishHelper {
+
+	private Kernel kernel = null;
+
+	public GeronimoServerBehaviour() {
+		super();
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.apache.geronimo.st.core.GeronimoServerBehaviourDelegate#stopKernel()
+	 */
+	protected void stopKernel() {
+		if (kernel != null) {
+			kernel.shutdown();
+			kernel = null;
+		}
+	}
+
+	/**
+	 * @return
+	 * @throws SecurityException
+	 */
+	protected Kernel getKernel() throws SecurityException {
+		if (kernel == null) {
+			try {
+				MBeanServerConnection connection = getServerConnection();
+				if (connection != null)
+					kernel = new KernelDelegate(connection);
+			} catch (SecurityException e) {
+				throw e;
+			} catch (Exception e) {
+				Trace.trace(Trace.WARNING, "Kernel connection failed. "
+						+ e.getMessage());
+			}
+		}
+		return kernel;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.st.v21.core.IGeronimoServerBehavior#isKernelAlive()
+	 */
+	public boolean isKernelAlive() {
+		try {
+			return getKernel() != null && kernel.isRunning();
+		} catch (SecurityException e) {
+			Trace.trace(Trace.SEVERE, "Invalid username and/or password.", e);
+
+			pingThread.interrupt();
+			if (getServer().getServerState() != IServer.STATE_STOPPED) {
+				forceStopJob(true,e);
+
+			}
+		} catch (Exception e) {
+			Activator.log(Status.WARNING, "Geronimo Server may have been terminated manually outside of workspace.", e);
+			kernel = null;
+		}
+		return false;
+	}
+	
+	private void forceStopJob(boolean b, final SecurityException e) {
+		/* 
+		 *
+		 * Currently, there is another Status is returned by StartJob in Server. 
+		 * The message doesn't contain reason for the exception. 
+		 * So this job is created to show a message(Invalid username and/or password) to user.
+		 *  
+		 * TODO: Need a method to remove the error message thrown by StartJob in Server.
+		 * 
+		 */
+		
+		String jobName = NLS.bind(org.eclipse.wst.server.core.internal.Messages.errorStartFailed, getServer().getName());						
+		
+		//This message has different variable names in WTP 3.0 and 3.1, so we define it here instead of using that in WTP
+		final String jobStartingName =  NLS.bind("Starting {0}", getServer().getName());
+
+		new Job(jobName){
+
+			@Override
+			protected IStatus run(IProgressMonitor monitor) {
+				MultiStatus multiStatus = new  MultiStatus(Activator.PLUGIN_ID, 0, jobStartingName, null);
+				multiStatus.add(new Status(IStatus.ERROR,Activator.PLUGIN_ID,0,"Invalid username and/or password.",e));
+				try{
+					GeronimoServerBehaviour.this.stop(true);
+				}catch (Exception e){
+					multiStatus.add(new Status(IStatus.ERROR,Activator.PLUGIN_ID,0,"Failed to stop server",e));
+				}
+			
+				return multiStatus;
+			}
+		}.schedule();
+		
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.st.v21.core.IGeronimoServerBehavior#isFullyStarted()
+	 */
+	public boolean isFullyStarted() {
+		if (isKernelAlive()) {
+			AbstractNameQuery query = new AbstractNameQuery(PersistentConfigurationList.class.getName());
+			Set configLists = kernel.listGBeans(query);
+			if (!configLists.isEmpty()) {
+				AbstractName on = (AbstractName) configLists.toArray()[0];
+				try {
+					Boolean b = (Boolean) kernel.getAttribute(on, "kernelFullyStarted");
+					return b.booleanValue();
+				} catch (GBeanNotFoundException e) {
+					// ignore
+				} catch (NoSuchAttributeException e) {
+					// ignore
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			} else {
+				Trace.trace(Trace.INFO, "configLists is empty");
+			}
+		}
+		return false;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.apache.geronimo.st.core.GeronimoServerBehaviourDelegate#getRuntimeClass()
+	 */
+	public String getRuntimeClass() {
+		return "org.apache.geronimo.cli.daemon.DaemonCLI";
+	}
+
+	public IPath getPublishDirectory(IModule[] module) {
+		if (module == null || module.length == 0)
+			return null;
+
+		if (getGeronimoServer().isRunFromWorkspace()) {
+			// TODO fix me, see if project root, component root, or output
+			// container should be returned
+			return module[module.length - 1].getProject().getLocation();
+		} else {
+			ClassLoader old = Thread.currentThread().getContextClassLoader();
+			try {
+				Thread.currentThread().setContextClassLoader(getContextClassLoader());
+				String configId = getConfigId(module[0]);
+				Artifact artifact = Artifact.create(configId);
+				AbstractName name = Configuration.getConfigurationAbstractName(artifact);
+				GBeanData data = kernel.getGBeanData(name);
+				URL url = (URL) data.getAttribute("baseURL");
+				return getModulePath(module, url);
+			} catch (InvalidConfigException e) {
+				e.printStackTrace();
+			} catch (GBeanNotFoundException e) {
+				e.printStackTrace();
+			} catch (InternalKernelException e) {
+				e.printStackTrace();
+			} catch (Exception e) {
+				e.printStackTrace();
+			} finally {
+				Thread.currentThread().setContextClassLoader(old);
+			}
+		}
+
+		return null;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.apache.geronimo.st.core.GenericGeronimoServerBehaviour#getContextClassLoader()
+	 */
+	protected ClassLoader getContextClassLoader() {
+		return Kernel.class.getClassLoader();
+	}
+
+	@Override
+    protected List getOrderedModules(IServer server, List modules,
+            List deltaKind) {
+		 DependencyHelper dh = new DependencyHelper();
+         List list = dh.reorderModules(this.getServer(),modules, deltaKind);
+         return list;
+    }
+}
\ No newline at end of file



Mime
View raw message