svn commit: r834451 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: config/SynapseConfigUtils.java mediators/builtin/PropertyMediator.java

[hiranya]

Author: hiranya
Date: Tue Nov 10 12:34:23 2009
New Revision: 834451

URL: http://svn.apache.org/viewvc?rev=834451&view=rev
Log:
* Changed the property mediator to use the SynapseConfigUtils class to perform 
string to OM conversions
* Changed the SynapseConfigUtils class to use the latest version of AXIOMUtils 
classin Axiom trunk - The old one is now deprecated


Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java?rev=834451&r1=834450&r2=834451&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
 Tue Nov 10 12:34:23 2009
@@ -20,8 +20,8 @@
 package org.apache.synapse.config;
 
 import org.apache.axiom.om.*;
+import org.apache.axiom.om.util.AXIOMUtil;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.impl.llom.util.AXIOMUtil;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java?rev=834451&r1=834450&r2=834451&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java
 Tue Nov 10 12:34:23 2009
@@ -23,6 +23,7 @@
 import org.apache.synapse.SynapseLog;
 import org.apache.synapse.SynapseException;
 import org.apache.synapse.config.xml.XMLConfigConstants;
+import org.apache.synapse.config.SynapseConfigUtils;
 import org.apache.synapse.core.axis2.Axis2MessageContext;
 import org.apache.synapse.mediators.AbstractMediator;
 import org.apache.synapse.util.xpath.SynapseXPath;
@@ -276,7 +277,7 @@
                 case FLOAT      : return Float.parseFloat(value);
                 case INTEGER    : return Integer.parseInt(value);
                 case LONG       : return Long.parseLong(value);
-                case OM         : return buildOM(value);
+                case OM         : return SynapseConfigUtils.stringToOM(value);
                 case SHORT      : return Short.parseShort(value);
                 default         : return value;
             }
@@ -287,14 +288,4 @@
             throw new SynapseException(msg, e);
         }
     }
-
-    private OMElement buildOM(String value) {
-        try {
-            return AXIOMUtil.stringToOM(value);
-        } catch (XMLStreamException e) {
-            String msg = "Error while parsing the string property value as 
XML";
-            log.error(msg, e);
-            throw new SynapseException(msg, e);
-        }
-    }
 }