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/11/16 19:52:37 UTC

svn commit: r595776 - /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java

Author: djencks
Date: Fri Nov 16 10:52:37 2007
New Revision: 595776

URL: http://svn.apache.org/viewvc?rev=595776&view=rev
Log:
handle comments in gbean elements

Modified:
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java?rev=595776&r1=595775&r2=595776&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/GBeanOverride.java Fri Nov 16 10:52:37 2007
@@ -69,6 +69,7 @@
 
     public static final String ATTRIBUTE_NAMESPACE = "http://geronimo.apache.org/xml/ns/attributes-1.2";
     private final Object name;
+    private String comment;
     private boolean load;
     private final Map<String, String> attributes = new LinkedHashMap<String, String>();
     private final Map<String, ReferencePatterns> references = new LinkedHashMap<String, ReferencePatterns>();
@@ -103,6 +104,7 @@
         }
         this.name = name;
         this.load = original.load;
+        this.comment = original.comment;
         this.attributes.putAll(original.attributes);
         this.references.putAll(original.references);
         this.clearAttributes.addAll(original.clearAttributes);
@@ -174,6 +176,7 @@
         }
 
         load = gbean.isLoad();
+        comment = gbean.getComment();
 
         // attributes
         for (Object o : gbean.getAttributeOrReference()) {
@@ -426,6 +429,9 @@
         }
         if (!load) {
             gbean.setLoad(false);
+        }
+        if (comment != null) {
+            gbean.setComment(comment);
         }
 
         // attributes