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 2007/10/31 00:54:40 UTC

svn commit: r590516 - /geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java

Author: djencks
Date: Tue Oct 30 16:54:33 2007
New Revision: 590516

URL: http://svn.apache.org/viewvc?rev=590516&view=rev
Log:
GERONIMO-3559 Read in previous config.xml so we extend it rather than replacing it when assembling a server

Modified:
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java?rev=590516&r1=590515&r2=590516&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java Tue Oct 30 16:54:33 2007
@@ -191,6 +191,7 @@
                 serverInfo);
         ThreadPool threadPool = null;
         LocalAttributeManager attributeStore = new LocalAttributeManager(configFile, configSubstitutionsFileName, configSubstitutionsPrefix, false, serverInfo);
+        attributeStore.load();
         ConfigurationManager configurationManager = new KernelConfigurationManager(kernel,
                 Collections.singleton(targetStore),
                 attributeStore,