svn commit: r990598 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml: EntryFactory.java EntrySerializer.java

[ruwan]

Author: ruwan
Date: Sun Aug 29 16:19:05 2010
New Revision: 990598

URL: http://svn.apache.org/viewvc?rev=990598&view=rev
Log:
Fixing entries with description building and serialization

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java?rev=990598&r1=990597&r2=990598&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntryFactory.java
 Sun Aug 29 16:19:05 2010
@@ -54,6 +54,13 @@ public class EntryFactory implements XML
         } else {
 
             Entry entry = new Entry(key.getAttributeValue());
+
+            OMElement descriptionElem = 
elem.getFirstChildWithName(DESCRIPTION_Q);
+            if (descriptionElem != null) {
+                entry.setDescription(descriptionElem.getText());
+                descriptionElem.detach();
+            }
+
             String src  = elem.getAttributeValue(
                     new QName(XMLConfigConstants.NULL_NAMESPACE, "src"));
 
@@ -83,11 +90,6 @@ public class EntryFactory implements XML
                                }
             }
 
-            OMElement descriptionElem = 
elem.getFirstChildWithName(DESCRIPTION_Q);
-            if (descriptionElem != null) {
-                entry.setDescription(descriptionElem.getText());
-            }
-
             return entry;
         }
     }

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java?rev=990598&r1=990597&r2=990598&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java
 Sun Aug 29 16:19:05 2010
@@ -53,7 +53,17 @@ public class EntrySerializer {
      * @return OMElement representing the entry
      */
     public static OMElement serializeEntry(Entry entry, OMElement parent) {
+
         OMElement entryElement = fac.createOMElement("localEntry", synNS);
+        
+        if (entry.getDescription() != null) {
+
+            OMElement descriptionElem = fac.createOMElement(
+                    new QName(SynapseConstants.SYNAPSE_NAMESPACE, 
"description"));
+            descriptionElem.setText(entry.getDescription());
+            entryElement.addChild(descriptionElem);
+        }
+
         entryElement.addAttribute(fac.createOMAttribute(
                 "key", nullNS, entry.getKey().trim()));
         int type = entry.getType();
@@ -82,14 +92,6 @@ public class EntrySerializer {
             handleException("Entry type undefined");
         }
 
-        if (entry.getDescription() != null) {
-
-            OMElement descriptionElem = fac.createOMElement(
-                    new QName(SynapseConstants.SYNAPSE_NAMESPACE, 
"description"));
-            descriptionElem.setText(entry.getDescription());
-            entryElement.addChild(descriptionElem);
-        }
-
         if (parent != null) {
             parent.addChild(entryElement);
         }