Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 7907 invoked from network); 25 Nov 2008 21:59:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Nov 2008 21:59:50 -0000 Received: (qmail 72497 invoked by uid 500); 25 Nov 2008 22:00:00 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 72455 invoked by uid 500); 25 Nov 2008 22:00:00 -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 72446 invoked by uid 99); 25 Nov 2008 22:00:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Nov 2008 14:00:00 -0800 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; Tue, 25 Nov 2008 21:58:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6CBD22388870; Tue, 25 Nov 2008 13:59:29 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r720620 - in /geronimo/server/trunk/framework/modules: geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/ Date: Tue, 25 Nov 2008 21:59:29 -0000 To: scm@geronimo.apache.org From: linsun@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081125215929.6CBD22388870@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: linsun Date: Tue Nov 25 13:59:28 2008 New Revision: 720620 URL: http://svn.apache.org/viewvc?rev=720620&view=rev Log: GERONIMO-4282 add display of application plugins at functional centric mode, to be consistent as admin console Modified: geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/AssembleServerCommand.groovy geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java Modified: geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/AssembleServerCommand.groovy URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/AssembleServerCommand.groovy?rev=720620&r1=720619&r2=720620&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/AssembleServerCommand.groovy (original) +++ geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/AssembleServerCommand.groovy Tue Nov 25 13:59:28 2008 @@ -105,14 +105,20 @@ def pluginsToInstall; if (mode.compareTo("1") == 0) { - io.out.println('Listing plugin groups from the local Geronimo server') + io.out.println('Listing plugin groups and application plugins from the local Geronimo server') def pluginGroups = variables.get('LocalPluginGroups') + def appPlugins = variables.get('LocalAppPlugins') if (refreshList || !pluginGroups) { pluginGroups = command.getLocalPluginGroups(connection.getDeploymentManager(), consoleReader) variables.parent.set('LocalPluginGroups', pluginGroups) } - pluginsToInstall = command.getInstallList(pluginGroups, consoleReader, null) + + if (refreshList || !appPlugins) { + appPlugins = command.getLocalApplicationPlugins(connection.getDeploymentManager(), consoleReader) + variables.parent.set('LocalAppPlugins', appPlugins) + } + pluginsToInstall = command.getInstallList(pluginGroups, appPlugins, consoleReader, null) } else if (mode.compareTo("2") == 0) { io.out.println('Listing application plugins from the local Geronimo server') Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java?rev=720620&r1=720619&r2=720620&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandListConfigurations.java Tue Nov 25 13:59:28 2008 @@ -221,6 +221,18 @@ return categories; } + public PluginListType getInstallList(PluginListType plugins1, PluginListType plugins2, ConsoleReader consoleReader, String repo) throws IOException { + PluginListType plugins = new PluginListType(); + for (PluginType metadata : plugins1.getPlugin()) { + plugins.getPlugin().add(metadata); + } + + for (PluginType metadata : plugins2.getPlugin()) { + plugins.getPlugin().add(metadata); + } + + return getInstallList(plugins, consoleReader, repo); + } public PluginListType getInstallList(PluginListType plugins, ConsoleReader consoleReader, String repo) throws IOException { Map> categories = writePluginList(plugins, consoleReader); List defaultRepoLocations = plugins.getDefaultRepository();