You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by sa...@apache.org on 2005/12/22 10:57:04 UTC
svn commit: r358545 - in /incubator/synapse/trunk/java:
src/org/apache/synapse/processors/builtin/axis2/
synapse-test-resources/axis2/services/synapse_security/
test/org/apache/axis2/security/ test/org/apache/synapse/spi/injection/
Author: saminda
Date: Thu Dec 22 01:56:45 2005
New Revision: 358545
URL: http://svn.apache.org/viewcvs?rev=358545&view=rev
Log:
1. Make sure that addressing engage only once for multiple invocations
2. Updated SendOnProcessorWithRuleTest
Added:
incubator/synapse/trunk/java/synapse-test-resources/axis2/services/synapse_security/synapse.security.properties
- copied, changed from r358509, incubator/synapse/trunk/java/synapse-test-resources/axis2/services/synapse_security/interop.properties
Removed:
incubator/synapse/trunk/java/synapse-test-resources/axis2/services/synapse_security/interop.properties
Modified:
incubator/synapse/trunk/java/src/org/apache/synapse/processors/builtin/axis2/AddressingInProcessor.java
incubator/synapse/trunk/java/test/org/apache/axis2/security/security-axis2.xml
incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendOnProcessorWithRuleTest.java
Modified: incubator/synapse/trunk/java/src/org/apache/synapse/processors/builtin/axis2/AddressingInProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/src/org/apache/synapse/processors/builtin/axis2/AddressingInProcessor.java?rev=358545&r1=358544&r2=358545&view=diff
==============================================================================
--- incubator/synapse/trunk/java/src/org/apache/synapse/processors/builtin/axis2/AddressingInProcessor.java (original)
+++ incubator/synapse/trunk/java/src/org/apache/synapse/processors/builtin/axis2/AddressingInProcessor.java Thu Dec 22 01:56:45 2005
@@ -42,52 +42,66 @@
import org.apache.synapse.processors.AbstractProcessor;
+import java.util.Iterator;
+
/**
- *
- * <p>
- * This class turns on the addressing module and then calls an empty
- * service There's probably a better way but this should work!
- *
+ * <p/>
+ * This class turns on the addressing module and then calls an empty
+ * service There's probably a better way but this should work!
*/
public class AddressingInProcessor extends AbstractProcessor {
- private Log log = LogFactory.getLog(getClass());
+ private Log log = LogFactory.getLog(getClass());
+
+ public boolean process(SynapseEnvironment se, SynapseMessage smc) {
+ log.debug("process");
+ try {
+ MessageContext mc = ((Axis2SynapseMessage) smc)
+ .getMessageContext();
+ ConfigurationContext cc = mc.getConfigurationContext();
+ AxisConfiguration ac = cc.getAxisConfiguration();
+ AxisEngine ae = new AxisEngine(cc);
+ AxisService as = ac.getService(Constants.EMPTYMEDIATOR);
+ if (as == null)
+ throw new SynapseException("cannot locate service "
+ + Constants.EMPTYMEDIATOR);
+
+ // see if addressing already engage
+ boolean addressingModuleEngage = false;
+ for (Iterator iterator = ac.getEngagedModules().iterator();
+ iterator.hasNext();) {
+ QName qname = (QName) iterator.next();
+ if (qname.getLocalPart()
+ .equals(org.apache.axis2.Constants.MODULE_ADDRESSING)) {
+ addressingModuleEngage = true;
+ break;
+ }
+ }
+ if (!addressingModuleEngage) {
+ ac.engageModule(new QName(
+ org.apache.axis2.Constants.MODULE_ADDRESSING));
+ }
+ AxisOperation ao = as
+ .getOperation(Constants.MEDIATE_OPERATION_NAME);
+ OperationContext oc = OperationContextFactory
+ .createOperationContext(ao.getAxisSpecifMEPConstant(), ao);
+ ao.registerOperationContext(mc, oc);
+
+ ServiceContext sc = Utils.fillContextInformation(ao, as, cc);
+ oc.setParent(sc);
+
+ mc.setOperationContext(oc);
+ mc.setServiceContext(sc);
+
+ mc.setAxisOperation(ao);
+ mc.setAxisService(as);
+
+ ae.receive(mc);
+
+ } catch (AxisFault e) {
+ throw new SynapseException(e);
+ }
+ return true;
+ }
- public boolean process(SynapseEnvironment se, SynapseMessage smc) {
- log.debug("process");
- try {
- MessageContext mc = ((Axis2SynapseMessage) smc)
- .getMessageContext();
- ConfigurationContext cc = mc.getConfigurationContext();
- AxisConfiguration ac = cc.getAxisConfiguration();
- AxisEngine ae = new AxisEngine(cc);
- AxisService as = ac.getService(Constants.EMPTYMEDIATOR);
- if (as == null)
- throw new SynapseException("cannot locate service "
- + Constants.EMPTYMEDIATOR);
- ac.engageModule(new QName(
- org.apache.axis2.Constants.MODULE_ADDRESSING));
- AxisOperation ao = as
- .getOperation(Constants.MEDIATE_OPERATION_NAME);
- OperationContext oc = OperationContextFactory
- .createOperationContext(ao.getAxisSpecifMEPConstant(), ao);
- ao.registerOperationContext(mc, oc);
-
- ServiceContext sc = Utils.fillContextInformation(ao, as, cc);
- oc.setParent(sc);
-
- mc.setOperationContext(oc);
- mc.setServiceContext(sc);
-
- mc.setAxisOperation(ao);
- mc.setAxisService(as);
-
- ae.receive(mc);
-
- } catch (AxisFault e) {
- throw new SynapseException(e);
- }
- return true;
- }
-
}
Copied: incubator/synapse/trunk/java/synapse-test-resources/axis2/services/synapse_security/synapse.security.properties (from r358509, incubator/synapse/trunk/java/synapse-test-resources/axis2/services/synapse_security/interop.properties)
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/synapse-test-resources/axis2/services/synapse_security/synapse.security.properties?p2=incubator/synapse/trunk/java/synapse-test-resources/axis2/services/synapse_security/synapse.security.properties&p1=incubator/synapse/trunk/java/synapse-test-resources/axis2/services/synapse_security/interop.properties&r1=358509&r2=358545&rev=358545&view=diff
==============================================================================
(empty)
Modified: incubator/synapse/trunk/java/test/org/apache/axis2/security/security-axis2.xml
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/test/org/apache/axis2/security/security-axis2.xml?rev=358545&r1=358544&r2=358545&view=diff
==============================================================================
--- incubator/synapse/trunk/java/test/org/apache/axis2/security/security-axis2.xml (original)
+++ incubator/synapse/trunk/java/test/org/apache/axis2/security/security-axis2.xml Thu Dec 22 01:56:45 2005
@@ -19,7 +19,7 @@
<encryptionSymAlgorithm>http://www.w3.org/2001/04/xmlenc#tripledes-cbc</encryptionSymAlgorithm>
<encryptionUser>bob</encryptionUser>
<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
- <signaturePropFile>interop.properties</signaturePropFile>
+ <signaturePropFile>synapse.security.properties</signaturePropFile>
</action>
</parameter>
@@ -28,7 +28,7 @@
<items>Encrypt Signature Timestamp</items>
<!--<passwordCallbackClass>org.apache.axis2.security.PWCallback</passwordCallbackClass>-->
<passwordCallbackClass>sample.security.PWCallback</passwordCallbackClass>
- <signaturePropFile>interop.properties</signaturePropFile>
+ <signaturePropFile>synapse.security.properties</signaturePropFile>
</action>
</parameter>
Modified: incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendOnProcessorWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendOnProcessorWithRuleTest.java?rev=358545&r1=358544&r2=358545&view=diff
==============================================================================
--- incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendOnProcessorWithRuleTest.java (original)
+++ incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendOnProcessorWithRuleTest.java Thu Dec 22 01:56:45 2005
@@ -22,6 +22,7 @@
import org.apache.axis2.client.Options;
import org.apache.axis2.client.Call;
import org.apache.axis2.transport.http.SimpleHTTPServer;
+import org.apache.axis2.om.OMElement;
import org.apache.synapse.util.Axis2EvnSetup;
import javax.xml.namespace.QName;
@@ -57,7 +58,8 @@
Options options = new Options();
options.setTo(targetEpr);
call.setClientOptions(options);
- call.invokeBlocking(operation.getLocalPart(), Axis2EvnSetup.payload());
+ OMElement response = call.invokeBlocking(operation.getLocalPart(), Axis2EvnSetup.payload());
+ assertEquals("Synapse Testing String_Response",response.getText());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org