You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/01/28 03:11:28 UTC
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/...
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);
}
}