Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 78396 invoked from network); 19 Jan 2006 14:22:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 19 Jan 2006 14:22:36 -0000 Received: (qmail 9764 invoked by uid 500); 19 Jan 2006 14:22:22 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 9707 invoked by uid 500); 19 Jan 2006 14:22:21 -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 9696 invoked by uid 99); 19 Jan 2006 14:22:21 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jan 2006 06:22:21 -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; Thu, 19 Jan 2006 06:22:20 -0800 Received: (qmail 77955 invoked by uid 65534); 19 Jan 2006 14:21:59 -0000 Message-ID: <20060119142159.77954.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r370474 - in /geronimo/devtools/trunk/modules/eclipse-plugin: etc/ plugins/org.apache.geronimo.j2ee.server.v1/ plugins/org.apache.geronimo.jetty.j2ee.server.v1/ plugins/org.apache.geronimo.jetty.j2ee.server.v1/META-INF/ plugins/org.apache.g... Date: Thu, 19 Jan 2006 14:21:38 -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: Thu Jan 19 06:21:29 2006 New Revision: 370474 URL: http://svn.apache.org/viewcvs?rev=370474&view=rev Log: new plugin wrapper for jetty distro Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/.project geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/META-INF/ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/META-INF/MANIFEST.MF geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/maven.xml (with props) geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.properties (with props) geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.xml (with props) Modified: geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/maven.xml geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/project.properties 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/etc/project.properties URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties?rev=370474&r1=370473&r2=370474&view=diff ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties (original) +++ geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.properties Thu Jan 19 06:21:29 2006 @@ -33,6 +33,7 @@ org.apache.geronimo.j2ee.server.v1_version=1.0.0-SNAPSHOT org.apache.geronimo.runtime.v1_version=1.0.0-SNAPSHOT org.apache.geronimo.ui_version=1.0.0-SNAPSHOT +org.apache.geronimo.jetty.j2ee.server.v1_version=1.0.0-SNAPSHOT ##################################################### # Feature Versions Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/maven.xml URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/maven.xml?rev=370474&r1=370473&r2=370474&view=diff ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/maven.xml (original) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/maven.xml Thu Jan 19 06:21:29 2006 @@ -26,14 +26,13 @@ - - + - + - + Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/project.properties URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/project.properties?rev=370474&r1=370473&r2=370474&view=diff ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/project.properties (original) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.j2ee.server.v1/project.properties Thu Jan 19 06:21:29 2006 @@ -1 +1,2 @@ -maven.jar.manifest=META-INF/MANIFEST.MF \ No newline at end of file +maven.jar.manifest=META-INF/MANIFEST.MF +server.image=geronimo-tomcat-j2ee-${geronimo.version}.zip \ No newline at end of file Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/.project URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/.project?rev=370474&view=auto ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/.project (added) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/.project Thu Jan 19 06:21:29 2006 @@ -0,0 +1,22 @@ + + + org.apache.geronimo.j2ee.server + + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + + Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/META-INF/MANIFEST.MF?rev=370474&view=auto ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/META-INF/MANIFEST.MF (added) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/META-INF/MANIFEST.MF Thu Jan 19 06:21:29 2006 @@ -0,0 +1,7 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Geronimo Jetty Server Plug-in +Bundle-SymbolicName: org.apache.geronimo.jetty.j2ee.server.v1 +Bundle-Version: 1.0.0 +Bundle-Vendor: Apache.org +Bundle-Localization: plugin Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/maven.xml URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/maven.xml?rev=370474&view=auto ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/maven.xml (added) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/maven.xml Thu Jan 19 06:21:29 2006 @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/maven.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/maven.xml ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/maven.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.properties URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.properties?rev=370474&view=auto ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.properties (added) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.properties Thu Jan 19 06:21:29 2006 @@ -0,0 +1,2 @@ +maven.jar.manifest=META-INF/MANIFEST.MF +server.image=geronimo-jetty-j2ee-${geronimo.version}.zip \ No newline at end of file Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.properties ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.xml URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.xml?rev=370474&view=auto ============================================================================== --- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.xml (added) +++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.xml Thu Jan 19 06:21:29 2006 @@ -0,0 +1,33 @@ + + + + ../../etc/project.xml + org.apache.geronimo.jetty.j2ee.server.v1 + org.apache.geronimo.jetty.j2ee.server.v1 + ${org.apache.geronimo.jetty.j2ee.server_version} + + + + ../../../../ + + LICENSE.txt + + + + + \ No newline at end of file Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.xml ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.jetty.j2ee.server.v1/project.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml 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=370474&r1=370473&r2=370474&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 Thu Jan 19 06:21:29 2006 @@ -110,7 +110,7 @@ installDir.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { getRuntimeDelegate().getRuntimeWorkingCopy().setLocation(new Path(installDir.getText())); - // validate(); + validate(); } }); @@ -123,7 +123,7 @@ dialog.setMessage(Messages.installDir); dialog.setFilterPath(installDir.getText()); String selectedDirectory = dialog.open(); - if (selectedDirectory != null) + if (selectedDirectory != null) installDir.setText(selectedDirectory); } }); @@ -196,23 +196,36 @@ } } - - public void enter() { - if (getRuntimeDelegate() != null) - getRuntimeDelegate().getRuntimeWorkingCopy().setName(createName()); - + + protected void validate() { + //TODO validate installDir + //TODO group enablement/disablement + } + + private void validateDecorators() { for (int i = 0; i < fDecorators.length; i++) { if (fDecorators[i].validate()) return; } + //getRuntimeDelegate().setServerDefinitionId(getRuntimeDelegate().getRuntime().getRuntimeType().getId()); + //getRuntimeDelegate().setServerInstanceProperties(getValues()); } + /* (non-Javadoc) + * @see org.eclipse.wst.server.ui.wizard.WizardFragment#enter() + */ + public void enter() { + if (getRuntimeDelegate() != null) + getRuntimeDelegate().getRuntimeWorkingCopy().setName(createName()); + validateDecorators(); + } + + /* (non-Javadoc) + * @see org.eclipse.wst.server.ui.wizard.WizardFragment#exit() + */ public void exit() { // validate to save latest values - for (int i = 0; i < fDecorators.length; i++) { - if (fDecorators[i].validate()) - return; - } + validateDecorators(); } private GenericServerRuntime getRuntimeDelegate() {