Author: pzf
Date: Fri Mar 31 00:25:54 2006
New Revision: 390361
URL: http://svn.apache.org/viewcvs?rev=390361&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.
Modified:
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/deprecation/DeprecationMediator.java
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/sla/SLAMediator.java
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/sla/SLAStack.java
Modified:
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/deprecation/DeprecationMediator.java
URL:
http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/deprecation/DeprecationMediator.java?rev=390361&r1=390360&r2=390361&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/deprecation/DeprecationMediator.java
(original)
+++
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/deprecation/DeprecationMediator.java
Fri Mar 31 00:25:54 2006
@@ -19,16 +19,15 @@
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.api.Mediator;
-import org.apache.synapse.api.EnvironmentAware;
import java.util.Map;
import java.io.InputStream;
-public class DeprecationMediator implements Mediator, EnvironmentAware {
+public class DeprecationMediator implements Mediator {
DeprecationConfiguration configuration;
private ClassLoader classLoader;
-
+
public DeprecationMediator() {
}
Modified:
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/sla/SLAMediator.java
URL:
http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/sla/SLAMediator.java?rev=390361&r1=390360&r2=390361&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/sla/SLAMediator.java
(original)
+++
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/sla/SLAMediator.java
Fri Mar 31 00:25:54 2006
@@ -16,88 +16,92 @@
package org.apache.synapse.mediators.sla;
-import org.apache.axis2.addressing.EndpointReference;
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.SynapseEnvironment;
-import org.apache.synapse.axis2.Axis2SynapseMessage;
+
import org.apache.synapse.api.Mediator;
-import org.apache.synapse.api.EnvironmentAware;
-import org.apache.axis2.context.MessageContext;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import java.io.InputStream;
-public class SLAMediator implements Mediator, EnvironmentAware {
+public class SLAMediator implements Mediator {
+ private ClassLoader classLoader;
+
+ private SynapseEnvironment se;
+
+ private Log log = LogFactory.getLog(getClass());
+
+ public SLAMediator() {
+ }
+
+ public boolean mediate(SynapseMessage synapseMessageContext) {
+
+ try {
+ log.info("SLA Mediator!");
+ // MessageContext mc =
+ //
((Axis2SynapseMessage)synapseMessageContext).getMessageContext();
+ String resource = SLAConstants.CFG_XML_FOLDER + "/"
+ + SLAConstants.CFG_SLA_XML;
+ InputStream inStream =
classLoader.getResourceAsStream(resource);
+ final SLAConfigurator slaConfigurator = new
SLAConfigurator(
+ inStream);
+ SLAStack slaStack = null;
+ try {
+ if (se.getProperty("PRIORITY_STACK") != null) {
+ slaStack = (SLAStack)
se.getProperty("PRIORITY_STACK");
+ } else {
+ slaStack = new SLAStack();
+ se.setProperty("PRIORITY_STACK",
slaStack);
+ }
+ } catch (Exception ex) {
+ log.info(ex);
+
+ }
+ String fromAddress = (String)
synapseMessageContext.getFrom()
+ .getAddress();
+ int priority = slaConfigurator.getPriority(fromAddress,
+ synapseMessageContext.getTo());
+ SLAObject slaObject = new SLAObject(priority, System
+ .currentTimeMillis(), fromAddress);
+ try {
+ slaStack.addRequest(slaObject);
+ } catch (Exception ex) {
+ log.info(ex);
+ }
+
+ while (true) {
+ if (!slaStack.isEmpty()) {
+ SLAObject slaObjectStack = (SLAObject)
slaStack.get(0);
+ if (slaObjectStack.equals(slaObject)) {
+ slaStack.remove(0);
+ break;
+ }
+ } else {
+ break;
+ }
+ }
+
+ return true;
+
+ } catch (Exception e) {
+ log.info(e);
+ return false;
+ }
+ }
+
+ public void setSynapseEnvironment(SynapseEnvironment se) {
+
+ this.se = se;
+ if (se != null) {
+ log.info("ENVIRONMENT NOT NULL IN SLA");
+ }
+ }
+
+ public void setClassLoader(ClassLoader cl) {
+ this.classLoader = cl;
+ }
+
- private ClassLoader classLoader;
- private SynapseEnvironment se;
- private Log log = LogFactory.getLog(getClass());
- public SLAMediator() {
- }
-
- public boolean mediate(SynapseMessage synapseMessageContext) {
-
- try {
- log.info("SLA Mediator!");
- MessageContext mc =
((Axis2SynapseMessage)synapseMessageContext).getMessageContext();
- String resource =
SLAConstants.CFG_XML_FOLDER+"/"+SLAConstants.CFG_SLA_XML;
- InputStream inStream = classLoader.getResourceAsStream(resource);
- final SLAConfigurator slaConfigurator = new
SLAConfigurator(inStream);
- SLAStack slaStack = null;
- try{
- if(se.getProperty("PRIORITY_STACK")!=null){
- slaStack = (SLAStack)se.getProperty("PRIORITY_STACK");
- }
- else{
- slaStack = new SLAStack();
- se.setProperty("PRIORITY_STACK",slaStack);
- }
- }catch(Exception ex){
- log.info(ex);
-
- }
- String fromAddress =
(String)synapseMessageContext.getFrom().getAddress();
- int priority =
slaConfigurator.getPriority(fromAddress,synapseMessageContext.getTo());
- SLAObject slaObject = new
SLAObject(priority,System.currentTimeMillis(),fromAddress);
- try{
- slaStack.addRequest(slaObject);
- }catch(Exception ex){
- log.info(ex);
- }
-
- while(true)
- {
- if(!slaStack.isEmpty()){
- SLAObject slaObjectStack = (SLAObject)slaStack.get(0);
- if(slaObjectStack.equals(slaObject))
- {
- slaStack.remove(0);
- break;
- }
- }else
- {
- break;
- }
- }
-
- return true;
-
- } catch (Exception e) {
- log.info(e);
- return false;
- }
- }
-
- public void setSynapseEnvironment(SynapseEnvironment se) {
-
- this.se = se;
- if(se!=null){
- log.info("ENVIRONMENT NOT NULL IN SLA");
- }
- }
-
- public void setClassLoader(ClassLoader cl) {
- this.classLoader = cl;
- }
}
Modified:
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/sla/SLAStack.java
URL:
http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/sla/SLAStack.java?rev=390361&r1=390360&r2=390361&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/sla/SLAStack.java
(original)
+++
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/sla/SLAStack.java
Fri Mar 31 00:25:54 2006
@@ -20,7 +20,12 @@
public class SLAStack extends ArrayList
{
- public SLAStack()
+ /**
+ * Needs a serialVersionUID as ArrayList is serializable.
+ */
+ private static final long serialVersionUID = 2705084012795071404L;
+
+public SLAStack()
{
}
public void addRequest(SLAObject slaObject)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
