Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 89613 invoked from network); 28 Jan 2008 02:11:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 28 Jan 2008 02:11:50 -0000 Received: (qmail 52665 invoked by uid 500); 28 Jan 2008 02:11:41 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 52527 invoked by uid 500); 28 Jan 2008 02:11:41 -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 52516 invoked by uid 99); 28 Jan 2008 02:11:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Jan 2008 18:11:41 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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; Mon, 28 Jan 2008 02:11:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2A34F1A9842; Sun, 27 Jan 2008 18:11:29 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r615705 - 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/ geronimo-plugin/src/main/java/org/apache/geronimo/... Date: Mon, 28 Jan 2008 02:11:28 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080128021129.2A34F1A9842@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Sun Jan 27 18:11:26 2008 New Revision: 615705 URL: http://svn.apache.org/viewvc?rev=615705&view=rev Log: GERONIMO-3784 fix a couple bugs in scripting deploy plugin commands Modified: geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ListConfigurationsCommand.groovy geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandInstallCAR.java geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Modified: geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ListConfigurationsCommand.groovy URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ListConfigurationsCommand.groovy?rev=615705&r1=615704&r2=615705&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ListConfigurationsCommand.groovy (original) +++ geronimo/server/trunk/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ListConfigurationsCommand.groovy Sun Jan 27 18:11:26 2008 @@ -58,6 +58,7 @@ if (mavenRepoURL) { plugins = command.getPluginCategories(mavenRepoURL, connection.getDeploymentManager(), consoleReader) + repo = mavenRepoURL } else { io.out.println("Listing configurations from Geronimo server") Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandInstallCAR.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandInstallCAR.java?rev=615705&r1=615704&r2=615705&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandInstallCAR.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/CommandInstallCAR.java Sun Jan 27 18:11:26 2008 @@ -26,6 +26,7 @@ import org.apache.geronimo.common.DeploymentException; import org.apache.geronimo.deployment.plugin.GeronimoDeploymentManager; import org.apache.geronimo.kernel.repository.Artifact; +import org.apache.geronimo.kernel.repository.MissingDependencyException; import org.apache.geronimo.system.plugin.DownloadResults; import jline.ConsoleReader; @@ -106,14 +107,14 @@ consoleReader.printNewline(); if (!results.isFailed()) { DeployUtils.println("**** Installation Complete!", 0, consoleReader); - + for (MissingDependencyException e : results.getSkippedPlugins()) { + DeployUtils.println(e.getMessage(), 0, consoleReader); + } for (Artifact uri: results.getDependenciesPresent()) { DeployUtils.println("Used existing: " + uri, 0, consoleReader); - } for (Artifact uri: results.getDependenciesInstalled()) { DeployUtils.println("Installed new: " + uri, 0, consoleReader); - } consoleReader.printNewline(); if (results.getTotalDownloadBytes() > 0 && time > 0) { Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?rev=615705&r1=615704&r2=615705&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Sun Jan 27 18:11:26 2008 @@ -576,7 +576,7 @@ } toInstall.add(metadata); } catch (MissingDependencyException e) { - //ignore + poller.addSkippedConfigID(e); } }