Return-Path: 
 <scm-return-43912-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 23190 invoked from network); 26 Aug 2010 08:17:21 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 26 Aug 2010 08:17:21 -0000
Received: (qmail 84638 invoked by uid 500); 26 Aug 2010 08:17:21 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 84536 invoked by uid 500); 26 Aug 2010 08:17:18 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 84529 invoked by uid 99); 26 Aug 2010 08:17:18 -0000
Received: from Unknown (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Aug 2010 08:17:18 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Aug 2010 08:17:00 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6AB1723889B6; Thu, 26 Aug 2010 08:15:41 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r989524 - in
 /geronimo/devtools/eclipse-plugin/trunk/plugins:
 org.apache.geronimo.st.ui/
 org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/
 org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/...
Date: Thu, 26 Aug 2010 08:15:41 -0000
To: scm@geronimo.apache.org
From: delos@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100826081541.6AB1723889B6@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: delos
Date: Thu Aug 26 08:15:40 2010
New Revision: 989524

URL: http://svn.apache.org/viewvc?rev=989524&view=rev
Log:
GERONIMODEVTOOLS-669 Modification to VM arguements is lost

Removed:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/sections/ServerVMArgsSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerVMArgsSection.java
Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/GeronimoLaunchConfigurationTabGroup.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/GeronimoLaunchConfigurationTabGroup.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml?rev=989524&r1=989523&r2=989524&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml Thu Aug 26 08:15:40 2010
@@ -176,17 +176,6 @@
     </extension>
     
     <extension point="org.eclipse.wst.server.ui.editorPageSections">
-        <section id="org.apache.server.geronimo.vmargs" order="40"
-            insertionId="org.eclipse.wst.server.editor.overview.right"
-            typeIds="org.apache.geronimo.server.11,
-                     org.apache.geronimo.server.20,
-                     org.apache.geronimo.server.21,
-                     org.apache.geronimo.server.22"
-            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.11,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/GeronimoLaunchConfigurationTabGroup.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/GeronimoLaunchConfigurationTabGroup.java?rev=989524&r1=989523&r2=989524&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/GeronimoLaunchConfigurationTabGroup.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/main/java/org/apache/geronimo/st/ui/internal/GeronimoLaunchConfigurationTabGroup.java Thu Aug 26 08:15:40 2010
@@ -16,6 +16,9 @@
  */
 package org.apache.geronimo.st.ui.internal;
 
+import org.apache.geronimo.st.core.GeronimoServerDelegate;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
 import org.eclipse.debug.ui.CommonTab;
 import org.eclipse.debug.ui.EnvironmentTab;
@@ -24,6 +27,11 @@ import org.eclipse.debug.ui.ILaunchConfi
 import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
 import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
 import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
+import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerUtil;
 import org.eclipse.wst.server.ui.ServerLaunchConfigurationTab;
 
 /**
@@ -53,5 +61,22 @@ public class GeronimoLaunchConfiguration
 		tabs[5].setLaunchConfigurationDialog(dialog);
 		setTabs(tabs);
 	}
+	
+    public void performApply(ILaunchConfigurationWorkingCopy configuration) {
+        //need to save all values to Geronimo-specific arguments. Eg, VMArguments
+         try {
+             super.performApply(configuration);
+             
+             IServer server = ServerUtil.getServer(configuration);
+             GeronimoServerDelegate sd = (GeronimoServerDelegate) server.getAdapter(GeronimoServerDelegate.class);
+             String oldValue = sd.getVMArgs();
+             String newValue = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, oldValue);
+             sd.setVMArgs(newValue);     
+                       
+         } catch (CoreException e) {
+        	  MessageDialog.openError(Display.getCurrent().getActiveShell(),"Error", e.getMessage());
+         }
+         
+     }
 
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml?rev=989524&r1=989523&r2=989524&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml Thu Aug 26 08:15:40 2010
@@ -158,14 +158,6 @@
     </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.30"
-            class="org.apache.geronimo.st.v30.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.30"

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/GeronimoLaunchConfigurationTabGroup.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/GeronimoLaunchConfigurationTabGroup.java?rev=989524&r1=989523&r2=989524&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/GeronimoLaunchConfigurationTabGroup.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/GeronimoLaunchConfigurationTabGroup.java Thu Aug 26 08:15:40 2010
@@ -16,6 +16,9 @@
  */
 package org.apache.geronimo.st.v30.ui.internal;
 
+import org.apache.geronimo.st.v30.core.GeronimoServerDelegate;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
 import org.eclipse.debug.ui.CommonTab;
 import org.eclipse.debug.ui.EnvironmentTab;
@@ -24,6 +27,11 @@ import org.eclipse.debug.ui.ILaunchConfi
 import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
 import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
 import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
+import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerUtil;
 import org.eclipse.wst.server.ui.ServerLaunchConfigurationTab;
 
 /**
@@ -53,5 +61,22 @@ public class GeronimoLaunchConfiguration
         tabs[5].setLaunchConfigurationDialog(dialog);
         setTabs(tabs);
     }
+    
+    public void performApply(ILaunchConfigurationWorkingCopy configuration) {
+        //need to save all values to Geronimo-specific arguments. Eg, VMArguments
+         try {
+             super.performApply(configuration);
+             
+             IServer server = ServerUtil.getServer(configuration);
+             GeronimoServerDelegate sd = (GeronimoServerDelegate) server.getAdapter(GeronimoServerDelegate.class);
+             String oldValue = sd.getVMArgs();
+             String newValue = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, oldValue);
+             sd.setVMArgs(newValue);     
+                       
+         } catch (CoreException e) {
+        	  MessageDialog.openError(Display.getCurrent().getActiveShell(),"Error", e.getMessage());
+         }
+         
+     }
 
 }