Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 21202 invoked from network); 18 Jan 2006 21:53:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 18 Jan 2006 21:53:12 -0000 Received: (qmail 21205 invoked by uid 500); 18 Jan 2006 21:53:11 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 21179 invoked by uid 500); 18 Jan 2006 21:53:11 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 21168 invoked by uid 99); 18 Jan 2006 21:53:11 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jan 2006 13:53:11 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 18 Jan 2006 13:53:10 -0800 Received: (qmail 21029 invoked by uid 65534); 18 Jan 2006 21:52:50 -0000 Message-ID: <20060118215250.21022.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r370274 - /geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoServerRuntimeWizardFragment.java Date: Wed, 18 Jan 2006 21:52:49 -0000 To: scm@geronimo.apache.org From: sppatel@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: sppatel Date: Wed Jan 18 13:52:46 2006 New Revision: 370274 URL: http://svn.apache.org/viewcvs?rev=370274&view=rev Log: more wizard fragment updates Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoServerRuntimeWizardFragment.java Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoServerRuntimeWizardFragment.java URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoServerRuntimeWizardFragment.java?rev=370274&r1=370273&r2=370274&view=diff ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoServerRuntimeWizardFragment.java (original) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.ui/src/org/apache/geronimo/ui/internal/GeronimoServerRuntimeWizardFragment.java Wed Jan 18 13:52:46 2006 @@ -15,6 +15,7 @@ */ package org.apache.geronimo.ui.internal; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime; @@ -93,6 +94,8 @@ fDecorators[0] = new JRESelectDecorator(getRuntimeDelegate()); GenericServerComposite composite = new GenericServerComposite(parent, fDecorators); + + //TODO Overide JRESelectDecorator to validate only 1.4.2 should be selected Label label = new Label(composite, SWT.NONE); label.setText(Messages.installDir); @@ -106,7 +109,7 @@ installDir.setLayoutData(data); installDir.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { - // runtimeWC.setLocation(new Path(installDir.getText())); + getRuntimeDelegate().getRuntimeWorkingCopy().setLocation(new Path(installDir.getText())); // validate(); } }); @@ -168,12 +171,13 @@ public void widgetSelected(SelectionEvent se) { if (installDir != null && isValidLocation()) { try { + Path installPath = new Path(installDir.getText()); if(tomcat.getSelection()) { - gWithTomcat.install(new Path(installDir.getText()), new NullProgressMonitor()); + gWithTomcat.install(installPath, new NullProgressMonitor()); } else { - gWithJetty.install(new Path(installDir.getText()), new NullProgressMonitor()); + gWithJetty.install(installPath, new NullProgressMonitor()); } - //TODO update installDir + updateInstallDir(installPath); } catch (Exception e) { Trace.trace(Trace.SEVERE, "Error installing runtime", e); } @@ -182,6 +186,11 @@ boolean isValidLocation() { return true; + } + + void updateInstallDir(IPath installPath) { + installPath = installPath.append("geronimo-1.0"); + installDir.setText(installPath.toOSString()); } }); }