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/24 18:28:37 UTC
svn commit: r348773 - in /incubator/synapse/trunk/scratch/prototype3:
SpringMediator/ SpringMediator/META-INF/ SpringMediator/META-INF/services/
SpringMediator/org/ SpringMediator/org/apache/
SpringMediator/org/apache/synapse/ SpringMediator/org/apache...
Author: pzf
Date: Thu Nov 24 09:27:58 2005
New Revision: 348773
URL: http://svn.apache.org/viewcvs?rev=348773&view=rev
Log:
package updates, fixed dynamic discovery for processors, added separate springmediator support
Added:
incubator/synapse/trunk/scratch/prototype3/SpringMediator/
incubator/synapse/trunk/scratch/prototype3/SpringMediator/.classpath
incubator/synapse/trunk/scratch/prototype3/SpringMediator/.project
incubator/synapse/trunk/scratch/prototype3/SpringMediator/META-INF/
incubator/synapse/trunk/scratch/prototype3/SpringMediator/META-INF/services/
incubator/synapse/trunk/scratch/prototype3/SpringMediator/META-INF/services/org.apache.synapse.Processor
incubator/synapse/trunk/scratch/prototype3/SpringMediator/org/
incubator/synapse/trunk/scratch/prototype3/SpringMediator/org/apache/
incubator/synapse/trunk/scratch/prototype3/SpringMediator/org/apache/synapse/
incubator/synapse/trunk/scratch/prototype3/SpringMediator/org/apache/synapse/processors/
incubator/synapse/trunk/scratch/prototype3/SpringMediator/org/apache/synapse/processors/mediatortypes/
incubator/synapse/trunk/scratch/prototype3/SpringMediator/org/apache/synapse/processors/mediatortypes/spring/
incubator/synapse/trunk/scratch/prototype3/SpringMediator/org/apache/synapse/processors/mediatortypes/spring/SpringMediatorProcessor.java
incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/
incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/
incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/.classpath
incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/.project
incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/META-INF/
incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/META-INF/services/
incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/META-INF/services/org.apache.synapse.Processor
incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/org/
incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/org/apache/
incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/org/apache/synapse/
incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/org/apache/synapse/processors/
incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/org/apache/synapse/processors/mediatortypes/
incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/org/apache/synapse/processors/mediatortypes/spring/
incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/org/apache/synapse/processors/mediatortypes/spring/SpringMediatorProcessor.class (with props)
incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/target/
incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/target/classes/
Removed:
incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/Configurator.java
incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/ProcessorFinder.java
incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/api/ConfigurationAware.java
incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/api/MediatorConfiguration.java
incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/api/SOAPMessageContext.java
incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/api/SynapseEnvironment.java
incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/mediators/
incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/spi/
incubator/synapse/trunk/scratch/prototype3/test/org/
Modified:
incubator/synapse/trunk/scratch/prototype3/src/.classpath
incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/api/EnvironmentAware.java
incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/api/Mediator.java
incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2SOAPMessageContext.java
incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2Sender.java
incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2SynapseEnvironment.java
incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2SynapseEnvironmentFinder.java
incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/SynapseMessageReceiver.java
incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/AbstractProcessor.java
incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/AllProcessor.java
incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/rules/RegexProcessor.java
incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/rules/XPathProcessor.java
incubator/synapse/trunk/scratch/prototype3/src/sampleMediators/Logger.java
Added: incubator/synapse/trunk/scratch/prototype3/SpringMediator/.classpath
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/SpringMediator/.classpath?rev=348773&view=auto
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/SpringMediator/.classpath (added)
+++ incubator/synapse/trunk/scratch/prototype3/SpringMediator/.classpath Thu Nov 24 09:27:58 2005
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path=""/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/prototype3"/>
+ <classpathentry kind="lib" path="C:/spring/dist/spring-core.jar"/>
+ <classpathentry kind="lib" path="C:/spring/dist/spring-context.jar"/>
+ <classpathentry sourcepath="C:/axcommit/modules/core/src" kind="lib" path="C:/axcommit/target/axis2-0.93-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="C:/spring/dist/spring-beans.jar"/>
+ <classpathentry kind="lib" path="C:/axdb/target/lib/stax-api-1.0.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: incubator/synapse/trunk/scratch/prototype3/SpringMediator/.project
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/SpringMediator/.project?rev=348773&view=auto
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/SpringMediator/.project (added)
+++ incubator/synapse/trunk/scratch/prototype3/SpringMediator/.project Thu Nov 24 09:27:58 2005
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>SpringMediator</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: incubator/synapse/trunk/scratch/prototype3/SpringMediator/META-INF/services/org.apache.synapse.Processor
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/SpringMediator/META-INF/services/org.apache.synapse.Processor?rev=348773&view=auto
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/SpringMediator/META-INF/services/org.apache.synapse.Processor (added)
+++ incubator/synapse/trunk/scratch/prototype3/SpringMediator/META-INF/services/org.apache.synapse.Processor Thu Nov 24 09:27:58 2005
@@ -0,0 +1 @@
+org.apache.synapse.processors.mediatortypes.spring.SpringMediatorProcessor
\ No newline at end of file
Added: incubator/synapse/trunk/scratch/prototype3/SpringMediator/org/apache/synapse/processors/mediatortypes/spring/SpringMediatorProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/SpringMediator/org/apache/synapse/processors/mediatortypes/spring/SpringMediatorProcessor.java?rev=348773&view=auto
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/SpringMediator/org/apache/synapse/processors/mediatortypes/spring/SpringMediatorProcessor.java (added)
+++ incubator/synapse/trunk/scratch/prototype3/SpringMediator/org/apache/synapse/processors/mediatortypes/spring/SpringMediatorProcessor.java Thu Nov 24 09:27:58 2005
@@ -0,0 +1,84 @@
+package org.apache.synapse.processors.mediatortypes.spring;
+
+import java.io.ByteArrayOutputStream;
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.axis2.om.OMAttribute;
+import org.apache.axis2.om.OMElement;
+import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseEnvironment;
+import org.apache.synapse.SynapseException;
+import org.apache.synapse.SynapseMessage;
+
+
+import org.apache.synapse.api.EnvironmentAware;
+import org.apache.synapse.api.Mediator;
+import org.apache.synapse.processors.AbstractProcessor;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
+import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.core.io.ByteArrayResource;
+
+
+
+public class SpringMediatorProcessor extends AbstractProcessor {
+ private static final QName tagName = new QName(Constants.SYNAPSE_NAMESPACE+"/spring", "springmediator");
+ private GenericApplicationContext ctx = null;
+ private String beanName = null;
+ public void compile(SynapseEnvironment se, OMElement el) {
+
+ OMAttribute bean = el.getAttribute(new QName("bean"));
+ if (bean == null) throw new SynapseException("missing bean attribute on "+el.toString());
+ beanName = bean.getAttributeValue();
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ try {
+ baos.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE beans PUBLIC \"-//SPRING//DTD BEAN//EN\" \"http://www.springframework.org/dtd/spring-beans.dtd\">"
+ .getBytes());
+ XMLStreamWriter xsw = XMLOutputFactory.newInstance().createXMLStreamWriter(baos);
+ OMElement beans = null;
+ Iterator it = el.getChildElements();
+ while (it.hasNext()) {
+ OMElement ths = (OMElement)it.next();
+ if (ths.getLocalName().toLowerCase().equals("beans")) {
+ beans = ths;
+ break;
+ }
+ }
+ if (beans==null) throw new SynapseException("<beans> element not found in "+el.toString());
+ xsw.setDefaultNamespace(beans.getNamespace().getName());
+ beans.serialize(xsw);
+ } catch (Exception e) {
+ throw new SynapseException(e);
+ }
+
+ GenericApplicationContext ctx = new GenericApplicationContext();
+ XmlBeanDefinitionReader xbdr = new XmlBeanDefinitionReader(
+ ctx);
+ xbdr.setValidating(false);
+ xbdr.loadBeanDefinitions(new ByteArrayResource(baos.toByteArray()));
+ ctx.setClassLoader(se.getClassLoader());
+ ctx.refresh();
+
+
+
+ }
+
+ public boolean process(SynapseEnvironment se, SynapseMessage smc) {
+ Mediator m = (Mediator)ctx.getBean(beanName);
+ if (EnvironmentAware.class.isAssignableFrom(m.getClass())) {
+ ((EnvironmentAware)m).setSynapseEnvironment(se);
+ }
+ return m.mediate(smc);
+
+ }
+
+ public QName getTagQName() {
+
+ return tagName;
+ }
+
+}
Added: incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/.classpath
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/.classpath?rev=348773&view=auto
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/.classpath (added)
+++ incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/.classpath Thu Nov 24 09:27:58 2005
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path=""/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/prototype3"/>
+ <classpathentry kind="lib" path="C:/spring/dist/spring-core.jar"/>
+ <classpathentry kind="lib" path="C:/spring/dist/spring-context.jar"/>
+ <classpathentry sourcepath="C:/axcommit/modules/core/src" kind="lib" path="C:/axcommit/target/axis2-0.93-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="C:/spring/dist/spring-beans.jar"/>
+ <classpathentry kind="lib" path="C:/axdb/target/lib/stax-api-1.0.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/.project
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/.project?rev=348773&view=auto
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/.project (added)
+++ incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/.project Thu Nov 24 09:27:58 2005
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>SpringMediator</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/META-INF/services/org.apache.synapse.Processor
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/META-INF/services/org.apache.synapse.Processor?rev=348773&view=auto
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/META-INF/services/org.apache.synapse.Processor (added)
+++ incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/META-INF/services/org.apache.synapse.Processor Thu Nov 24 09:27:58 2005
@@ -0,0 +1 @@
+org.apache.synapse.processors.mediatortypes.spring.SpringMediatorProcessor
\ No newline at end of file
Added: incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/org/apache/synapse/processors/mediatortypes/spring/SpringMediatorProcessor.class
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/org/apache/synapse/processors/mediatortypes/spring/SpringMediatorProcessor.class?rev=348773&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/synapse/trunk/scratch/prototype3/SpringMediator/target/classes/org/apache/synapse/processors/mediatortypes/spring/SpringMediatorProcessor.class
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/synapse/trunk/scratch/prototype3/src/.classpath
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/.classpath?rev=348773&r1=348772&r2=348773&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/.classpath (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/.classpath Thu Nov 24 09:27:58 2005
@@ -11,5 +11,5 @@
<classpathentry kind="lib" path="C:/spring/dist/spring-context.jar"/>
<classpathentry kind="lib" path="C:/spring/dist/spring-core.jar"/>
<classpathentry kind="lib" path="C:/spring/dist/spring-beans.jar"/>
- <classpathentry kind="output" path=""/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/api/EnvironmentAware.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/api/EnvironmentAware.java?rev=348773&r1=348772&r2=348773&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/api/EnvironmentAware.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/api/EnvironmentAware.java Thu Nov 24 09:27:58 2005
@@ -1,5 +1,7 @@
package org.apache.synapse.api;
+import org.apache.synapse.SynapseEnvironment;
+
public interface EnvironmentAware {
public void setSynapseEnvironment(SynapseEnvironment se);
Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/api/Mediator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/api/Mediator.java?rev=348773&r1=348772&r2=348773&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/api/Mediator.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/api/Mediator.java Thu Nov 24 09:27:58 2005
@@ -15,6 +15,8 @@
*/
package org.apache.synapse.api;
+import org.apache.synapse.SynapseMessage;
+
public interface Mediator {
- public boolean mediate(SOAPMessageContext smc);
+ public boolean mediate(SynapseMessage smc);
}
Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2SOAPMessageContext.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2SOAPMessageContext.java?rev=348773&r1=348772&r2=348773&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2SOAPMessageContext.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2SOAPMessageContext.java Thu Nov 24 09:27:58 2005
@@ -9,9 +9,9 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.synapse.Constants;
-import org.apache.synapse.api.SOAPMessageContext;
+import org.apache.synapse.SynapseMessage;
-public class Axis2SOAPMessageContext implements SOAPMessageContext {
+public class Axis2SOAPMessageContext implements SynapseMessage {
private MessageContext mc = null;
Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2Sender.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2Sender.java?rev=348773&r1=348772&r2=348773&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2Sender.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2Sender.java Thu Nov 24 09:27:58 2005
@@ -14,12 +14,12 @@
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.synapse.Constants;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.SynapseMessage;
-import org.apache.synapse.api.SOAPMessageContext;
public class Axis2Sender {
- public static void sendOn(SOAPMessageContext smc) {
+ public static void sendOn(SynapseMessage smc) {
try {
@@ -71,7 +71,7 @@
}
}
- public static void sendBack(SOAPMessageContext smc) {
+ public static void sendBack(SynapseMessage smc) {
MessageContext messageContext = ((Axis2SOAPMessageContext) smc)
.getMessageContext();
AxisEngine ae = new AxisEngine(messageContext.getSystemContext());
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=348773&r1=348772&r2=348773&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 Thu Nov 24 09:27:58 2005
@@ -2,11 +2,11 @@
import org.apache.axis2.om.OMElement;
-import org.apache.synapse.api.SOAPMessageContext;
-import org.apache.synapse.api.SynapseEnvironment;
+import org.apache.synapse.Processor;
+import org.apache.synapse.SynapseEnvironment;
+import org.apache.synapse.SynapseMessage;
import org.apache.synapse.processors.SynapseProcessor;
-import org.apache.synapse.spi.Processor;
public class Axis2SynapseEnvironment implements SynapseEnvironment {
private Processor processor = new SynapseProcessor();
@@ -20,7 +20,7 @@
processor.compile(this, synapseConfiguration);
}
- public void injectMessage(SOAPMessageContext smc) {
+ public void injectMessage(SynapseMessage smc) {
processor.process(this, smc);
}
@@ -32,12 +32,12 @@
this.cl = cl;
}
- public void sendOn(SOAPMessageContext smc) {
+ public void sendOn(SynapseMessage smc) {
Axis2Sender.sendOn(smc);
}
- public void sendBack(SOAPMessageContext smc) {
+ public void sendBack(SynapseMessage smc) {
Axis2Sender.sendBack(smc);
}
Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2SynapseEnvironmentFinder.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2SynapseEnvironmentFinder.java?rev=348773&r1=348772&r2=348773&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2SynapseEnvironmentFinder.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/Axis2SynapseEnvironmentFinder.java Thu Nov 24 09:27:58 2005
@@ -12,8 +12,8 @@
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
+import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.api.SynapseEnvironment;
public class Axis2SynapseEnvironmentFinder {
Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/SynapseMessageReceiver.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/SynapseMessageReceiver.java?rev=348773&r1=348772&r2=348773&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/SynapseMessageReceiver.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/axis2/SynapseMessageReceiver.java Thu Nov 24 09:27:58 2005
@@ -22,8 +22,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.api.SOAPMessageContext;
-import org.apache.synapse.api.SynapseEnvironment;
+import org.apache.synapse.SynapseEnvironment;
+import org.apache.synapse.SynapseMessage;
public class SynapseMessageReceiver implements MessageReceiver {
@@ -33,7 +33,7 @@
log.debug("receiving message");
SynapseEnvironment env = Axis2SynapseEnvironmentFinder
.getSynapseEnvironment(mc);
- SOAPMessageContext smc = new Axis2SOAPMessageContext(mc);
+ SynapseMessage smc = new Axis2SOAPMessageContext(mc);
env.injectMessage(smc);
}
}
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=348773&r1=348772&r2=348773&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 Thu Nov 24 09:27:58 2005
@@ -6,9 +6,9 @@
import org.apache.axis2.om.OMAttribute;
import org.apache.axis2.om.OMElement;
-import org.apache.synapse.api.SynapseEnvironment;
+import org.apache.synapse.Processor;
+import org.apache.synapse.SynapseEnvironment;
-import org.apache.synapse.spi.Processor;
public abstract class AbstractProcessor implements Processor {
private String name = null;
Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/AllProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/AllProcessor.java?rev=348773&r1=348772&r2=348773&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/AllProcessor.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/AllProcessor.java Thu Nov 24 09:27:58 2005
@@ -9,11 +9,12 @@
import org.apache.axis2.om.OMElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.Configurator;
import org.apache.synapse.Constants;
-import org.apache.synapse.api.SOAPMessageContext;
-import org.apache.synapse.api.SynapseEnvironment;
-import org.apache.synapse.spi.Processor;
+import org.apache.synapse.Processor;
+import org.apache.synapse.SynapseEnvironment;
+import org.apache.synapse.SynapseMessage;
+import org.apache.synapse.xml.Configurator;
+
/**
* @author Paul Fremantle This class simply runs the message through all rules,
@@ -46,7 +47,7 @@
}
- public boolean process(SynapseEnvironment se, SOAPMessageContext smc) {
+ public boolean process(SynapseEnvironment se, SynapseMessage smc) {
if (processors == null) {
log.info("process called on empty processor list");
return true;
Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/rules/RegexProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/rules/RegexProcessor.java?rev=348773&r1=348772&r2=348773&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/rules/RegexProcessor.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/rules/RegexProcessor.java Thu Nov 24 09:27:58 2005
@@ -10,9 +10,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.api.SOAPMessageContext;
-import org.apache.synapse.api.SynapseEnvironment;
+import org.apache.synapse.SynapseMessage;
import org.apache.synapse.processors.AllProcessor;
/**
@@ -79,7 +79,7 @@
}
}
- public boolean process(SynapseEnvironment se, SOAPMessageContext smc) {
+ public boolean process(SynapseEnvironment se, SynapseMessage smc) {
if (pattern == null) {
log.debug("trying to process with empty pattern");
Modified: incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/rules/XPathProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/rules/XPathProcessor.java?rev=348773&r1=348772&r2=348773&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/rules/XPathProcessor.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/org/apache/synapse/processors/rules/XPathProcessor.java Thu Nov 24 09:27:58 2005
@@ -11,9 +11,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Constants;
+import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.api.SOAPMessageContext;
-import org.apache.synapse.api.SynapseEnvironment;
+import org.apache.synapse.SynapseMessage;
import org.apache.synapse.processors.AllProcessor;
import org.jaxen.JaxenException;
@@ -37,6 +37,9 @@
private AXIOMXPath xp = null;
+ /* (non-Javadoc)
+ * @see org.apache.synapse.spi.Processor#compile(org.apache.synapse.api.SynapseEnvironment, org.apache.axis2.om.OMElement)
+ */
public void compile(SynapseEnvironment se, OMElement el) {
super.compile(se, el);
OMAttribute xpath = el.getAttribute(XPATH_EXPRESSION_ATT_Q);
@@ -58,7 +61,10 @@
}
}
- public boolean process(SynapseEnvironment se, SOAPMessageContext smc) {
+ /* (non-Javadoc)
+ * @see org.apache.synapse.spi.Processor#process(org.apache.synapse.api.SynapseEnvironment, org.apache.synapse.api.SOAPMessageContext)
+ */
+ public boolean process(SynapseEnvironment se, SynapseMessage smc) {
if (xp == null) {
log.debug("trying to process xpath without being set");
return true;
Modified: incubator/synapse/trunk/scratch/prototype3/src/sampleMediators/Logger.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/prototype3/src/sampleMediators/Logger.java?rev=348773&r1=348772&r2=348773&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/prototype3/src/sampleMediators/Logger.java (original)
+++ incubator/synapse/trunk/scratch/prototype3/src/sampleMediators/Logger.java Thu Nov 24 09:27:58 2005
@@ -16,8 +16,8 @@
package sampleMediators;
import org.apache.axis2.soap.SOAPEnvelope;
+import org.apache.synapse.SynapseMessage;
import org.apache.synapse.api.Mediator;
-import org.apache.synapse.api.SOAPMessageContext;
/**
* @author Ant Elder
@@ -32,7 +32,7 @@
*
* @see org.apache.synapse.mediator.Mediator#mediate(org.apache.axis2.context.MessageContext)
*/
- public boolean mediate(SOAPMessageContext mc) {
+ public boolean mediate(SynapseMessage mc) {
System.out.println("Logger.mediate:");
if (mc.getTo() != null && mc.getTo().getAddress() != null)
System.out.println("Logger.mediate to:" + mc.getTo().getAddress());
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org