You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2005/12/11 05:59:35 UTC
svn commit: r355911 - in /geronimo/branches/1.0:
configs/j2ee-system/src/plan/plan.xml
modules/kernel/src/java/org/apache/geronimo/kernel/config/EditableConfigurationManagerImpl.java
Author: ammulder
Date: Sat Dec 10 20:59:33 2005
New Revision: 355911
URL: http://svn.apache.org/viewcvs?rev=355911&view=rev
Log:
Merge config manager change from HEAD
Modified:
geronimo/branches/1.0/configs/j2ee-system/src/plan/plan.xml
geronimo/branches/1.0/modules/kernel/src/java/org/apache/geronimo/kernel/config/EditableConfigurationManagerImpl.java
Modified: geronimo/branches/1.0/configs/j2ee-system/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/j2ee-system/src/plan/plan.xml?rev=355911&r1=355910&r2=355911&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/j2ee-system/src/plan/plan.xml (original)
+++ geronimo/branches/1.0/configs/j2ee-system/src/plan/plan.xml Sat Dec 10 20:59:33 2005
@@ -37,7 +37,7 @@
<gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
<!-- Configuration Manager service -->
- <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.ConfigurationManagerImpl">
+ <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.EditableConfigurationManagerImpl">
<reference name="Stores">
<gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name>
</reference>
Modified: geronimo/branches/1.0/modules/kernel/src/java/org/apache/geronimo/kernel/config/EditableConfigurationManagerImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/kernel/src/java/org/apache/geronimo/kernel/config/EditableConfigurationManagerImpl.java?rev=355911&r1=355910&r2=355911&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/kernel/src/java/org/apache/geronimo/kernel/config/EditableConfigurationManagerImpl.java (original)
+++ geronimo/branches/1.0/modules/kernel/src/java/org/apache/geronimo/kernel/config/EditableConfigurationManagerImpl.java Sat Dec 10 20:59:33 2005
@@ -38,8 +38,6 @@
}
public void addGBeanToConfiguration(URI configID, GBeanData gbean, boolean start) throws InvalidConfigException {
- //todo: when able to, save new GBean data in attribute store rather than in serialized state
- //that is, replace the code below with only calls to the attribute store
try {
ObjectName name = Configuration.getConfigurationObjectName(configID);
kernel.invoke(name, "addGBean", new Object[]{gbean, start ? Boolean.TRUE : Boolean.FALSE}, new String[]{GBeanData.class.getName(), boolean.class.getName()});