You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by pz...@apache.org on 2005/11/25 18:15:44 UTC

svn commit: r348982 - in /incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse: ./ axis2/ processors/ processors/builtin/ xml/

Author: pzf
Date: Fri Nov 25 09:15:15 2005
New Revision: 348982

URL: http://svn.apache.org/viewcvs?rev=348982&view=rev
Log:
updates for in out never ref, plus tidy up xml and synapseenv

Removed:
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/Configurator.java
Modified:
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/SynapseEnvironment.java
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2SynapseEnvironment.java
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/AbstractProcessor.java
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/ListProcessor.java
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/builtin/SendProcessor.java
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/AbstractListProcessorConfigurator.java
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/AbstractProcessorConfigurator.java
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/AddressingProcessorConfigurator.java
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/ClassMediatorProcessorConfigurator.java
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/FaultProcessorConfigurator.java
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/HeaderProcessorConfigurator.java
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/LogProcessorConfigurator.java
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/ProcessorConfigurator.java
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/ProcessorConfiguratorFinder.java
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/RegexProcessorConfigurator.java
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/SendProcessorConfigurator.java
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/ServiceMediatorProcessorConfigurator.java
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/StageProcessorConfigurator.java
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/SynapseProcessorConfigurator.java
    incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/XPathProcessorConfigurator.java

Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/SynapseEnvironment.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/SynapseEnvironment.java?rev=348982&r1=348981&r2=348982&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/SynapseEnvironment.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/SynapseEnvironment.java Fri Nov 25 09:15:15 2005
@@ -18,11 +18,10 @@
 
 public interface SynapseEnvironment {
 	public void injectMessage(SynapseMessage smc);
-
 	public ClassLoader getClassLoader();
-
-	public void sendOn(SynapseMessage smc);
-
-	public void sendBack(SynapseMessage smc);
-
+	public void send(SynapseMessage smc);
+	public Processor lookupProcessor(String name);
+	public void addProcessor(Processor p);
+	public Processor getMasterProcessor();
+	public void setMasterProcessor(Processor p);
 }

Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2SynapseEnvironment.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2SynapseEnvironment.java?rev=348982&r1=348981&r2=348982&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2SynapseEnvironment.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2SynapseEnvironment.java Fri Nov 25 09:15:15 2005
@@ -1,27 +1,36 @@
 package org.apache.synapse.axis2;
 
+import java.util.HashMap;
+import java.util.Map;
+
 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.SynapseMessage;
 
-import org.apache.synapse.xml.Configurator;
+import org.apache.synapse.xml.ProcessorConfiguratorFinder;
 
 public class Axis2SynapseEnvironment implements SynapseEnvironment {
-	private Processor processor = null;
+	private Processor mainprocessor = null;
 
 	private ClassLoader cl = null;
 
+	private Map processors = new HashMap();
+
+	private Log log = LogFactory.getLog(getClass());
+
 	public Axis2SynapseEnvironment(OMElement synapseConfiguration,
 			ClassLoader cl) {
 		super();
 		this.cl = cl;
-		processor = Configurator.getProcessor(this, synapseConfiguration);
+		mainprocessor = ProcessorConfiguratorFinder.getProcessor(this, synapseConfiguration);
 	}
 
 	public void injectMessage(SynapseMessage smc) {
-		processor.process(this, smc);
+		mainprocessor.process(this, smc);
 	}
 
 	public ClassLoader getClassLoader() {
@@ -32,14 +41,30 @@
 		this.cl = cl;
 	}
 
-	public void sendOn(SynapseMessage smc) {
-		Axis2Sender.sendOn(smc);
-
+	public void send(SynapseMessage sm) {
+		if (sm.isResponse()) 
+			Axis2Sender.sendBack(sm);
+		else 
+			Axis2Sender.sendOn(sm);
 	}
 
-	public void sendBack(SynapseMessage smc) {
-		Axis2Sender.sendBack(smc);
+	
+	public Processor lookupProcessor(String name) {
+		return (Processor) processors.get(name);
+	}
 
+	public void addProcessor(Processor p) {
+		log.debug("adding processor with name " + p.getName());
+		if (processors.containsKey(p.getName()))
+			log.warn("name " + p.getName() + "already present");
+		processors.put(p.getName(), p);
 	}
 
+	public Processor getMasterProcessor() {
+		return mainprocessor;
+	}
+	
+	public void setMasterProcessor(Processor p) {
+		mainprocessor = p;
+	}
 }

Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/AbstractProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/AbstractProcessor.java?rev=348982&r1=348981&r2=348982&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/AbstractProcessor.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/AbstractProcessor.java Fri Nov 25 09:15:15 2005
@@ -1,25 +1,9 @@
 package org.apache.synapse.processors;
 
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axis2.om.OMAttribute;
-import org.apache.axis2.om.OMElement;
 import org.apache.synapse.Processor;
-import org.apache.synapse.SynapseEnvironment;
-
 
 public abstract class AbstractProcessor implements Processor {
 	private String name = null;
-
-	List processors = null;
-
-	public void compile(SynapseEnvironment se, OMElement el) {
-		OMAttribute nm = el.getAttribute(new QName("name"));
-		if (nm != null)
-			name = nm.getAttributeValue();
-	}
 
 	public String getName() {
 		return name;

Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/ListProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/ListProcessor.java?rev=348982&r1=348981&r2=348982&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/ListProcessor.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/ListProcessor.java Fri Nov 25 09:15:15 2005
@@ -23,9 +23,9 @@
 	private Log log = LogFactory.getLog(getClass());
 
 	List processors = null;
-
 	
 	public boolean process(SynapseEnvironment se, SynapseMessage smc) {
+		log.debug("process");
 		if (processors == null) {
 			log.info("process called on empty processor list");
 			return true;
@@ -33,6 +33,7 @@
 		Iterator it = processors.iterator();
 		while (it.hasNext()) {
 			Processor p = (Processor) it.next();
+			log.debug(p.getName() + " = "+ p.getClass());
 			if (!p.process(se,smc))
 				return false;
 		}
@@ -40,6 +41,12 @@
 	}
 
 	public void setList(List p) {
+		log.debug("setting list");
+		Iterator it = p.iterator();
+		while (it.hasNext()) {
+			Processor x = (Processor)it.next();
+			log.debug(x.getName() +" = "+ x.getClass());
+		}
 		processors = p;
 	}
 	public List getList() {

Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/builtin/SendProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/builtin/SendProcessor.java?rev=348982&r1=348981&r2=348982&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/builtin/SendProcessor.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/builtin/SendProcessor.java Fri Nov 25 09:15:15 2005
@@ -14,13 +14,7 @@
 	
 	public boolean process(SynapseEnvironment se, SynapseMessage smc) {
 		log.debug("process");
-		if (smc.isResponse()) {
-			log.debug("sendback");
-			se.sendBack(smc);
-		} else {
-			log.debug("sendon");
-			se.sendOn(smc);
-		}
+		se.send(smc);
 		return false;
 
 	}

Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/AbstractListProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/AbstractListProcessorConfigurator.java?rev=348982&r1=348981&r2=348982&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/AbstractListProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/AbstractListProcessorConfigurator.java Fri Nov 25 09:15:15 2005
@@ -4,7 +4,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import javax.xml.namespace.QName;
+
 
 import org.apache.axis2.om.OMElement;
 import org.apache.commons.logging.Log;
@@ -17,15 +17,15 @@
 
 	Log log = LogFactory.getLog(getClass());
 	
-	public void compile(SynapseEnvironment se, OMElement el, ListProcessor p)
+	public void addChildrenAndSetName(SynapseEnvironment se, OMElement el, ListProcessor p)
 	{
-		super.compile(se, el, p);
+		super.setNameOnProcessor(se, el, p);
 
 		Iterator it = el.getChildElements();
 		List processors = new LinkedList();
 		while (it.hasNext()) {
 			OMElement child = (OMElement) it.next();
-			Processor proc = Configurator.getProcessor(se, child);
+			Processor proc = ProcessorConfiguratorFinder.getProcessor(se, child);
 			if (proc != null)
 				processors.add(proc);
 			else
@@ -35,9 +35,6 @@
 		
 	}
 
-	public abstract QName getTagQName();
-
-	public abstract Processor compile(SynapseEnvironment se, OMElement el);
 		
 
 }

Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/AbstractProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/AbstractProcessorConfigurator.java?rev=348982&r1=348981&r2=348982&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/AbstractProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/AbstractProcessorConfigurator.java Fri Nov 25 09:15:15 2005
@@ -4,21 +4,27 @@
 
 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;
 
 public abstract class AbstractProcessorConfigurator implements ProcessorConfigurator {
 
 	
-	public abstract Processor compile(SynapseEnvironment se, OMElement el);
 	
-	public void compile(SynapseEnvironment se, OMElement el, Processor p) {
+	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)
-			p.setName(nm.getAttributeValue().trim());
+		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());
 		
 	}
 
-	public abstract QName getTagQName();
-
+	
 }

Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/AddressingProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/AddressingProcessorConfigurator.java?rev=348982&r1=348981&r2=348982&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/AddressingProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/AddressingProcessorConfigurator.java Fri Nov 25 09:15:15 2005
@@ -27,9 +27,9 @@
 	}
 
 
-	public Processor compile(SynapseEnvironment se, OMElement el) {
+	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
 		AddressingProcessor ap = new AddressingProcessor();
-		super.compile(se,el,ap);
+		super.setNameOnProcessor(se,el,ap);
 		return ap;
 	}
 

Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/ClassMediatorProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/ClassMediatorProcessorConfigurator.java?rev=348982&r1=348981&r2=348982&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/ClassMediatorProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/ClassMediatorProcessorConfigurator.java Fri Nov 25 09:15:15 2005
@@ -13,9 +13,9 @@
 public class ClassMediatorProcessorConfigurator extends AbstractProcessorConfigurator {
 	private static final QName CLM_Q = new QName(Constants.SYNAPSE_NAMESPACE,
 			"classmediator");
-	public Processor compile(SynapseEnvironment se, OMElement el) {
+	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
 		ClassMediatorProcessor cmp = new ClassMediatorProcessor();
-		super.compile(se, el, cmp);
+		super.setNameOnProcessor(se, el, cmp);
 
 		OMAttribute clsName = el.getAttribute(new QName("class"));
 		if (clsName == null)

Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/FaultProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/FaultProcessorConfigurator.java?rev=348982&r1=348981&r2=348982&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/FaultProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/FaultProcessorConfigurator.java Fri Nov 25 09:15:15 2005
@@ -23,9 +23,9 @@
 	
 
 	
-	public Processor compile(SynapseEnvironment se, OMElement el) {
+	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
 		FaultProcessor fp = new FaultProcessor();
-		super.compile(se, el, fp);
+		super.setNameOnProcessor(se, el, fp);
 		return fp;
 	}
 

Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/HeaderProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/HeaderProcessorConfigurator.java?rev=348982&r1=348981&r2=348982&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/HeaderProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/HeaderProcessorConfigurator.java Fri Nov 25 09:15:15 2005
@@ -28,9 +28,9 @@
 		private static final QName TYPE_ATT_Q = new QName("type"),
 			VALUE_ATT_Q = new QName("value");
 
-		public Processor compile(SynapseEnvironment se, OMElement el) {
+		public Processor createProcessor(SynapseEnvironment se, OMElement el) {
 			HeaderProcessor hp = new HeaderProcessor();
-			super.compile(se, el, hp);
+			super.setNameOnProcessor(se, el, hp);
 			OMAttribute val = el.getAttribute(VALUE_ATT_Q);
 			OMAttribute type = el.getAttribute(TYPE_ATT_Q);
 			if (val == null || type == null) {

Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/LogProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/LogProcessorConfigurator.java?rev=348982&r1=348981&r2=348982&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/LogProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/LogProcessorConfigurator.java Fri Nov 25 09:15:15 2005
@@ -19,9 +19,9 @@
 	}
 
 
-	public Processor compile(SynapseEnvironment se, OMElement el) {
+	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
 		LogProcessor lp = new LogProcessor();
-		super.compile(se,el,lp);
+		super.setNameOnProcessor(se,el,lp);
 		return lp;
 	}
 

Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/ProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/ProcessorConfigurator.java?rev=348982&r1=348981&r2=348982&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/ProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/ProcessorConfigurator.java Fri Nov 25 09:15:15 2005
@@ -7,7 +7,7 @@
 import org.apache.synapse.SynapseEnvironment;
 
 public interface ProcessorConfigurator {
-	public Processor compile(SynapseEnvironment se, OMElement el);
+	public Processor createProcessor(SynapseEnvironment se, OMElement el);
 	public QName getTagQName();
 
 }

Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/ProcessorConfiguratorFinder.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/ProcessorConfiguratorFinder.java?rev=348982&r1=348981&r2=348982&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/ProcessorConfiguratorFinder.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/ProcessorConfiguratorFinder.java Fri Nov 25 09:15:15 2005
@@ -6,9 +6,13 @@
 
 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;
 
+import org.apache.synapse.Processor;
+import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.SynapseException;
 
 import sun.misc.Service;
@@ -35,7 +39,10 @@
 			ClassMediatorProcessorConfigurator.class,
 			ServiceMediatorProcessorConfigurator.class,
 			LogProcessorConfigurator.class, SendProcessorConfigurator.class,
-			FaultProcessorConfigurator.class, AddressingProcessorConfigurator.class };
+			FaultProcessorConfigurator.class,
+			AddressingProcessorConfigurator.class,
+			InProcessorConfigurator.class, OutProcessorConfigurator.class,
+			NeverProcessorConfigurator.class, RefProcessorConfigurator.class };
 
 	private static void initialise() {
 
@@ -69,5 +76,30 @@
 	public static Class find(QName qn) {
 		initialise();
 		return (Class) lookup.get(qn);
+	}
+	
+	/**
+	 * This method returns a Processor given an OMElement. This will be used
+	 * recursively by the elements which contain processor elements themselves
+	 * (e.g. rules)
+	 * 
+	 * @param synapseEnv
+	 * @param element
+	 * @return Processor
+	 */
+	public static Processor getProcessor(SynapseEnvironment synapseEnv, OMElement element) {
+		OMNamespace n = element.getNamespace();
+		System.out.println(element.getLocalName());
+		Class cls = find(new QName(n.getName(), element
+				.getLocalName()));
+		try {
+			ProcessorConfigurator pc = (ProcessorConfigurator) cls.newInstance();
+			Processor p = pc.createProcessor(synapseEnv, element);
+			return p;
+		} catch (InstantiationException e) {
+			throw new SynapseException(e);
+		} catch (IllegalAccessException e) {
+			throw new SynapseException(e);
+		}
 	}
 }

Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/RegexProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/RegexProcessorConfigurator.java?rev=348982&r1=348981&r2=348982&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/RegexProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/RegexProcessorConfigurator.java Fri Nov 25 09:15:15 2005
@@ -35,9 +35,9 @@
 
 	
 
-	public Processor compile(SynapseEnvironment se, OMElement el) {
+	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
 		RegexProcessor rp = new RegexProcessor();
-		super.compile(se, el, rp);
+		super.addChildrenAndSetName(se, el, rp);
 
 		OMAttribute patt = el.getAttribute(REGEX_PATTERN_ATT_Q);
 		if (patt == null) {

Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/SendProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/SendProcessorConfigurator.java?rev=348982&r1=348981&r2=348982&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/SendProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/SendProcessorConfigurator.java Fri Nov 25 09:15:15 2005
@@ -17,9 +17,9 @@
 
 	
 
-	public Processor compile(SynapseEnvironment se, OMElement el) {
+	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
 		SendProcessor sp =  new SendProcessor();
-		super.compile(se, el,sp);
+		super.setNameOnProcessor(se, el,sp);
 		return sp;
 		
 	}

Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/ServiceMediatorProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/ServiceMediatorProcessorConfigurator.java?rev=348982&r1=348981&r2=348982&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/ServiceMediatorProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/ServiceMediatorProcessorConfigurator.java Fri Nov 25 09:15:15 2005
@@ -15,9 +15,9 @@
 public class ServiceMediatorProcessorConfigurator extends AbstractProcessorConfigurator {
 	private static final QName tagName = new QName(Constants.SYNAPSE_NAMESPACE,
 			"servicemediator");
-	public Processor compile(SynapseEnvironment se, OMElement el) {
+	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
 		ServiceMediatorProcessor smp = new ServiceMediatorProcessor();
-		super.compile(se,el,smp);
+		super.setNameOnProcessor(se,el,smp);
 		
 		OMAttribute attr = el.getAttribute(new QName("service"));
 		if (attr == null)

Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/StageProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/StageProcessorConfigurator.java?rev=348982&r1=348981&r2=348982&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/StageProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/StageProcessorConfigurator.java Fri Nov 25 09:15:15 2005
@@ -17,9 +17,9 @@
 		return STAGE_Q;
 	}
 
-	public Processor compile(SynapseEnvironment se, OMElement el) {
+	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
 		StageProcessor sp = new StageProcessor();
-		super.compile(se, el, sp);
+		super.addChildrenAndSetName(se, el, sp);
 		return sp;
 	}
 

Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/SynapseProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/SynapseProcessorConfigurator.java?rev=348982&r1=348981&r2=348982&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/SynapseProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/SynapseProcessorConfigurator.java Fri Nov 25 09:15:15 2005
@@ -18,9 +18,9 @@
 		return tagname;
 	}
 
-	public Processor compile(SynapseEnvironment se, OMElement el) {
+	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
 		SynapseProcessor sp = new SynapseProcessor();
-		super.compile(se, el, sp);
+		super.addChildrenAndSetName(se, el, sp);
 		return sp;
 	}
 

Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/XPathProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/XPathProcessorConfigurator.java?rev=348982&r1=348981&r2=348982&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/XPathProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/xml/XPathProcessorConfigurator.java Fri Nov 25 09:15:15 2005
@@ -36,10 +36,10 @@
 	 * @see org.apache.synapse.spi.Processor#compile(org.apache.synapse.api.SynapseEnvironment,
 	 *      org.apache.axis2.om.OMElement)
 	 */
-	public Processor compile(SynapseEnvironment se, OMElement el) {
+	public Processor createProcessor(SynapseEnvironment se, OMElement el) {
 		XPathProcessor xp = new XPathProcessor();
 
-		super.compile(se, el, xp);
+		super.addChildrenAndSetName(se, el, xp);
 
 		OMAttribute expr = el.getAttribute(XPATH_EXPRESSION_ATT_Q);
 		if (expr == null) {



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