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/03 15:41:54 UTC
svn commit: r330558 - in
/incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse: ./
axis2/ mediator/
Author: pzf
Date: Thu Nov 3 06:41:38 2005
New Revision: 330558
URL: http://svn.apache.org/viewcvs?rev=330558&view=rev
Log:
working prototype
Modified:
incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/RuleEngine.class
incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/RuleEngine.java
incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/Axis2RuleEngineFinder.class
incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/Axis2RuleEngineFinder.java
incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/MediatorExecutor.class
incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/MediatorExecutor.java
incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/Sender.class
incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/Sender.java
incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/SynapseMessageReceiver.class
incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/SynapseMessageReceiver.java
incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/mediator/MediatorMessageReceiver.class
incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/mediator/MediatorMessageReceiver.java
Modified: incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/RuleEngine.class
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/RuleEngine.class?rev=330558&r1=330557&r2=330558&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/RuleEngine.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/RuleEngine.java?rev=330558&r1=330557&r2=330558&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/RuleEngine.java (original)
+++ incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/RuleEngine.java Thu Nov 3 06:41:38 2005
@@ -45,7 +45,7 @@
}
public void process(MessageContext messageContext) {
- System.out.println("starting process"+messageContext.getSystemContext().getAxisConfiguration().hashCode());
+
Iterator iterator = rl.iterator();
while (iterator.hasNext()) {
@@ -53,14 +53,13 @@
Expression e = r.getExpression();
if (e.match(messageContext))
{
- System.out.println("matched mediator: "+r.getMediatorName());
+
boolean cont = MediatorExecutor.execute(r.getMediatorName(), messageContext);
if (!cont) return;
}
}
// send now
- System.out.println("about to send");
-
+
Sender.send(messageContext);
}
Modified: incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/Axis2RuleEngineFinder.class
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/Axis2RuleEngineFinder.class?rev=330558&r1=330557&r2=330558&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/Axis2RuleEngineFinder.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/Axis2RuleEngineFinder.java?rev=330558&r1=330557&r2=330558&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/Axis2RuleEngineFinder.java (original)
+++ incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/Axis2RuleEngineFinder.java Thu Nov 3 06:41:38 2005
@@ -29,14 +29,13 @@
private static final String RULE_LIST_XMLFILE = "RuleListXMLFile";
public static final String RULE_ENGINE = "org.apache.synapse.RuleEngine";
-
-
+
public static synchronized RuleEngine getRuleEngine(MessageContext mc) {
-
+
AxisConfiguration ac = mc.getSystemContext().getAxisConfiguration();
Parameter ruleEngineParam = ac.getParameter(RULE_ENGINE);
if (ruleEngineParam == null) {
- System.out.println("setting rule engine on"+ac.hashCode());
+
Parameter param = ac.getParameter(RULE_LIST_XMLFILE);
if (param == null) {
throw new SynapseException("no parameter '" + RULE_LIST_XMLFILE
@@ -55,6 +54,5 @@
RuleEngine ruleEngine = (RuleEngine) ruleEngineParam.getValue();
return ruleEngine;
}
-
}
Modified: incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/MediatorExecutor.class
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/MediatorExecutor.class?rev=330558&r1=330557&r2=330558&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/MediatorExecutor.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/MediatorExecutor.java?rev=330558&r1=330557&r2=330558&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/MediatorExecutor.java (original)
+++ incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/MediatorExecutor.java Thu Nov 3 06:41:38 2005
@@ -38,8 +38,7 @@
ConfigurationContext cc = messageContext.getSystemContext();
AxisConfiguration ac = cc.getAxisConfiguration();
AxisEngine ae = new AxisEngine(cc);
- System.out.println("medex"+cc.hashCode());
-
+
AxisService as = null;
AxisOperation ao = null;
try {
@@ -59,7 +58,7 @@
messageContext.setOperationContext(oc);
messageContext.setServiceContext(sc);
- System.out.println("about to try mediate");
+
ae.receive(messageContext);
} else throw new SynapseException("Mediator "+mediatorName+" is not registered as a service in the current Axis Configuration");
} catch (AxisFault e) {
Modified: incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/Sender.class
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/Sender.class?rev=330558&r1=330557&r2=330558&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/Sender.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/Sender.java?rev=330558&r1=330557&r2=330558&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/Sender.java (original)
+++ incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/Sender.java Thu Nov 3 06:41:38 2005
@@ -46,34 +46,25 @@
messageContext);
AxisOperation ao = messageContext.getAxisOperation();
-
- MessageContext outMsgContext = call.invokeBlocking(ao,
- messageContext);
-
- outMsgContext.setConfigurationContext(sc);
-
- System.out.println(messageContext.getSystemContext()
- .getAxisConfiguration().hashCode());
AxisEngine ae = new AxisEngine(messageContext.getSystemContext());
- // outMsgContext.getSystemContext().getAxisConfiguration().addParameter(messageContext.getSystemContext().getAxisConfiguration().getParameter(Axis2RuleEngineFinder.RULE_ENGINE));
- // run all rules again
- outMsgContext.setServerSide(true);
-
- // deal with the fact that AddressingOutHandler has a bug if
- // there
- // is no header at all.
- if (outMsgContext.getEnvelope().getHeader() == null)
- outMsgContext.getEnvelope().getBody().insertSiblingBefore(
- OMAbstractFactory.getSOAP11Factory()
- .getDefaultEnvelope().getHeader());
-
- if (outMsgContext.getProperty("response") == null
- || outMsgContext.getProperty("response") == Boolean.TRUE) {
- System.out.println("receive");
- outMsgContext.setAxisService(synapseService);
- outMsgContext.setAxisOperation(synapseOperation);
- outMsgContext.setProperty("response", new Boolean(true));
+ if (messageContext.getProperty("response") == null
+ || messageContext.getProperty("response") == Boolean.TRUE) {
+
+ MessageContext outMsgContext = call.invokeBlocking(ao,
+ messageContext);
+ outMsgContext.setConfigurationContext(sc);
+
+ // run all rules on response
+ outMsgContext.setServerSide(true);
+
+ // deal with the fact that AddressingOutHandler has a bug if
+ // there
+ // is no header at all.
+ if (outMsgContext.getEnvelope().getHeader() == null)
+ outMsgContext.getEnvelope().getBody().insertSiblingBefore(
+ OMAbstractFactory.getSOAP11Factory()
+ .getDefaultEnvelope().getHeader());
Object os = messageContext
.getProperty(MessageContext.TRANSPORT_OUT);
outMsgContext.setProperty(MessageContext.TRANSPORT_OUT, os);
@@ -81,20 +72,15 @@
.getProperty(HTTPConstants.HTTPOutTransportInfo);
outMsgContext.setProperty(HTTPConstants.HTTPOutTransportInfo,
ti);
+ outMsgContext.setAxisService(synapseService);
+ outMsgContext.setAxisOperation(synapseOperation);
+
+ outMsgContext.setProperty("response", new Boolean(true));
+
ae.receive(outMsgContext);
} else {
-
- System.out.println("send");
- Object os = messageContext
- .getProperty(MessageContext.TRANSPORT_OUT);
- outMsgContext.setProperty(MessageContext.TRANSPORT_OUT, os);
- Object ti = messageContext
- .getProperty(HTTPConstants.HTTPOutTransportInfo);
- outMsgContext.setProperty(HTTPConstants.HTTPOutTransportInfo,
- ti);
- // respond to client
- ae.send(outMsgContext);
+ ae.send(messageContext);
}
} catch (AxisFault e) {
throw new SynapseException(e);
Modified: incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/SynapseMessageReceiver.class
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/SynapseMessageReceiver.class?rev=330558&r1=330557&r2=330558&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/SynapseMessageReceiver.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/SynapseMessageReceiver.java?rev=330558&r1=330557&r2=330558&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/SynapseMessageReceiver.java (original)
+++ incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/axis2/SynapseMessageReceiver.java Thu Nov 3 06:41:38 2005
@@ -25,8 +25,6 @@
public void receive(MessageContext mc) throws AxisFault {
- System.out.println("received by SMR");
- System.out.println(mc.getSystemContext().getAxisConfiguration().hashCode());
RuleEngine ruleEngine = Axis2RuleEngineFinder.getRuleEngine(mc);
ruleEngine.process(mc);
}
Modified: incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/mediator/MediatorMessageReceiver.class
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/mediator/MediatorMessageReceiver.class?rev=330558&r1=330557&r2=330558&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/mediator/MediatorMessageReceiver.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/mediator/MediatorMessageReceiver.java?rev=330558&r1=330557&r2=330558&view=diff
==============================================================================
--- incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/mediator/MediatorMessageReceiver.java (original)
+++ incubator/synapse/trunk/scratch/paul2/synapsejoint/org/apache/synapse/mediator/MediatorMessageReceiver.java Thu Nov 3 06:41:38 2005
@@ -58,8 +58,7 @@
AxisService axisService = msgContext.getOperationContext()
.getServiceContext().getAxisService();
MediatorDescription md = new MediatorDescription(axisService);
- System.out.println(axisService.getAxisServiceName());
-
+
Parameter param = axisService.getParameter(SERVICE_CLASS);
String className = (String) param.getValue();
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org