svn commit: r1087594 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml: InvokeMediatorFactory.java InvokeMediatorSerializer.java

[supun]

Author: supun
Date: Fri Apr  1 06:05:33 2011
New Revision: 1087594

URL: http://svn.apache.org/viewvc?rev=1087594&view=rev
Log:
addpying the patch synapse_SYNAPSE-738_call_tempalate.patch, thanks Udayanga 
for the contribution

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InvokeMediatorFactory.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InvokeMediatorSerializer.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InvokeMediatorFactory.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InvokeMediatorFactory.java?rev=1087594&r1=1087593&r2=1087594&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InvokeMediatorFactory.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InvokeMediatorFactory.java
 Fri Apr  1 06:05:33 2011
@@ -41,7 +41,12 @@ import java.util.Properties;
  */
 public class InvokeMediatorFactory extends AbstractMediatorFactory {
 
-    private static final QName INVOKE_Q = new 
QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "invoke");
+    private static final QName INVOKE_Q = new 
QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "call-template");
+
+    /**
+     * Element  QName Definitions
+     */
+    public static final QName WITH_PARAM_Q = new 
QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "with-param");
 
     InvokeMediator invoker;
 
@@ -64,7 +69,7 @@ public class InvokeMediatorFactory exten
         Iterator subElements = elem.getChildElements();
         while (subElements.hasNext()) {
             OMElement child = (OMElement) subElements.next();
-            if (child.getQName().equals(TemplateMediatorFactory.PARAMETER_Q)) {
+            if (child.getQName().equals(WITH_PARAM_Q)) {
                 OMAttribute paramNameAttr = child.getAttribute(ATT_NAME);
                 Value paramValue = new ValueFactory().createValue("value", 
child);
                 if (paramNameAttr != null) {

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InvokeMediatorSerializer.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InvokeMediatorSerializer.java?rev=1087594&r1=1087593&r2=1087594&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InvokeMediatorSerializer.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InvokeMediatorSerializer.java
 Fri Apr  1 06:05:33 2011
@@ -37,7 +37,7 @@ import java.util.Map;
  * </invoke>
  */
 public class InvokeMediatorSerializer extends AbstractMediatorSerializer {
-    public static final String INVOKE_N = "invoke";
+    public static final String INVOKE_N = "call-template";
 
     @Override
     protected OMElement serializeSpecificMediator(Mediator m) {
@@ -64,7 +64,7 @@ public class InvokeMediatorSerializer ex
         while (paramIterator.hasNext()) {
             String paramName = paramIterator.next();
             if (!"".equals(paramName)) {
-                OMElement paramEl = 
fac.createOMElement(TemplateMediatorFactory.PARAMETER_Q.getLocalPart(),
+                OMElement paramEl = 
fac.createOMElement(InvokeMediatorFactory.WITH_PARAM_Q.getLocalPart(),
                                                         synNS);
                 paramEl.addAttribute(fac.createOMAttribute("name", nullNS, 
paramName));
                 //serialize value attribute