geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r369397 - in /geronimo/trunk/modules/system/src: java/org/apache/geronimo/system/configuration/LocalAttributeManager.java test/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java
Date Mon, 16 Jan 2006 08:32:54 GMT
Author: djencks
Date: Mon Jan 16 00:32:51 2006
New Revision: 369397

URL: http://svn.apache.org/viewcvs?rev=369397&view=rev
Log:
GERONIMO-1455  Decouple PersistentConfigurationList and ManageagleAttributeStore

Modified:
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
    geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java?rev=369397&r1=369396&r2=369397&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
(original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
Mon Jan 16 00:32:51 2006
@@ -104,9 +104,11 @@
         if (configuration == null) {
             return gbeanDatas;
         }
-        if (!configuration.isLoad()) {
-            return Collections.EMPTY_LIST;
-        }
+// IMO (DJ) the following lines mix the config.list and config.xml functionalities for no
reason.
+// They also cause GERONIMO-1455       
+//        if (!configuration.isLoad()) {
+//            return Collections.EMPTY_LIST;
+//        }
 
         // index the incoming datas
         Map datasByName = new HashMap();

Modified: geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java?rev=369397&r1=369396&r2=369397&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java
(original)
+++ geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/configuration/LocalAttributeManagerTest.java
Mon Jan 16 00:32:51 2006
@@ -71,8 +71,9 @@
         localAttributeManager.removeConfiguration(configurationName.toString());
 
         // should not load
-        newDatas = new HashSet(localAttributeManager.setAttributes(configurationName, originalDatas,
getClass().getClassLoader()));
-        assertEquals(0, newDatas.size());
+// The next lines mix the "load" question with the "what attributes are overridden" question.
 Please answer them separately.       
+//        newDatas = new HashSet(localAttributeManager.setAttributes(configurationName, originalDatas,
getClass().getClassLoader()));
+//        assertEquals(0, newDatas.size());
     }
 
     public void testGBeanShouldLoad() throws Exception {



Mime
View raw message