Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 58147 invoked from network); 11 Feb 2007 00:08:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Feb 2007 00:08:45 -0000 Received: (qmail 36200 invoked by uid 500); 11 Feb 2007 00:08:52 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 36165 invoked by uid 500); 11 Feb 2007 00:08:52 -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 36154 invoked by uid 99); 11 Feb 2007 00:08:52 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Feb 2007 16:08:52 -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 [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Feb 2007 16:08:44 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id AF7AD1A981A; Sat, 10 Feb 2007 16:08:24 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r505802 - /geronimo/server/branches/1.2/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java Date: Sun, 11 Feb 2007 00:08:24 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070211000824.AF7AD1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jdillon Date: Sat Feb 10 16:08:23 2007 New Revision: 505802 URL: http://svn.apache.org/viewvc?view=rev&rev=505802 Log: Fix for option set handling when there is more than one option (this was applied to trunk a while ago) Modified: geronimo/server/branches/1.2/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java Modified: geronimo/server/branches/1.2/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java?view=diff&rev=505802&r1=505801&r2=505802 ============================================================================== --- geronimo/server/branches/1.2/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java (original) +++ geronimo/server/branches/1.2/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java Sat Feb 10 16:08:23 2007 @@ -341,10 +341,10 @@ List selected = new ArrayList(); while (stok.hasMoreTokens()) { String id = stok.nextToken(); - OptionSet set = (OptionSet)map.get(options); + OptionSet set = (OptionSet)map.get(id); if (set == null) { - if ("default".equals(options)) { + if ("default".equals(id)) { log.debug("Default optionSet selected, but no optionSet defined with that id; ignoring"); } else {