You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by pm...@apache.org on 2007/09/22 22:48:25 UTC
svn commit: r578495 -
/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
Author: pmcmahan
Date: Sat Sep 22 13:48:24 2007
New Revision: 578495
URL: http://svn.apache.org/viewvc?rev=578495&view=rev
Log:
GERONIMO-3413 fix diagnositc message provided when a plugin cannot be installed
Modified:
geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?rev=578495&r1=578494&r2=578495&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Sat Sep 22 13:48:24 2007
@@ -658,22 +658,24 @@
List<PrerequisiteType> prereqs = metadata.getPrerequisite();
for (PrerequisiteType prereq : prereqs) {
if (artifactResolver.queryArtifacts(toArtifact(prereq.getId())).length == 0) {
- log.info("Required configuration '" + prereq.getId() + "' is not installed.");
+ Artifact prereqId = toArtifact(prereq.getId());
+ log.info("Required configuration '" + prereqId + "' is not installed.");
throw new MissingDependencyException(
- "Required configuration '" + prereq.getId() + "' is not installed.");
+ "Required configuration '" + prereqId + "' is not installed.");
}
}
+ Artifact moduleId = toArtifact(metadata.getModuleId());
// 3. Check that we meet the Geronimo, JVM versions
if (metadata.getGeronimoVersion().size() > 0 && !checkGeronimoVersions(metadata.getGeronimoVersion())) {
- log.info("Cannot install plugin " + metadata.getModuleId() + " on Geronimo " + serverInfo.getVersion());
+ log.info("Cannot install plugin " + moduleId + " on Geronimo " + serverInfo.getVersion());
throw new MissingDependencyException(
- "Cannot install plugin " + metadata.getModuleId() + " on Geronimo " + serverInfo.getVersion());
+ "Cannot install plugin " + moduleId + " on Geronimo " + serverInfo.getVersion());
}
if (metadata.getJvmVersion().size() > 0 && !checkJVMVersions(metadata.getJvmVersion())) {
- log.info("Cannot install plugin " + metadata.getModuleId() + " on JVM " + System.getProperty(
+ log.info("Cannot install plugin " + moduleId + " on JVM " + System.getProperty(
"java.version"));
throw new MissingDependencyException(
- "Cannot install plugin " + metadata.getModuleId() + " on JVM " + System.getProperty(
+ "Cannot install plugin " + moduleId+ " on JVM " + System.getProperty(
"java.version"));
}
}