Author: pzf
Date: Fri Mar 31 00:24:49 2006
New Revision: 390360

URL: http://svn.apache.org/viewcvs?rev=390360&view=rev
Log:
Based on the discussion we had (a while back) and vote to refactor the 
mediators and processors, these are the changes. 

Processor is now Deprecated as is ProcessorConfigurator. 

Processors have been merged with Mediators. To create a Mediator with your own 
XML you create a MediatorFactory.

The SynapseEnvironment is now available using the 
SynapseMessage.getSynapseEnvironment(), so EnvironmentAware is now deprecated 
too.

All the tests work on my machine, however, I haven't yet done a full system 
test.


Added:
    
incubator/synapse/trunk/java/modules/extensions/src/META-INF/services/org.apache.synapse.xml.MediatorFactory
      - copied, changed from r389703, 
incubator/synapse/trunk/java/modules/extensions/src/META-INF/services/org.apache.synapse.xml.ProcessorConfigurator
    
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediator.java
      - copied, changed from r390201, 
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediatorProcessor.java
    
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediatorFactory.java
      - copied, changed from r390201, 
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediatorProcessorConfigurator.java
Removed:
    
incubator/synapse/trunk/java/modules/extensions/src/META-INF/services/org.apache.synapse.xml.ProcessorConfigurator
    
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediatorProcessor.java
    
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediatorProcessorConfigurator.java

Copied: 
incubator/synapse/trunk/java/modules/extensions/src/META-INF/services/org.apache.synapse.xml.MediatorFactory
 (from r389703, 
incubator/synapse/trunk/java/modules/extensions/src/META-INF/services/org.apache.synapse.xml.ProcessorConfigurator)
URL: 
http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/extensions/src/META-INF/services/org.apache.synapse.xml.MediatorFactory?p2=incubator/synapse/trunk/java/modules/extensions/src/META-INF/services/org.apache.synapse.xml.MediatorFactory&p1=incubator/synapse/trunk/java/modules/extensions/src/META-INF/services/org.apache.synapse.xml.ProcessorConfigurator&r1=389703&r2=390360&rev=390360&view=diff
==============================================================================
--- 
incubator/synapse/trunk/java/modules/extensions/src/META-INF/services/org.apache.synapse.xml.ProcessorConfigurator
 (original)
+++ 
incubator/synapse/trunk/java/modules/extensions/src/META-INF/services/org.apache.synapse.xml.MediatorFactory
 Fri Mar 31 00:24:49 2006
@@ -1 +1 @@
-org.apache.synapse.processors.mediatortypes.spring.SpringMediatorProcessorConfigurator
\ No newline at end of file
+org.apache.synapse.mediators.spring.SpringMediatorFactory
\ No newline at end of file

Copied: 
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediator.java
 (from r390201, 
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediatorProcessor.java)
URL: 
http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediator.java?p2=incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediator.java&p1=incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediatorProcessor.java&r1=390201&r2=390360&rev=390360&view=diff
==============================================================================
--- 
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediatorProcessor.java
 (original)
+++ 
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediator.java
 Fri Mar 31 00:24:49 2006
@@ -1,10 +1,9 @@
 package org.apache.synapse.mediators.spring;
 
-import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.SynapseMessage;
 
 import org.apache.synapse.api.Mediator;
-import org.apache.synapse.mediators.base.AbstractMediator;
+
 import org.springframework.context.support.GenericApplicationContext;
 
 /**
@@ -19,7 +18,7 @@
  * a BeanName property, which is set with the name of the bean  
  *
  */
-public class SpringMediator extends AbstractMediator {
+public class SpringMediator implements Mediator {
        
        private GenericApplicationContext ctx = null;
 

Copied: 
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediatorFactory.java
 (from r390201, 
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediatorProcessorConfigurator.java)
URL: 
http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediatorFactory.java?p2=incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediatorFactory.java&p1=incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediatorProcessorConfigurator.java&r1=390201&r2=390360&rev=390360&view=diff
==============================================================================
--- 
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediatorProcessorConfigurator.java
 (original)
+++ 
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/mediators/spring/SpringMediatorFactory.java
 Fri Mar 31 00:24:49 2006
@@ -10,13 +10,9 @@
 import org.apache.synapse.api.Mediator;
 import org.apache.synapse.xml.AbstractMediatorFactory;
 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.xml.AbstractProcessorConfigurator;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMAttribute;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
@@ -41,9 +37,9 @@
  */
 public class SpringMediatorFactory extends AbstractMediatorFactory {
        private static final QName tagName = new 
QName(Constants.SYNAPSE_NAMESPACE+"/spring", "springmediator");
-       public Mediator createProcessor(SynapseEnvironment se, OMElement el) {
+       public Mediator createMediator(SynapseEnvironment se, OMElement el) {
                SpringMediator sm = new SpringMediator();
-               super.setNameOnProcessor(se,el,smp);
+               super.setNameOnMediator(se,el,sm);
                
                OMAttribute bean = el.getAttribute(new QName("bean"));
                if (bean == null) throw new SynapseException("missing bean 
attribute on "+el.toString());
@@ -81,8 +77,8 @@
                xbdr.loadBeanDefinitions(new 
ByteArrayResource(baos.toByteArray()));
                ctx.setClassLoader(se.getClassLoader());
                ctx.refresh();
-               smp.setContext(ctx);
-               return smp;
+               sm.setContext(ctx);
+               return sm;
                
                
                



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to