You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by sa...@apache.org on 2006/03/26 13:03:30 UTC

svn commit: r388894 [2/3] - in /incubator/synapse/trunk/java: etc/ modules/core/ modules/core/src/org/apache/synapse/ modules/core/src/org/apache/synapse/axis2/ modules/core/src/org/apache/synapse/processors/builtin/ modules/core/src/org/apache/synapse...

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/AbstractListProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/AbstractListProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/AbstractListProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/AbstractListProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -21,12 +21,12 @@
 
 
 
-import org.apache.axis2.om.OMElement;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.processors.ListProcessor;
+import org.apache.axiom.om.OMElement;
 
 /**
  *
@@ -37,26 +37,26 @@
  */
 public abstract class AbstractListProcessorConfigurator extends AbstractProcessorConfigurator {
 
-	Log log = LogFactory.getLog(getClass());
-	
-	public void addChildrenAndSetName(SynapseEnvironment se, OMElement el, ListProcessor p)
-	{
-		super.setNameOnProcessor(se, el, p);
-
-		Iterator it = el.getChildElements();
-		List processors = new LinkedList();
-		while (it.hasNext()) {
-			OMElement child = (OMElement) it.next();
-			Processor proc = ProcessorConfiguratorFinder.getProcessor(se, child);
-			if (proc != null)
-				processors.add(proc);
-			else
-				log.info("Unknown child of all" + child.getLocalName());
-		}
-		p.setList(processors);
-		
-	}
+    Log log = LogFactory.getLog(getClass());
+
+    public void addChildrenAndSetName(SynapseEnvironment se, OMElement el, ListProcessor p)
+    {
+        super.setNameOnProcessor(se, el, p);
+
+        Iterator it = el.getChildElements();
+        List processors = new LinkedList();
+        while (it.hasNext()) {
+            OMElement child = (OMElement) it.next();
+            Processor proc = ProcessorConfiguratorFinder.getProcessor(se, child);
+            if (proc != null)
+                processors.add(proc);
+            else
+                log.info("Unknown child of all" + child.getLocalName());
+        }
+        p.setList(processors);
+
+    }
+
 
-		
 
 }

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/AbstractProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/AbstractProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/AbstractProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/AbstractProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -17,12 +17,12 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMAttribute;
-import org.apache.axis2.om.OMElement;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMAttribute;
 
 /**
  *
@@ -33,20 +33,20 @@
  */
 public abstract class AbstractProcessorConfigurator implements ProcessorConfigurator {
 
-	
-	
-	private Log log = LogFactory.getLog(getClass()); 
-	public void setNameOnProcessor(SynapseEnvironment se, OMElement el, Processor p) {
-		
-		OMAttribute nm = el.getAttribute(new QName("name"));
-		if (nm != null) {
-			String name = nm.getAttributeValue().trim();
-			p.setName(name);
-			se.addProcessor(p);
-		}
-		log.debug("compile "+el.getLocalName()+" with name '"+p.getName() +"' on "+p.getClass());
-		
-	}
 
-	
+
+    private Log log = LogFactory.getLog(getClass());
+    public void setNameOnProcessor(SynapseEnvironment se, OMElement el, Processor p) {
+
+        OMAttribute nm = el.getAttribute(new QName("name"));
+        if (nm != null) {
+            String name = nm.getAttributeValue().trim();
+            p.setName(name);
+            se.addProcessor(p);
+        }
+        log.debug("compile "+el.getLocalName()+" with name '"+p.getName() +"' on "+p.getClass());
+
+    }
+
+
 }

Added: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/AddressingOutMediatorFactory.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/AddressingOutMediatorFactory.java?rev=388894&view=auto
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/AddressingOutMediatorFactory.java (added)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/AddressingOutMediatorFactory.java Sun Mar 26 03:03:22 2006
@@ -0,0 +1,40 @@
+package org.apache.synapse.xml;
+
+import org.apache.synapse.Processor;
+import org.apache.synapse.SynapseEnvironment;
+import org.apache.synapse.processors.builtin.axis2.AddressingOutMediator;
+import org.apache.axiom.om.OMElement;
+
+import javax.xml.namespace.QName;
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class AddressingOutMediatorFactory extends AbstractProcessorConfigurator {
+
+    private static final QName ADD_Q = new QName(Constants.SYNAPSE_NAMESPACE,
+            "engage-addressing-out");
+
+
+    public Processor createProcessor(SynapseEnvironment se, OMElement el) {
+        AddressingOutMediator aom = new AddressingOutMediator();
+        super.setNameOnProcessor(se,el,aom);
+        return aom;
+    }
+
+    public QName getTagQName() {
+        return ADD_Q;
+    }
+}

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/AddressingProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/AddressingProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/AddressingProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/AddressingProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -18,11 +18,10 @@
 import javax.xml.namespace.QName;
 
 
-import org.apache.axis2.om.OMElement;
-import org.apache.synapse.xml.Constants;
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.processors.builtin.axis2.AddressingInProcessor;
+import org.apache.axiom.om.OMElement;
 
 /**
  *
@@ -33,19 +32,19 @@
  * 
  */
 public class AddressingProcessorConfigurator extends AbstractProcessorConfigurator {
-	private static final QName ADD_Q = new QName(Constants.SYNAPSE_NAMESPACE,
-			"engage-addressing-in");
+    private static final QName ADD_Q = new QName(Constants.SYNAPSE_NAMESPACE,
+            "engage-addressing-in");
 
 
-	public QName getTagQName() {
-		return ADD_Q;
-	}
+    public QName getTagQName() {
+        return ADD_Q;
+    }
 
 
-	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
-		AddressingInProcessor ap = new AddressingInProcessor();
-		super.setNameOnProcessor(se,el,ap);
-		return ap;
-	}
+    public Processor createProcessor(SynapseEnvironment se, OMElement el) {
+        AddressingInProcessor ap = new AddressingInProcessor();
+        super.setNameOnProcessor(se,el,ap);
+        return ap;
+    }
 
 }

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/ClassMediatorProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/ClassMediatorProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/ClassMediatorProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/ClassMediatorProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -17,13 +17,13 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMAttribute;
-import org.apache.axis2.om.OMElement;
 import org.apache.synapse.xml.Constants;
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.SynapseException;
 import org.apache.synapse.processors.mediatortypes.ClassMediatorProcessor;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMAttribute;
 
 /**
  *
@@ -31,29 +31,29 @@
  * TODO add ability to configure properties with Strings/OMElements based on children.
  */
 public class ClassMediatorProcessorConfigurator extends AbstractProcessorConfigurator {
-	private static final QName CLM_Q = new QName(Constants.SYNAPSE_NAMESPACE,
-			"classmediator");
-	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
-		ClassMediatorProcessor cmp = new ClassMediatorProcessor();
-		super.setNameOnProcessor(se, el, cmp);
+    private static final QName CLM_Q = new QName(Constants.SYNAPSE_NAMESPACE,
+            "classmediator");
+    public Processor createProcessor(SynapseEnvironment se, OMElement el) {
+        ClassMediatorProcessor cmp = new ClassMediatorProcessor();
+        super.setNameOnProcessor(se, el, cmp);
 
-		OMAttribute clsName = el.getAttribute(new QName("class"));
-		if (clsName == null)
-			throw new SynapseException("missing class attribute on element"
-					+ el.toString());
-		try {
-			Class clazz = se.getClassLoader().loadClass(clsName.getAttributeValue());
-			cmp.setClazz(clazz);
-		} catch (ClassNotFoundException e) {
-			throw new SynapseException("class loading error", e);
-		}
-		return cmp;
+        OMAttribute clsName = el.getAttribute(new QName("class"));
+        if (clsName == null)
+            throw new SynapseException("missing class attribute on element"
+                    + el.toString());
+        try {
+            Class clazz = se.getClassLoader().loadClass(clsName.getAttributeValue());
+            cmp.setClazz(clazz);
+        } catch (ClassNotFoundException e) {
+            throw new SynapseException("class loading error", e);
+        }
+        return cmp;
 
-	}
+    }
 
-	
-	public QName getTagQName() {
-		return CLM_Q;
-	}
+
+    public QName getTagQName() {
+        return CLM_Q;
+    }
 
 }

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/DefineProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/DefineProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/DefineProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/DefineProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -18,7 +18,7 @@
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.processors.DefineProcessor;
-import org.apache.axis2.om.OMElement;
+import org.apache.axiom.om.OMElement;
 
 import javax.xml.namespace.QName;
 

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/DropProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/DropProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/DropProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/DropProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -19,7 +19,7 @@
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.processors.builtin.DropProcessor;
-import org.apache.axis2.om.OMElement;
+import org.apache.axiom.om.OMElement;
 
 import javax.xml.namespace.QName;
 

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/FaultProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/FaultProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/FaultProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/FaultProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -18,11 +18,10 @@
 import javax.xml.namespace.QName;
 
 
-import org.apache.axis2.om.OMElement;
-import org.apache.synapse.xml.Constants;
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.processors.builtin.axis2.FaultProcessor;
+import org.apache.axiom.om.OMElement;
 
 /**
  *
@@ -32,20 +31,20 @@
  * 
  */
 public class FaultProcessorConfigurator extends AbstractProcessorConfigurator {
-	private static final QName HEADER_Q = new QName(
-			Constants.SYNAPSE_NAMESPACE, "fault");
+    private static final QName HEADER_Q = new QName(
+            Constants.SYNAPSE_NAMESPACE, "fault");
 
-	
 
-	
-	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
-		FaultProcessor fp = new FaultProcessor();
-		super.setNameOnProcessor(se, el, fp);
-		return fp;
-	}
-
-		public QName getTagQName() {
-		return HEADER_Q;
-	}
+
+
+    public Processor createProcessor(SynapseEnvironment se, OMElement el) {
+        FaultProcessor fp = new FaultProcessor();
+        super.setNameOnProcessor(se, el, fp);
+        return fp;
+    }
+
+        public QName getTagQName() {
+        return HEADER_Q;
+    }
 
 }

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/HeaderProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/HeaderProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/HeaderProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/HeaderProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -18,13 +18,12 @@
 import javax.xml.namespace.QName;
 
 
-import org.apache.axis2.om.OMAttribute;
-import org.apache.axis2.om.OMElement;
-import org.apache.synapse.xml.Constants;
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.SynapseException;
 import org.apache.synapse.processors.builtin.HeaderProcessor;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMAttribute;
 
 /**
  *
@@ -35,30 +34,30 @@
  * 
  */
 public class HeaderProcessorConfigurator extends AbstractProcessorConfigurator{
-	private static final QName HEADER_Q = new QName(
-			Constants.SYNAPSE_NAMESPACE, "header");
+    private static final QName HEADER_Q = new QName(
+            Constants.SYNAPSE_NAMESPACE, "header");
 
-	
 
-		private static final QName TYPE_ATT_Q = new QName("type"),
-			VALUE_ATT_Q = new QName("value");
 
-		public Processor createProcessor(SynapseEnvironment se, OMElement el) {
-			HeaderProcessor hp = new HeaderProcessor();
-			super.setNameOnProcessor(se, el, hp);
-			OMAttribute val = el.getAttribute(VALUE_ATT_Q);
-			OMAttribute type = el.getAttribute(TYPE_ATT_Q);
-			if (val == null || type == null) {
-				throw new SynapseException("<header> must have both " + VALUE_ATT_Q
-					+ " and " + TYPE_ATT_Q + " attributes: " + el.toString());
-			}
-			hp.setHeaderType(type.getAttributeValue());
-			hp.setValue( val.getAttributeValue());
-			return hp;
-	}
-
-	public QName getTagQName() {
-		return HEADER_Q;
-	}
+        private static final QName TYPE_ATT_Q = new QName("type"),
+            VALUE_ATT_Q = new QName("value");
+
+        public Processor createProcessor(SynapseEnvironment se, OMElement el) {
+            HeaderProcessor hp = new HeaderProcessor();
+            super.setNameOnProcessor(se, el, hp);
+            OMAttribute val = el.getAttribute(VALUE_ATT_Q);
+            OMAttribute type = el.getAttribute(TYPE_ATT_Q);
+            if (val == null || type == null) {
+                throw new SynapseException("<header> must have both " + VALUE_ATT_Q
+                    + " and " + TYPE_ATT_Q + " attributes: " + el.toString());
+            }
+            hp.setHeaderType(type.getAttributeValue());
+            hp.setValue( val.getAttributeValue());
+            return hp;
+    }
+
+    public QName getTagQName() {
+        return HEADER_Q;
+    }
 
 }

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/InProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/InProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/InProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/InProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -17,13 +17,11 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.synapse.xml.Constants;
 import org.apache.synapse.Processor;
 
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.processors.InProcessor;
-
+import org.apache.axiom.om.OMElement;
 
 
 /**
@@ -35,18 +33,18 @@
  *
  */
 public class InProcessorConfigurator extends
-		AbstractListProcessorConfigurator {
-	private static final QName IN_Q = new QName(Constants.SYNAPSE_NAMESPACE,
-			"in");
-
-	public QName getTagQName() {
-		return IN_Q;
-	}
-
-	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
-		InProcessor sp = new InProcessor();
-		super.addChildrenAndSetName(se, el, sp);
-		return sp;
-	}
+        AbstractListProcessorConfigurator {
+    private static final QName IN_Q = new QName(Constants.SYNAPSE_NAMESPACE,
+            "in");
+
+    public QName getTagQName() {
+        return IN_Q;
+    }
+
+    public Processor createProcessor(SynapseEnvironment se, OMElement el) {
+        InProcessor sp = new InProcessor();
+        super.addChildrenAndSetName(se, el, sp);
+        return sp;
+    }
 
 }

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/LogProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/LogProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/LogProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/LogProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -18,12 +18,10 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-
-import org.apache.synapse.xml.Constants;
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.processors.builtin.LogProcessor;
+import org.apache.axiom.om.OMElement;
 
 /**
  *
@@ -36,19 +34,19 @@
  *
  */
 public class LogProcessorConfigurator extends AbstractProcessorConfigurator {
-	private static final QName LOG_Q = new QName(Constants.SYNAPSE_NAMESPACE,
-			"log");
+    private static final QName LOG_Q = new QName(Constants.SYNAPSE_NAMESPACE,
+            "log");
 
 
-	public QName getTagQName() {
-		return LOG_Q;
-	}
+    public QName getTagQName() {
+        return LOG_Q;
+    }
 
 
-	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
-		LogProcessor lp = new LogProcessor();
-		super.setNameOnProcessor(se,el,lp);
-		return lp;
-	}
+    public Processor createProcessor(SynapseEnvironment se, OMElement el) {
+        LogProcessor lp = new LogProcessor();
+        super.setNameOnProcessor(se,el,lp);
+        return lp;
+    }
 
 }

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/NeverProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/NeverProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/NeverProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/NeverProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -18,11 +18,10 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.synapse.xml.Constants;
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.processors.NeverProcessor;
+import org.apache.axiom.om.OMElement;
 
 
 /**
@@ -35,18 +34,18 @@
  *
  */
 public class NeverProcessorConfigurator extends
-		AbstractListProcessorConfigurator {
-	private static final QName NEVER_Q = new QName(Constants.SYNAPSE_NAMESPACE,
-			"never");
+        AbstractListProcessorConfigurator {
+    private static final QName NEVER_Q = new QName(Constants.SYNAPSE_NAMESPACE,
+            "never");
 
-	public QName getTagQName() {
-		return NEVER_Q;
-	}
+    public QName getTagQName() {
+        return NEVER_Q;
+    }
 
-	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
-		NeverProcessor sp = new NeverProcessor();
-		super.addChildrenAndSetName(se, el, sp);
-		return sp;
-	}
+    public Processor createProcessor(SynapseEnvironment se, OMElement el) {
+        NeverProcessor sp = new NeverProcessor();
+        super.addChildrenAndSetName(se, el, sp);
+        return sp;
+    }
 
 }

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/OutProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/OutProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/OutProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/OutProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -18,26 +18,25 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.synapse.xml.Constants;
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.processors.OutProcessor;
+import org.apache.axiom.om.OMElement;
 
 
 public class OutProcessorConfigurator extends
-		AbstractListProcessorConfigurator {
-	private static final QName OUT_Q = new QName(Constants.SYNAPSE_NAMESPACE,
-			"out");
+        AbstractListProcessorConfigurator {
+    private static final QName OUT_Q = new QName(Constants.SYNAPSE_NAMESPACE,
+            "out");
 
-	public QName getTagQName() {
-		return OUT_Q;
-	}
+    public QName getTagQName() {
+        return OUT_Q;
+    }
 
-	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
-		OutProcessor sp = new OutProcessor();
-		super.addChildrenAndSetName(se, el, sp);
-		return sp;
-	}
+    public Processor createProcessor(SynapseEnvironment se, OMElement el) {
+        OutProcessor sp = new OutProcessor();
+        super.addChildrenAndSetName(se, el, sp);
+        return sp;
+    }
 
 }

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/ProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/ProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/ProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/ProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -18,12 +18,12 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
+import org.apache.axiom.om.OMElement;
 
 public interface ProcessorConfigurator {
-	public Processor createProcessor(SynapseEnvironment se, OMElement el);
-	public QName getTagQName();
+    public Processor createProcessor(SynapseEnvironment se, OMElement el);
+    public QName getTagQName();
 
 }

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/ProcessorConfiguratorFinder.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/ProcessorConfiguratorFinder.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/ProcessorConfiguratorFinder.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/ProcessorConfiguratorFinder.java Sun Mar 26 03:03:22 2006
@@ -23,8 +23,6 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMNamespace;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -36,6 +34,8 @@
 import org.apache.synapse.processors.builtin.xslt.XSLTProcessorConfigurator;
 import org.apache.synapse.processors.conditions.ExactlyOneProcessorConfigurator;
 import org.apache.synapse.processors.conditions.DefaultProcessorConfigurator;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMNamespace;
 
 import sun.misc.Service;
 
@@ -69,7 +69,8 @@
             SendNowProcessorConfigurator.class,DropProcessorConfigurator.class,
             RefDefineProcessorConfigurator.class, ExactlyOneProcessorConfigurator.class,
             DefaultProcessorConfigurator.class,
-            PropertyMediatorFactory.class, ResourceMediatorFactory.class};
+            PropertyMediatorFactory.class, ResourceMediatorFactory.class,
+            AddressingOutMediatorFactory.class};
 
 	private static void initialise() {
 

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/RefDefineProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/RefDefineProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/RefDefineProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/RefDefineProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -20,8 +20,8 @@
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.SynapseException;
 import org.apache.synapse.processors.RefDefineProcessor;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMAttribute;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMAttribute;
 
 import javax.xml.namespace.QName;
 

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/RefProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/RefProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/RefProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/RefProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -19,31 +19,30 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMAttribute;
-import org.apache.axis2.om.OMElement;
-import org.apache.synapse.xml.Constants;
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.SynapseException;
 import org.apache.synapse.processors.RefProcessor;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMAttribute;
 
 
 public class RefProcessorConfigurator extends
-		AbstractProcessorConfigurator {
-	private static final QName REF_Q = new QName(Constants.SYNAPSE_NAMESPACE,
-			"ref");
+        AbstractProcessorConfigurator {
+    private static final QName REF_Q = new QName(Constants.SYNAPSE_NAMESPACE,
+            "ref");
 
-	public QName getTagQName() {
-		return REF_Q;
-	}
+    public QName getTagQName() {
+        return REF_Q;
+    }
 
-	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
-		RefProcessor rp = new RefProcessor();
-		super.setNameOnProcessor(se, el, rp);
-		OMAttribute attr = el.getAttribute(new QName("ref"));
-		if (attr==null) throw new SynapseException("<ref> must have attribute ref");
-		rp.setRef(attr.getAttributeValue());
-		return rp;
-	}
+    public Processor createProcessor(SynapseEnvironment se, OMElement el) {
+        RefProcessor rp = new RefProcessor();
+        super.setNameOnProcessor(se, el, rp);
+        OMAttribute attr = el.getAttribute(new QName("ref"));
+        if (attr==null) throw new SynapseException("<ref> must have attribute ref");
+        rp.setRef(attr.getAttributeValue());
+        return rp;
+    }
 
 }

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/RegexProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/RegexProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/RegexProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/RegexProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -21,66 +21,63 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMAttribute;
-import org.apache.axis2.om.OMElement;
-
-
-import org.apache.synapse.xml.Constants;
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.SynapseException;
 
 
 import org.apache.synapse.processors.rules.RegexProcessor;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMAttribute;
 
 /**
  *
  * 
  */
 public class RegexProcessorConfigurator extends
-		AbstractListProcessorConfigurator {
-	private static final String REGEX = "regex";
+        AbstractListProcessorConfigurator {
+    private static final String REGEX = "regex";
+
+    private static final QName REGEX_Q = new QName(Constants.SYNAPSE_NAMESPACE,
+            REGEX);
+
+    private static final QName REGEX_PATTERN_ATT_Q = new QName("pattern");
+
+    private static final QName REGEX_PROPERTY_ATT_Q = new QName("property");
+
+    private static final QName REGEX_HEADER_ATT_Q = new QName("message-address");
 
-	private static final QName REGEX_Q = new QName(Constants.SYNAPSE_NAMESPACE,
-			REGEX);
 
-	private static final QName REGEX_PATTERN_ATT_Q = new QName("pattern");
 
-	private static final QName REGEX_PROPERTY_ATT_Q = new QName("property");
-
-	private static final QName REGEX_HEADER_ATT_Q = new QName("message-address");
-
-	
-
-	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
-		RegexProcessor rp = new RegexProcessor();
-		super.addChildrenAndSetName(se, el, rp);
-
-		OMAttribute patt = el.getAttribute(REGEX_PATTERN_ATT_Q);
-		if (patt == null) {
-			throw new SynapseException(REGEX + " must have "
-					+ REGEX_PATTERN_ATT_Q + " attribute: " + el.toString());
-		}
-
-		OMAttribute prop = el.getAttribute(REGEX_PROPERTY_ATT_Q);
-		OMAttribute head = el.getAttribute(REGEX_HEADER_ATT_Q);
-		if (prop == null && head == null) {
-			throw new SynapseException(REGEX + " must have either "
-					+ REGEX_PROPERTY_ATT_Q + " or " + REGEX_HEADER_ATT_Q
-					+ " attributes: " + el.toString());
-		}
-		rp.setPattern(patt.getAttributeValue());
-		if (prop != null) {
-			rp.setPropertyName(prop.getAttributeValue());
-		} else {
-			String header = head.getAttributeValue();
-			rp.setHeaderType(header);
-		}
-		return rp;
-	}
-
-	public QName getTagQName() {
-		return REGEX_Q;
-	}
+    public Processor createProcessor(SynapseEnvironment se, OMElement el) {
+        RegexProcessor rp = new RegexProcessor();
+        super.addChildrenAndSetName(se, el, rp);
+
+        OMAttribute patt = el.getAttribute(REGEX_PATTERN_ATT_Q);
+        if (patt == null) {
+            throw new SynapseException(REGEX + " must have "
+                    + REGEX_PATTERN_ATT_Q + " attribute: " + el.toString());
+        }
+
+        OMAttribute prop = el.getAttribute(REGEX_PROPERTY_ATT_Q);
+        OMAttribute head = el.getAttribute(REGEX_HEADER_ATT_Q);
+        if (prop == null && head == null) {
+            throw new SynapseException(REGEX + " must have either "
+                    + REGEX_PROPERTY_ATT_Q + " or " + REGEX_HEADER_ATT_Q
+                    + " attributes: " + el.toString());
+        }
+        rp.setPattern(patt.getAttributeValue());
+        if (prop != null) {
+            rp.setPropertyName(prop.getAttributeValue());
+        } else {
+            String header = head.getAttributeValue();
+            rp.setHeaderType(header);
+        }
+        return rp;
+    }
+
+    public QName getTagQName() {
+        return REGEX_Q;
+    }
 
 }

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/SecurityProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/SecurityProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/SecurityProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/SecurityProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -3,7 +3,7 @@
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.processors.builtin.axis2.SecurityProcessor;
-import org.apache.axis2.om.OMElement;
+import org.apache.axiom.om.OMElement;
 
 import javax.xml.namespace.QName;
 /*

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/SendNowProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/SendNowProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/SendNowProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/SendNowProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -19,7 +19,7 @@
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.processors.builtin.SendNowProcessor;
-import org.apache.axis2.om.OMElement;
+import org.apache.axiom.om.OMElement;
 
 import javax.xml.namespace.QName;
 

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/SendProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/SendProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/SendProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/SendProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -18,31 +18,30 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
 
 import org.apache.synapse.processors.builtin.SendProcessor;
-import org.apache.synapse.xml.Constants;
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
+import org.apache.axiom.om.OMElement;
 
 public class SendProcessorConfigurator extends AbstractProcessorConfigurator {
-	
 
-	private static final QName SEND_Q = new QName(Constants.SYNAPSE_NAMESPACE,
-			"send");
 
-	
+    private static final QName SEND_Q = new QName(Constants.SYNAPSE_NAMESPACE,
+            "send");
 
-	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
-		SendProcessor sp =  new SendProcessor();
-		super.setNameOnProcessor(se, el,sp);
-		return sp;
-		
-	}
 
-	public QName getTagQName() {
 
-		return SEND_Q;
-	}
+    public Processor createProcessor(SynapseEnvironment se, OMElement el) {
+        SendProcessor sp =  new SendProcessor();
+        super.setNameOnProcessor(se, el,sp);
+        return sp;
+
+    }
+
+    public QName getTagQName() {
+
+        return SEND_Q;
+    }
 
 }

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/ServiceMediatorProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/ServiceMediatorProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/ServiceMediatorProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/ServiceMediatorProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -20,33 +20,31 @@
 import javax.xml.namespace.QName;
 
 
-import org.apache.axis2.om.OMAttribute;
-import org.apache.axis2.om.OMElement;
-
-import org.apache.synapse.xml.Constants;
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.SynapseException;
 import org.apache.synapse.processors.mediatortypes.axis2.ServiceMediatorProcessor;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMAttribute;
 
 public class ServiceMediatorProcessorConfigurator extends AbstractProcessorConfigurator {
-	private static final QName tagName = new QName(Constants.SYNAPSE_NAMESPACE,
-			"servicemediator");
-	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
-		ServiceMediatorProcessor smp = new ServiceMediatorProcessor();
-		super.setNameOnProcessor(se,el,smp);
-		
-		OMAttribute attr = el.getAttribute(new QName("service"));
-		if (attr == null)
-			throw new SynapseException(
-					"<servicemediator> must have <service> attribute");
-		smp.setServiceName(attr.getAttributeValue());
-		return smp;
-	}
+    private static final QName tagName = new QName(Constants.SYNAPSE_NAMESPACE,
+            "servicemediator");
+    public Processor createProcessor(SynapseEnvironment se, OMElement el) {
+        ServiceMediatorProcessor smp = new ServiceMediatorProcessor();
+        super.setNameOnProcessor(se,el,smp);
+
+        OMAttribute attr = el.getAttribute(new QName("service"));
+        if (attr == null)
+            throw new SynapseException(
+                    "<servicemediator> must have <service> attribute");
+        smp.setServiceName(attr.getAttributeValue());
+        return smp;
+    }
 
-	public QName getTagQName() {
+    public QName getTagQName() {
 
-		return tagName;
-	}
+        return tagName;
+    }
 
 }

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/StageProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/StageProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/StageProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/StageProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -18,29 +18,29 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
 import org.apache.synapse.xml.Constants;
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.processors.StageProcessor;
+import org.apache.axiom.om.OMElement;
 
 /**
  *
  *<xmp><synapse:stage name="optional"> do everything in here </synapse:stage></xmp>
  */
 public class StageProcessorConfigurator extends
-		AbstractListProcessorConfigurator {
-	private static final QName STAGE_Q = new QName(Constants.SYNAPSE_NAMESPACE,
-			"stage");
+        AbstractListProcessorConfigurator {
+    private static final QName STAGE_Q = new QName(Constants.SYNAPSE_NAMESPACE,
+            "stage");
 
-	public QName getTagQName() {
-		return STAGE_Q;
-	}
+    public QName getTagQName() {
+        return STAGE_Q;
+    }
 
-	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
-		StageProcessor sp = new StageProcessor();
-		super.addChildrenAndSetName(se, el, sp);
-		return sp;
-	}
+    public Processor createProcessor(SynapseEnvironment se, OMElement el) {
+        StageProcessor sp = new StageProcessor();
+        super.addChildrenAndSetName(se, el, sp);
+        return sp;
+    }
 
 }

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/SynapseProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/SynapseProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/SynapseProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/SynapseProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -18,26 +18,25 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.synapse.xml.Constants;
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.processors.SynapseProcessor;
+import org.apache.axiom.om.OMElement;
 
 public class SynapseProcessorConfigurator extends
-		AbstractListProcessorConfigurator {
+        AbstractListProcessorConfigurator {
 
-	private final static QName tagname = new QName(Constants.SYNAPSE_NAMESPACE,
-			"synapse");
+    private final static QName tagname = new QName(Constants.SYNAPSE_NAMESPACE,
+            "synapse");
 
-	public QName getTagQName() {
-		return tagname;
-	}
+    public QName getTagQName() {
+        return tagname;
+    }
 
-	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
-		SynapseProcessor sp = new SynapseProcessor();
-		super.addChildrenAndSetName(se, el, sp);
-		return sp;
-	}
+    public Processor createProcessor(SynapseEnvironment se, OMElement el) {
+        SynapseProcessor sp = new SynapseProcessor();
+        super.addChildrenAndSetName(se, el, sp);
+        return sp;
+    }
 
 }

Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/XPathProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/XPathProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/XPathProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/XPathProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -20,14 +20,13 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axis2.om.OMAttribute;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMNamespace;
-import org.apache.synapse.xml.Constants;
 import org.apache.synapse.Processor;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.SynapseException;
 import org.apache.synapse.processors.rules.XPathProcessor;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMNamespace;
 
 /**
  *
@@ -38,44 +37,44 @@
  * 
  */
 public class XPathProcessorConfigurator extends
-		AbstractListProcessorConfigurator {
-	private static final String XPATH = "xpath";
+        AbstractListProcessorConfigurator {
+    private static final String XPATH = "xpath";
 
-	private static final QName XPATH_Q = new QName(Constants.SYNAPSE_NAMESPACE,
-			"xpath");
+    private static final QName XPATH_Q = new QName(Constants.SYNAPSE_NAMESPACE,
+            "xpath");
 
-	private static final QName XPATH_EXPRESSION_ATT_Q = new QName("expr");
+    private static final QName XPATH_EXPRESSION_ATT_Q = new QName("expr");
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.synapse.spi.Processor#compile(org.apache.synapse.api.SynapseEnvironment,
-	 *      org.apache.axis2.om.OMElement)
-	 */
-	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
-		XPathProcessor xp = new XPathProcessor();
-
-		super.addChildrenAndSetName(se, el, xp);
-
-		OMAttribute expr = el.getAttribute(XPATH_EXPRESSION_ATT_Q);
-		if (expr == null) {
-			throw new SynapseException(XPATH + " must have "
-					+ XPATH_EXPRESSION_ATT_Q + " attribute: " + el.toString());
-		}
-
-		xp.setXPathExpr(expr.getAttributeValue());
-		Iterator it = el.getAllDeclaredNamespaces();
-		while (it.hasNext()) {
-			OMNamespace n = (OMNamespace) it.next();
-			xp.addXPathNamespace(n.getPrefix(), n.getName());
-		}
+    /*
+      * (non-Javadoc)
+      *
+      * @see org.apache.synapse.spi.Processor#compile(org.apache.synapse.api.SynapseEnvironment,
+      *      org.apache.axis2.om.OMElement)
+      */
+    public Processor createProcessor(SynapseEnvironment se, OMElement el) {
+        XPathProcessor xp = new XPathProcessor();
+
+        super.addChildrenAndSetName(se, el, xp);
+
+        OMAttribute expr = el.getAttribute(XPATH_EXPRESSION_ATT_Q);
+        if (expr == null) {
+            throw new SynapseException(XPATH + " must have "
+                    + XPATH_EXPRESSION_ATT_Q + " attribute: " + el.toString());
+        }
+
+        xp.setXPathExpr(expr.getAttributeValue());
+        Iterator it = el.getAllDeclaredNamespaces();
+        while (it.hasNext()) {
+            OMNamespace n = (OMNamespace) it.next();
+            xp.addXPathNamespace(n.getPrefix(), n.getName());
+        }
 
-		return xp;
-	}
+        return xp;
+    }
 
-	public QName getTagQName() {
+    public QName getTagQName() {
 
-		return XPATH_Q;
-	}
+        return XPATH_Q;
+    }
 
 }

Added: incubator/synapse/trunk/java/modules/core/test-resources/axis2/conf/axis2.xml
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test-resources/axis2/conf/axis2.xml?rev=388894&view=auto
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test-resources/axis2/conf/axis2.xml (added)
+++ incubator/synapse/trunk/java/modules/core/test-resources/axis2/conf/axis2.xml Sun Mar 26 03:03:22 2006
@@ -0,0 +1,127 @@
+<axisconfig name="AxisJava2.0_Synapse">
+    <!-- ================================================= -->
+    <!-- Parameters -->
+    <!-- ================================================= -->
+    <parameter name="hotdeployment" locked="false">true</parameter>
+    <parameter name="hotupdate" locked="false">false</parameter>
+    <parameter name="enableMTOM" locked="false">true</parameter>
+    <!-- Uncomment this to enable REST support -->
+    <!--    <parameter name="enableREST" locked="false">true</parameter>-->
+
+    <!-- Location of the SynapseRepository -->
+    <parameter name="SynapseConfiguration" locked="false">conf/synapse.xml</parameter>
+
+    <!-- Engage the addressing module -->
+    <!--<module ref="addressing"/>-->
+
+    <parameter name="userName" locked="false">admin</parameter>
+    <parameter name="password" locked="false">axis2</parameter>
+
+    <!-- ================================================= -->
+    <!-- Message Receivers -->
+    <!-- ================================================= -->
+    <!--This is the Deafult Message Receiver for the system , if you want to have MessageReceivers for -->
+    <!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
+    <!--any operation -->
+    <!--Note : You can ovride this for particular service by adding the same element with your requirement-->
+    <messageReceivers>
+        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+    </messageReceivers>
+    <!-- ================================================= -->
+    <!-- Transport Ins -->
+    <!-- ================================================= -->
+    <transportReceiver name="http"
+                       class="org.apache.axis2.transport.http.SimpleHTTPServer">
+        <parameter name="port" locked="false">6060</parameter>
+        <!--If you want to give your own host address for EPR generation-->
+        <!--uncommet following paramter , and set as you required.-->
+        <!--<parameter name="hostname" locked="false">http://myApp.com/ws</parameter>-->
+    </transportReceiver>
+
+    <transportReceiver name="tcp"
+                       class="org.apache.axis2.transport.tcp.TCPServer">
+        <parameter name="port" locked="false">6061</parameter>
+        <!--If you want to give your own host address for EPR generation-->
+        <!--uncommet following paramter , and set as you required.-->
+        <!--<parameter name="hostname" locked="false">tcp://myApp.com/ws</parameter>-->
+    </transportReceiver>
+
+    <!-- ================================================= -->
+    <!-- Transport Outs -->
+    <!-- ================================================= -->
+
+    <transportSender name="tcp"
+                     class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+    <transportSender name="local"
+                     class="org.apache.axis2.transport.local.LocalTransportSender"/>
+    <transportSender name="jms"
+                     class="org.apache.axis2.transport.jms.JMSSender"/>
+    <transportSender name="http"
+                     class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+    </transportSender>
+    <transportSender name="https"
+                     class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+    </transportSender>
+
+    <!-- ================================================= -->
+    <!-- Phases  -->
+    <!-- ================================================= -->
+    <phaseOrder type="inflow">
+        <!--  System pre defined phases       -->
+        <phase name="TransportIn"/>
+        <phase name="PreDispatch"/>
+        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+            <handler name="RequestURIBasedDispatcher"
+                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+
+            <handler name="SOAPActionBasedDispatcher"
+                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+
+            <handler name="AddressingBasedDispatcher"
+                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+
+            <handler name="SOAPMessageBodyBasedDispatcher"
+                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+            <handler name="InstanceDispatcher"
+                     class="org.apache.axis2.engine.InstanceDispatcher">
+                <order phase="PostDispatch"/>
+            </handler>
+        </phase>
+        <!--  System pre defined phases       -->
+        <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
+        <phase name="OperationInPhase"/>
+    </phaseOrder>
+    <phaseOrder type="outflow">
+        <!--      user can add his own phases to this area  -->
+        <phase name="OperationOutPhase"/>
+        <!--system predefined phase-->
+        <!--these phase will run irrespective of the service-->
+        <phase name="PolicyDetermination"/>
+        <phase name="MessageOut"/>
+    </phaseOrder>
+    <phaseOrder type="INfaultflow">
+        <!--      user can add his own phases to this area  -->
+        <phase name="OperationInFaultPhase"/>
+    </phaseOrder>
+    <phaseOrder type="Outfaultflow">
+        <!--      user can add his own phases to this area  -->
+        <phase name="OperationOutFaultPhase"/>
+        <phase name="PolicyDetermination"/>
+        <phase name="MessageOut"/>
+    </phaseOrder>
+</axisconfig>
\ No newline at end of file

Modified: incubator/synapse/trunk/java/modules/core/test-resources/org/apache/axis2/META-INF/services.xml
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test-resources/org/apache/axis2/META-INF/services.xml?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test-resources/org/apache/axis2/META-INF/services.xml (original)
+++ incubator/synapse/trunk/java/modules/core/test-resources/org/apache/axis2/META-INF/services.xml Sun Mar 26 03:03:22 2006
@@ -7,17 +7,17 @@
     <operation name="echo">
         <messageReceiver
                 class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
-        <parameter name="wsamapping">urn:synapse/sendon</parameter>
+        <actionMapping>urn:synapse/sendon</actionMapping>
     </operation>
     <operation name="fault" locked="false">
-        <parameter name="wsamapping">urn:synapse/sendon-fault</parameter>
+        <actionMapping>urn:synapse/sendon-fault</actionMapping>
     </operation>
     <operation name="echo_addressing" locked="false">
-        <parameter name="wsamapping">urn:synapse/sendon-addressing-engage</parameter>
+        <actionMapping>urn:synapse/sendon-addressing-engage</actionMapping>
     </operation>
     <operation name="ping">
         <messageReceiver class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
-        <parameter name="wsamapping">urn:synapse/ping</parameter>
+        <actionMapping>urn:synapse/ping</actionMapping>
     </operation>
     <operation name="simple_resources"/>
 </service>

Added: incubator/synapse/trunk/java/modules/core/test-resources/rest/conf/axis2-rest.xml
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test-resources/rest/conf/axis2-rest.xml?rev=388894&view=auto
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test-resources/rest/conf/axis2-rest.xml (added)
+++ incubator/synapse/trunk/java/modules/core/test-resources/rest/conf/axis2-rest.xml Sun Mar 26 03:03:22 2006
@@ -0,0 +1,128 @@
+<axisconfig name="AxisJava2.0_Synapse">
+    <!-- ================================================= -->
+    <!-- Parameters -->
+    <!-- ================================================= -->
+    <parameter name="hotdeployment" locked="false">true</parameter>
+    <parameter name="hotupdate" locked="false">false</parameter>
+    <parameter name="enableMTOM" locked="false">true</parameter>
+    <!-- Uncomment this to enable REST support -->
+
+    <parameter name="enableREST" locked="false">true</parameter>
+
+    <!-- Location of the SynapseRepository -->
+    <parameter name="SynapseConfiguration" locked="false">conf/synapse.xml</parameter>
+
+    <!-- Engage the addressing module -->
+    <!--<module ref="addressing"/>-->
+
+    <parameter name="userName" locked="false">admin</parameter>
+    <parameter name="password" locked="false">axis2</parameter>
+
+    <!-- ================================================= -->
+    <!-- Message Receivers -->
+    <!-- ================================================= -->
+    <!--This is the Deafult Message Receiver for the system , if you want to have MessageReceivers for -->
+    <!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
+    <!--any operation -->
+    <!--Note : You can ovride this for particular service by adding the same element with your requirement-->
+    <messageReceivers>
+        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+    </messageReceivers>
+    <!-- ================================================= -->
+    <!-- Transport Ins -->
+    <!-- ================================================= -->
+    <transportReceiver name="http"
+                       class="org.apache.axis2.transport.http.SimpleHTTPServer">
+        <parameter name="port" locked="false">6060</parameter>
+        <!--If you want to give your own host address for EPR generation-->
+        <!--uncommet following paramter , and set as you required.-->
+        <!--<parameter name="hostname" locked="false">http://myApp.com/ws</parameter>-->
+    </transportReceiver>
+
+    <transportReceiver name="tcp"
+                       class="org.apache.axis2.transport.tcp.TCPServer">
+        <parameter name="port" locked="false">6061</parameter>
+        <!--If you want to give your own host address for EPR generation-->
+        <!--uncommet following paramter , and set as you required.-->
+        <!--<parameter name="hostname" locked="false">tcp://myApp.com/ws</parameter>-->
+    </transportReceiver>
+
+    <!-- ================================================= -->
+    <!-- Transport Outs -->
+    <!-- ================================================= -->
+
+    <transportSender name="tcp"
+                     class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+    <transportSender name="local"
+                     class="org.apache.axis2.transport.local.LocalTransportSender"/>
+    <transportSender name="jms"
+                     class="org.apache.axis2.transport.jms.JMSSender"/>
+    <transportSender name="http"
+                     class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+    </transportSender>
+    <transportSender name="https"
+                     class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+    </transportSender>
+
+    <!-- ================================================= -->
+    <!-- Phases  -->
+    <!-- ================================================= -->
+    <phaseOrder type="inflow">
+        <!--  System pre defined phases       -->
+        <phase name="TransportIn"/>
+        <phase name="PreDispatch"/>
+        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+            <handler name="RequestURIBasedDispatcher"
+                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+
+            <handler name="SOAPActionBasedDispatcher"
+                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+
+            <handler name="AddressingBasedDispatcher"
+                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+
+            <handler name="SOAPMessageBodyBasedDispatcher"
+                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+            <handler name="InstanceDispatcher"
+                     class="org.apache.axis2.engine.InstanceDispatcher">
+                <order phase="PostDispatch"/>
+            </handler>
+        </phase>
+        <!--  System pre defined phases       -->
+        <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
+        <phase name="OperationInPhase"/>
+    </phaseOrder>
+    <phaseOrder type="outflow">
+        <!--      user can add his own phases to this area  -->
+        <phase name="OperationOutPhase"/>
+        <!--system predefined phase-->
+        <!--these phase will run irrespective of the service-->
+        <phase name="PolicyDetermination"/>
+        <phase name="MessageOut"/>
+    </phaseOrder>
+    <phaseOrder type="INfaultflow">
+        <!--      user can add his own phases to this area  -->
+        <phase name="OperationInFaultPhase"/>
+    </phaseOrder>
+    <phaseOrder type="Outfaultflow">
+        <!--      user can add his own phases to this area  -->
+        <phase name="OperationOutFaultPhase"/>
+        <phase name="PolicyDetermination"/>
+        <phase name="MessageOut"/>
+    </phaseOrder>
+</axisconfig>
\ No newline at end of file

Added: incubator/synapse/trunk/java/modules/core/test-resources/tcp/axis2-tcp.xml
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test-resources/tcp/axis2-tcp.xml?rev=388894&view=auto
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test-resources/tcp/axis2-tcp.xml (added)
+++ incubator/synapse/trunk/java/modules/core/test-resources/tcp/axis2-tcp.xml Sun Mar 26 03:03:22 2006
@@ -0,0 +1,128 @@
+<axisconfig name="AxisJava2.0_Synapse">
+    <!-- ================================================= -->
+    <!-- Parameters -->
+    <!-- ================================================= -->
+    <parameter name="hotdeployment" locked="false">true</parameter>
+    <parameter name="hotupdate" locked="false">false</parameter>
+    <parameter name="enableMTOM" locked="false">true</parameter>
+    <!-- Uncomment this to enable REST support -->
+
+    <parameter name="enableREST" locked="false">true</parameter>
+
+    <!-- Location of the SynapseRepository -->
+    <parameter name="SynapseConfiguration" locked="false">conf/synapse.xml</parameter>
+
+    <!-- Engage the addressing module -->
+    <module ref="addressing"/>
+
+    <parameter name="userName" locked="false">admin</parameter>
+    <parameter name="password" locked="false">axis2</parameter>
+
+    <!-- ================================================= -->
+    <!-- Message Receivers -->
+    <!-- ================================================= -->
+    <!--This is the Deafult Message Receiver for the system , if you want to have MessageReceivers for -->
+    <!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
+    <!--any operation -->
+    <!--Note : You can ovride this for particular service by adding the same element with your requirement-->
+    <messageReceivers>
+        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+    </messageReceivers>
+    <!-- ================================================= -->
+    <!-- Transport Ins -->
+    <!-- ================================================= -->
+    <transportReceiver name="http"
+                       class="org.apache.axis2.transport.http.SimpleHTTPServer">
+        <parameter name="port" locked="false">6060</parameter>
+        <!--If you want to give your own host address for EPR generation-->
+        <!--uncommet following paramter , and set as you required.-->
+        <!--<parameter name="hostname" locked="false">http://myApp.com/ws</parameter>-->
+    </transportReceiver>
+
+    <transportReceiver name="tcp"
+                       class="org.apache.axis2.transport.tcp.TCPServer">
+        <parameter name="port" locked="false">6061</parameter>
+        <!--If you want to give your own host address for EPR generation-->
+        <!--uncommet following paramter , and set as you required.-->
+        <!--<parameter name="hostname" locked="false">tcp://myApp.com/ws</parameter>-->
+    </transportReceiver>
+
+    <!-- ================================================= -->
+    <!-- Transport Outs -->
+    <!-- ================================================= -->
+
+    <transportSender name="tcp"
+                     class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+    <transportSender name="local"
+                     class="org.apache.axis2.transport.local.LocalTransportSender"/>
+    <transportSender name="jms"
+                     class="org.apache.axis2.transport.jms.JMSSender"/>
+    <transportSender name="http"
+                     class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+    </transportSender>
+    <transportSender name="https"
+                     class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+    </transportSender>
+
+    <!-- ================================================= -->
+    <!-- Phases  -->
+    <!-- ================================================= -->
+    <phaseOrder type="inflow">
+        <!--  System pre defined phases       -->
+        <phase name="TransportIn"/>
+        <phase name="PreDispatch"/>
+        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+            <handler name="RequestURIBasedDispatcher"
+                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+
+            <handler name="SOAPActionBasedDispatcher"
+                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+
+            <handler name="AddressingBasedDispatcher"
+                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+
+            <handler name="SOAPMessageBodyBasedDispatcher"
+                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+            <handler name="InstanceDispatcher"
+                     class="org.apache.axis2.engine.InstanceDispatcher">
+                <order phase="PostDispatch"/>
+            </handler>
+        </phase>
+        <!--  System pre defined phases       -->
+        <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
+        <phase name="OperationInPhase"/>
+    </phaseOrder>
+    <phaseOrder type="outflow">
+        <!--      user can add his own phases to this area  -->
+        <phase name="OperationOutPhase"/>
+        <!--system predefined phase-->
+        <!--these phase will run irrespective of the service-->
+        <phase name="PolicyDetermination"/>
+        <phase name="MessageOut"/>
+    </phaseOrder>
+    <phaseOrder type="INfaultflow">
+        <!--      user can add his own phases to this area  -->
+        <phase name="OperationInFaultPhase"/>
+    </phaseOrder>
+    <phaseOrder type="Outfaultflow">
+        <!--      user can add his own phases to this area  -->
+        <phase name="OperationOutFaultPhase"/>
+        <phase name="PolicyDetermination"/>
+        <phase name="MessageOut"/>
+    </phaseOrder>
+</axisconfig>
\ No newline at end of file

Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/ExceptionHandlingTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/ExceptionHandlingTest.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/ExceptionHandlingTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/ExceptionHandlingTest.java Sun Mar 26 03:03:22 2006
@@ -2,12 +2,14 @@
 
 import junit.framework.TestCase;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMElement;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.transport.http.SimpleHTTPServer;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.axis2.Axis2SynapseEnvironment;
 import org.apache.synapse.axis2.Axis2SynapseMessage;
 import org.apache.synapse.util.Axis2EnvSetup;
+import org.apache.axiom.om.OMElement;
 /*
 * Copyright 2004,2005 The Apache Software Foundation.
 *
@@ -46,8 +48,10 @@
         config = Axis2EnvSetup.getSynapseConfigElement(synapsexml);
         env = new Axis2SynapseEnvironment(config,
                 Thread.currentThread().getContextClassLoader());
-        targetServer = new SimpleHTTPServer(
-                "target/synapse-repository-sendonAxis2", 5043);
+        ConfigurationContext context = ConfigurationContextFactory
+                .createConfigurationContextFromFileSystem(
+                        "target/synapse-repository-sendonAxis2", null);
+        targetServer = new SimpleHTTPServer(context,5043);
         targetServer.start();
     }
 

Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/MultipleAddressingModuleEngagementTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/MultipleAddressingModuleEngagementTest.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/MultipleAddressingModuleEngagementTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/MultipleAddressingModuleEngagementTest.java Sun Mar 26 03:03:22 2006
@@ -2,13 +2,13 @@
 
 import junit.framework.TestCase;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMElement;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.SynapseMessage;
 
 import org.apache.synapse.axis2.Axis2SynapseEnvironment;
 import org.apache.synapse.axis2.Axis2SynapseMessage;
 import org.apache.synapse.util.Axis2EnvSetup;
+import org.apache.axiom.om.OMElement;
 /*
 * Copyright 2004,2005 The Apache Software Foundation.
 *

Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/test/Echo.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/test/Echo.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/test/Echo.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/test/Echo.java Sun Mar 26 03:03:22 2006
@@ -1,10 +1,10 @@
 package org.apache.axis2.test;
 
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMFactory;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMNamespace;
 import org.apache.axis2.AxisFault;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.OMFactory;
 /*
 * Copyright 2004,2005 The Apache Software Foundation.
 *

Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/TestSynapseMessage.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/TestSynapseMessage.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/TestSynapseMessage.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/TestSynapseMessage.java Sun Mar 26 03:03:22 2006
@@ -2,18 +2,17 @@
 
 import org.apache.axis2.AxisFault;
 
-import org.apache.axis2.addressing.AddressingConstants.Submission;
+import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMNamespace;
-
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPHeaderBlock;
-import org.apache.axis2.soap.SOAPFactory;
 import org.apache.synapse.axis2.Axis2SynapseMessage;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.soap.SOAPHeaderBlock;
 
 public class TestSynapseMessage {
     public static final String URN_SAMPLE_TO_ADDRESS = "urn:sample-toAddress";
@@ -26,10 +25,8 @@
         MessageContext msgCtx;
 
         try {
-            ConfigurationContextFactory conFac =
-                    new ConfigurationContextFactory();
-            ConfigurationContext configCtx = conFac
-                    .createConfigurationContextFromFileSystem(testingRepository);
+            ConfigurationContext configCtx = ConfigurationContextFactory
+                    .createConfigurationContextFromFileSystem(testingRepository,null);
             msgCtx = new MessageContext();
             msgCtx.setConfigurationContext(configCtx);
             msgCtx.setServerSide(true);
@@ -56,10 +53,16 @@
         Axis2SynapseMessage sm =
                 createSampleSOAP11MessageWithoutAddressing(testingRepository);
         SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
-        OMNamespace wsaTo = fac.createOMNamespace(Submission.WSA_NAMESPACE,"wsa");
-        SOAPHeaderBlock addressingToHeaderBlock = fac.createSOAPHeaderBlock("To",wsaTo, sm.getEnvelope().getHeader());
+        OMNamespace wsaNS =
+                fac.createOMNamespace(AddressingConstants.Final.WSA_NAMESPACE, AddressingConstants.WSA_DEFAULT_PREFIX);
+        SOAPHeaderBlock addressingToHeaderBlock =
+                fac.createSOAPHeaderBlock(AddressingConstants.WSA_TO, wsaNS);
+        SOAPHeaderBlock addressingActionHeaderBlock =
+                fac.createSOAPHeaderBlock(AddressingConstants.WSA_ACTION, wsaNS);
         addressingToHeaderBlock.setText(URN_SAMPLE_TO_ADDRESS);
         sm.getEnvelope().getHeader().addChild(addressingToHeaderBlock);
+        sm.getEnvelope().getHeader().addChild(addressingActionHeaderBlock);
+
         return sm;
 
     }

Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/environment/EnvironmentAwareTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/environment/EnvironmentAwareTest.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/environment/EnvironmentAwareTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/environment/EnvironmentAwareTest.java Sun Mar 26 03:03:22 2006
@@ -5,6 +5,8 @@
 import org.apache.axis2.client.Options;
 
 import org.apache.axis2.client.ServiceClient;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.synapse.util.Axis2EnvSetup;
 import junit.framework.TestCase;
 
@@ -31,9 +33,10 @@
             "http://127.0.0.1:5043/axis2/services/anonymous");
 
     public void setUp() throws Exception {
-        synapseServer = new SimpleHTTPServer(
-                "target/synapse-repository-environmentaware",
-                5043);
+        ConfigurationContext context = ConfigurationContextFactory
+                .createConfigurationContextFromFileSystem(
+                        "target/synapse-repository-environmentaware", null);
+        synapseServer = new SimpleHTTPServer(context, 5043);
         synapseServer.start();
     }
 

Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/LoggerTestSample.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/LoggerTestSample.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/LoggerTestSample.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/LoggerTestSample.java Sun Mar 26 03:03:22 2006
@@ -15,9 +15,9 @@
  */
 package org.apache.synapse.mediators;
 
-import org.apache.axis2.soap.SOAPEnvelope;
 import org.apache.synapse.SynapseMessage;
 import org.apache.synapse.api.Mediator;
+import org.apache.axiom.soap.SOAPEnvelope;
 
 /**
  *
@@ -27,21 +27,21 @@
  */
 public class LoggerTestSample implements Mediator {
 
-	public boolean mediate(SynapseMessage mc) {
-		System.out.println("LoggerTestSample.mediate:");
-		if (mc.getTo() != null && mc.getTo().getAddress() != null)
-			System.out.println("LoggerTestSample.mediate to:" + mc.getTo().getAddress());
-		else
-			System.out.println("Empty To");
-		if (mc.getReplyTo() != null && mc.getReplyTo().getAddress() != null)
-			System.out.println("LoggerTestSample.mediate ReplyTo:"
-					+ mc.getReplyTo().getAddress());
-		else
-			System.out.println("Empty ReplyTo");
-		SOAPEnvelope env = mc.getEnvelope();
-		System.out.println(env.toString());
-		System.out.println();
-		return true;
-	}
+    public boolean mediate(SynapseMessage mc) {
+        System.out.println("LoggerTestSample.mediate:");
+        if (mc.getTo() != null && mc.getTo().getAddress() != null)
+            System.out.println("LoggerTestSample.mediate to:" + mc.getTo().getAddress());
+        else
+            System.out.println("Empty To");
+        if (mc.getReplyTo() != null && mc.getReplyTo().getAddress() != null)
+            System.out.println("LoggerTestSample.mediate ReplyTo:"
+                    + mc.getReplyTo().getAddress());
+        else
+            System.out.println("Empty ReplyTo");
+        SOAPEnvelope env = mc.getEnvelope();
+        System.out.println(env.toString());
+        System.out.println();
+        return true;
+    }
 
 }

Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/MediatorFalseReturnTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/MediatorFalseReturnTest.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/MediatorFalseReturnTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/MediatorFalseReturnTest.java Sun Mar 26 03:03:22 2006
@@ -19,12 +19,12 @@
 
 
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMElement;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.SynapseMessage;
 import org.apache.synapse.axis2.Axis2SynapseEnvironment;
 import org.apache.synapse.axis2.Axis2SynapseMessage;
 import org.apache.synapse.util.Axis2EnvSetup;
+import org.apache.axiom.om.OMElement;
 import junit.framework.TestCase;
 
 

Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/SimpleGETResourceAquiringMediator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/SimpleGETResourceAquiringMediator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/SimpleGETResourceAquiringMediator.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/SimpleGETResourceAquiringMediator.java Sun Mar 26 03:03:22 2006
@@ -5,7 +5,7 @@
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.SynapseException;
 import org.apache.synapse.SynapseMessage;
-import org.apache.axis2.om.OMElement;
+import org.apache.axiom.om.OMElement;
 import junit.framework.TestCase;
 /*
  * Copyright 2004,2005 The Apache Software Foundation.

Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/conditions/ExactlyOneProcessorWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/conditions/ExactlyOneProcessorWithRuleTest.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/conditions/ExactlyOneProcessorWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/conditions/ExactlyOneProcessorWithRuleTest.java Sun Mar 26 03:03:22 2006
@@ -2,13 +2,13 @@
 
 import junit.framework.TestCase;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMElement;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.SynapseMessage;
 import org.apache.synapse.Constants;
 import org.apache.synapse.util.Axis2EnvSetup;
 import org.apache.synapse.axis2.Axis2SynapseEnvironment;
 import org.apache.synapse.axis2.Axis2SynapseMessage;
+import org.apache.axiom.om.OMElement;
 
 /**
  * TestCase for SwitchProcessor

Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/AddressingProcessorWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/AddressingProcessorWithRuleTest.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/AddressingProcessorWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/AddressingProcessorWithRuleTest.java Sun Mar 26 03:03:22 2006
@@ -2,7 +2,6 @@
 
 import junit.framework.TestCase;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMElement;
 import org.apache.synapse.Constants;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.SynapseMessage;
@@ -12,6 +11,7 @@
 import org.apache.synapse.axis2.Axis2SynapseMessage;
 import org.apache.synapse.axis2.Axis2SynapseEnvironment;
 import org.apache.synapse.util.Axis2EnvSetup;
+import org.apache.axiom.om.OMElement;
 /*
 * Copyright 2004,2005 The Apache Software Foundation.
 *

Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ClassMediatorProcessorWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ClassMediatorProcessorWithRuleTest.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ClassMediatorProcessorWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ClassMediatorProcessorWithRuleTest.java Sun Mar 26 03:03:22 2006
@@ -2,7 +2,6 @@
 
 import junit.framework.TestCase;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMElement;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.SynapseMessage;
 import org.apache.synapse.Processor;
@@ -11,6 +10,7 @@
 import org.apache.synapse.axis2.Axis2SynapseMessage;
 import org.apache.synapse.axis2.Axis2SynapseEnvironment;
 import org.apache.synapse.util.Axis2EnvSetup;
+import org.apache.axiom.om.OMElement;
 /*
 * Copyright 2004,2005 The Apache Software Foundation.
 *

Modified: incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/DefineProcessorwithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/DefineProcessorwithRuleTest.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/DefineProcessorwithRuleTest.java (original)
+++ incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/DefineProcessorwithRuleTest.java Sun Mar 26 03:03:22 2006
@@ -22,9 +22,9 @@
 import org.apache.synapse.axis2.Axis2SynapseEnvironment;
 import org.apache.synapse.axis2.Axis2SynapseMessage;
 import org.apache.synapse.util.Axis2EnvSetup;
-import org.apache.axis2.om.OMElement;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axiom.om.OMElement;
 
 import java.util.List;
 



---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org