geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r406506 - in /geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config: KernelConfigurationManager.java SimpleConfigurationManager.java
Date Mon, 15 May 2006 02:47:03 GMT
Author: ammulder
Date: Sun May 14 19:47:02 2006
New Revision: 406506

URL: http://svn.apache.org/viewcvs?rev=406506&view=rev
Log:
Make sure that a module is marked as started in config.xml if it's redeployed
  with a new version (GERONIMO-1905)

Modified:
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java

Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java?rev=406506&r1=406505&r2=406506&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java
(original)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java
Sun May 14 19:47:02 2006
@@ -118,10 +118,13 @@
         }
     }
 
-    protected void migrateConfiguration(Artifact oldName, Artifact newName, Configuration
configuration) throws NoSuchConfigException {
-        super.migrateConfiguration(oldName, newName, configuration);
+    protected void migrateConfiguration(Artifact oldName, Artifact newName, Configuration
configuration, boolean running) throws NoSuchConfigException {
+        super.migrateConfiguration(oldName, newName, configuration, running);
         if (configurationList != null) {
             configurationList.migrateConfiguration(oldName, newName, configuration);
+            if(running) {
+                configurationList.startConfiguration(newName);
+            }
         }
     }
 

Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java?rev=406506&r1=406505&r2=406506&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
(original)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
Sun May 14 19:47:02 2006
@@ -1011,7 +1011,7 @@
                 configurations.put(newConfigurationId, newConfiguration);
 
                 // migrate the configuration settings
-                migrateConfiguration(existingConfigurationId, newConfigurationId, newConfiguration);
+                migrateConfiguration(existingConfigurationId, newConfigurationId, newConfiguration,
started.contains(existingConfigurationId));
             } catch (Exception e) {
                 monitor.failed(configurationId, e);
                 results.addFailed(configurationId, e);
@@ -1177,7 +1177,7 @@
         return results;
     }
 
-    protected void migrateConfiguration(Artifact oldName, Artifact newName, Configuration
configuration) throws NoSuchConfigException {
+    protected void migrateConfiguration(Artifact oldName, Artifact newName, Configuration
configuration, boolean running) throws NoSuchConfigException {
     }
 
     private static LinkedHashSet getResolvedParentIds(Configuration configuration) {



Mime
View raw message