svn commit: r1060746 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml: EnrichMediatorFactory.java EnrichMediatorSerializer.java

[supun]

Author: supun
Date: Wed Jan 19 10:29:17 2011
New Revision: 1060746

URL: http://svn.apache.org/viewvc?rev=1060746&view=rev
Log:
applying the patch for SYNAPSE-716, thanks Kasun for the contribution

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorFactory.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorSerializer.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorFactory.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorFactory.java?rev=1060746&r1=1060745&r2=1060746&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorFactory.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorFactory.java
 Wed Jan 19 10:29:17 2011
@@ -18,6 +18,7 @@
  */
 package org.apache.synapse.config.xml;
 
+import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMAttribute;
 import org.apache.axiom.om.OMElement;
 import org.apache.synapse.Mediator;
@@ -110,13 +111,16 @@ public class EnrichMediatorFactory exten
                 handleException("xpath attribute is required for CUSTOM type");
             }
         } else if (source.getSourceType() == EnrichMediator.INLINE) {
-            OMElement ele = null;
+            OMElement inlineElem = null;
             if (sourceEle.getFirstElement() != null) {
-                ele = sourceEle.getFirstElement().cloneOMElement();
+                inlineElem = sourceEle.getFirstElement().cloneOMElement();
             }
 
-            if (ele != null) {
-                source.setInlineElement(ele);
+            if (inlineElem != null) {
+                source.setInlineOMNode(inlineElem);
+            } else if (sourceEle.getText() != null
+                    && (!sourceEle.getText().equals(""))) {
+                
source.setInlineOMNode(OMAbstractFactory.getOMFactory().createOMText(sourceEle.getText()));
             } else if (sourceEle.getAttributeValue(ATT_KEY) != null) {
                 source.setInlineKey(sourceEle.getAttributeValue(ATT_KEY));
             } else {
@@ -126,7 +130,7 @@ public class EnrichMediatorFactory exten
     }
 
     private void populateTarget(Target target, OMElement sourceEle) {
-        // type attribue
+        // type attribute
         OMAttribute typeAttr = sourceEle.getAttribute(ATT_TYPE);
         if (typeAttr != null && typeAttr.getAttributeValue() != null) {
             int type = convertTypeToInit(typeAttr.getAttributeValue());

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorSerializer.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorSerializer.java?rev=1060746&r1=1060745&r2=1060746&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorSerializer.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EnrichMediatorSerializer.java
 Wed Jan 19 10:29:17 2011
@@ -19,6 +19,7 @@
 package org.apache.synapse.config.xml;
 
 import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMText;
 import org.apache.synapse.Mediator;
 
 
@@ -65,8 +66,11 @@ public class EnrichMediatorSerializer ex
         } else if (source.getSourceType() == EnrichMediator.CUSTOM) {
             SynapseXPathSerializer.serializeXPath(source.getXpath(), 
sourceEle, "xpath");
         } else if (source.getSourceType() == EnrichMediator.INLINE) {
-            if (source.getInlineElement() != null) {
-                sourceEle.addChild(source.getInlineElement().cloneOMElement());
+            if (source.getInlineOMNode() instanceof OMElement) {
+                sourceEle.addChild(((OMElement) 
source.getInlineOMNode()).cloneOMElement());
+            } else if (source.getInlineOMNode() instanceof OMText) {
+                /*Text as inline content*/
+                sourceEle.setText(((OMText) 
source.getInlineOMNode()).getText());
             } else if (source.getInlineKey() != null) {
                 sourceEle.addAttribute("key", source.getInlineKey(), null);
             }