geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r544586 - in /geronimo/server/trunk/modules: geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/ geronimo-system/src/main/java/org/apache/geronimo/system/configuration/
Date Tue, 05 Jun 2007 18:26:53 GMT
Author: dwoods
Date: Tue Jun  5 11:26:52 2007
New Revision: 544586

URL: http://svn.apache.org/viewvc?view=rev&rev=544586
Log:
GERONIMO-3212 - Module config can not be removed from config.xml when undeploy offline

Modified:
    geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java

Modified: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java?view=diff&rev=544586&r1=544585&r2=544586
==============================================================================
--- geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java
(original)
+++ geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java
Tue Jun  5 11:26:52 2007
@@ -39,7 +39,6 @@
 import org.apache.geronimo.kernel.repository.ArtifactManager;
 import org.apache.geronimo.kernel.repository.ArtifactResolver;
 import org.apache.geronimo.kernel.repository.DefaultArtifactResolver;
-import org.apache.geronimo.kernel.repository.Repository;
 
 /**
  * The standard non-editable ConfigurationManager implementation.  That is,
@@ -247,6 +246,9 @@
     protected void unload(Configuration configuration) {
         Artifact configurationId = configuration.getId();
         unload(configurationId);
+        if (configurationList != null) {
+            configurationList.removeConfiguration( configurationId );
+        }
     }
 
     private void unload(Artifact configurationId) {

Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java?view=diff&rev=544586&r1=544585&r2=544586
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java
(original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java
Tue Jun  5 11:26:52 2007
@@ -46,7 +46,6 @@
 import org.apache.geronimo.kernel.config.InvalidConfigException;
 import org.apache.geronimo.kernel.config.NoSuchConfigException;
 import org.apache.geronimo.kernel.config.IOUtil;
-import org.apache.geronimo.kernel.config.PersistentConfigurationList;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.FileWriteMonitor;
 import org.apache.geronimo.kernel.repository.WritableListableRepository;
@@ -360,14 +359,6 @@
                 // Directory is not empty.  No need to check any more parent directories
                 break;
             }
-        }
-
-        try {
-            // Is this the right way to get hold of PersistentConfigurationList?
-            PersistentConfigurationList configList = (PersistentConfigurationList) kernel.getGBean(PersistentConfigurationList.class);
-            if(!configList.hasGBeanAttributes(configId)) configList.removeConfiguration(configId);
-        } catch (Exception e) {
-            log.warn("Unable to remove configuration from persistent configurations. id =
"+configId, e);
         }
 
         if (configurationInfo != null) {



Mime
View raw message