You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/08/04 20:31:04 UTC
svn commit: r428832 - in
/geronimo/sandbox/svkmerge/m2migration/modules/system/src: ./
java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
Author: jdillon
Date: Fri Aug 4 11:31:04 2006
New Revision: 428832
URL: http://svn.apache.org/viewvc?rev=428832&view=rev
Log:
r630@jason-dillons-computer (orig r427999): jdillon | 2006-08-02 07:15:34 -0700
r615@dyn456093 (orig r427714): ammulder | 2006-08-01 13:32:17 -0700
Merge GERONIMO-2261 and GERONIMO-2243 to trunk
Modified:
geronimo/sandbox/svkmerge/m2migration/modules/system/src/ (props changed)
geronimo/sandbox/svkmerge/m2migration/modules/system/src/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
Propchange: geronimo/sandbox/svkmerge/m2migration/modules/system/src/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Aug 4 11:31:04 2006
@@ -1 +1 @@
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/system/src:427991
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/system/src:427999
Modified: geronimo/sandbox/svkmerge/m2migration/modules/system/src/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/system/src/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?rev=428832&r1=428831&r2=428832&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/system/src/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/system/src/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Fri Aug 4 11:31:04 2006
@@ -1351,7 +1351,7 @@
if (moduleId != null) {
artifact = Artifact.create(moduleId);
// Tests, etc. don't need to have a ConfigurationManager
- installed = configManager != null && configManager.isLoaded(artifact);
+ installed = configManager != null && configManager.isInstalled(artifact);
}
log.trace("Checking "+moduleId+": installed="+installed+", eligible="+eligible);
PluginMetadata data = new PluginMetadata(getChildText(plugin, "name"),