geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r987025 - /geronimo/server/branches/2.2/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
Date Thu, 19 Aug 2010 05:58:13 GMT
Author: genspring
Date: Thu Aug 19 05:58:12 2010
New Revision: 987025

URL: http://svn.apache.org/viewvc?rev=987025&view=rev
Log:
Additional patch for  	 GERONIMO-5504,  thanks Viola for the patch.

Modified:
    geronimo/server/branches/2.2/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java

Modified: geronimo/server/branches/2.2/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java?rev=987025&r1=987024&r2=987025&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
(original)
+++ geronimo/server/branches/2.2/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
Thu Aug 19 05:58:12 2010
@@ -513,10 +513,11 @@ public class StartServerMojo
         }
         ServerInfo serverInfo = new BasicServerInfo(geronimoHome.getAbsolutePath(), false);
       
         
-        PluginAttributeStore attributeStore = new LocalAttributeManager(serverInstance.getConfigFile(),
serverInstance.getConfigSubstitutionsFile(),
+        LocalAttributeManager attributeStore = new LocalAttributeManager(serverInstance.getConfigFile(),
serverInstance.getConfigSubstitutionsFile(),
                 serverInstance.getConfigSubstitutionsPrefix(),
                 false,
                 serverInfo);
+        attributeStore.load();
         for (ModuleType module : overrides.getModule()) {
             Artifact artifact = Artifact.create(module.getName());
             attributeStore.setModuleGBeans(artifact, module.getGbean(), module.isLoad(),
module.getCondition());



Mime
View raw message