Author: ruwan
Date: Thu Mar 5 05:23:09 2009
New Revision: 750318
URL: http://svn.apache.org/viewvc?rev=750318&view=rev
Log:
Reliable messaging working with Sandesha2 SNAPSHOT
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AnonymousServiceFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml
synapse/trunk/java/modules/samples/pom.xml
synapse/trunk/java/modules/samples/services/ReliableStockQuoteService/conf/services.xml
synapse/trunk/java/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java
synapse/trunk/java/modules/war/pom.xml
synapse/trunk/java/pom.xml
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java?rev=750318&r1=750317&r2=750318&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
Thu Mar 5 05:23:09 2009
@@ -49,7 +49,7 @@
//- names of modules to be engaged at runtime -
/** The Name of the WS-RM Mercury module */
- public static final String MERCURY_MODULE_NAME = "Mercury";
+ public static final String RM_MODULE_NAME = "sandesha2";
/** The Name of the WS-A Addressing module */
public static final String ADDRESSING_MODULE_NAME = "addressing";
/** The Name of the WS-Security Rampart module */
@@ -156,13 +156,6 @@
/** The default/generic error code */
public static final int DEFAULT_ERROR= 0;
- /** Mercury last message property name */
- public static final String MERCURY_LAST_MESSAGE = "MercuryLastMessage";
- /** Mercury last sequence key property name */
- public static final String MERCURY_SEQUENCE_KEY = "MercurySequenceKey";
- /** Mercury WS-RM specification version property name */
- public static final String MERCURY_SPEC_VERSION =
"MercuryRMSpecVersion";
-
/** An Axis2 message context property that indicates the maximum time to
spend on sending the message */
public static final String SEND_TIMEOUT = "SEND_TIMEOUT";
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AnonymousServiceFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AnonymousServiceFactory.java?rev=750318&r1=750317&r2=750318&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AnonymousServiceFactory.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AnonymousServiceFactory.java
Thu Mar 5 05:23:09 2009
@@ -120,7 +120,7 @@
if (wsRMOn) {
service.engageModule(axisCfg.getModule(
- SynapseConstants.MERCURY_MODULE_NAME),
axisCfg);
+ SynapseConstants.RM_MODULE_NAME), axisCfg);
}
}
// if WS-A is off, WS-RM should be too
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java?rev=750318&r1=750317&r2=750318&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
Thu Mar 5 05:23:09 2009
@@ -558,7 +558,7 @@
auditInfo("WS-Reliable messaging is enabled for service : " +
name);
try {
proxyService.engageModule(axisCfg.getModule(
- SynapseConstants.MERCURY_MODULE_NAME), axisCfg);
+ SynapseConstants.RM_MODULE_NAME), axisCfg);
} catch (AxisFault axisFault) {
handleException("Error loading WS RM module on proxy service :
" + name, axisFault);
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java?rev=750318&r1=750317&r2=750318&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
Thu Mar 5 05:23:09 2009
@@ -32,6 +32,7 @@
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.synapse.FaultHandler;
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.SynapseException;
@@ -109,7 +110,7 @@
messageID = relatesTo.getValue();
}
}
- } else if
(messageCtx.getProperty(SynapseConstants.MERCURY_SEQUENCE_KEY) == null) {
+ } else if
(messageCtx.getProperty(SandeshaClientConstants.SEQUENCE_KEY) == null) {
messageID = (String)
messageCtx.getProperty(SynapseConstants.RELATES_TO_FOR_POX);
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java?rev=750318&r1=750317&r2=750318&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java
Thu Mar 5 05:23:09 2009
@@ -20,8 +20,8 @@
package org.apache.synapse.mediators.builtin;
import org.apache.axiom.om.OMElement;
+import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.SynapseConstants;
import org.apache.synapse.SynapseLog;
import org.apache.synapse.config.Entry;
import org.apache.synapse.config.xml.XMLConfigConstants;
@@ -30,7 +30,6 @@
import org.apache.synapse.util.UUIDGenerator;
import org.apache.synapse.util.xpath.SynapseXPath;
import org.jaxen.JaxenException;
-import org.wso2.mercury.util.MercuryClientConstants;
import java.util.Collections;
import java.util.HashMap;
@@ -74,23 +73,21 @@
String version = getVersionValue();
orgMessageCtx.getOptions().setProperty(
- SynapseConstants.MERCURY_SPEC_VERSION, version);
+ SandeshaClientConstants.RM_SPEC_VERSION, version);
if (isSingle()) {
- String sequenceID = UUIDGenerator.getUUID();
- String offeredSeqID = UUIDGenerator.getUUID();
-
- orgMessageCtx.getOptions().setProperty(
- SynapseConstants.MERCURY_SEQUENCE_KEY, sequenceID);
- orgMessageCtx.getOptions().setProperty(
- MercuryClientConstants.SEQUENCE_OFFER, offeredSeqID);
+// String sequenceID = UUIDGenerator.getUUID();
+// String offeredSeqID = UUIDGenerator.getUUID();
+//
+// orgMessageCtx.getOptions().setProperty(
+// SynapseConstants.MERCURY_SEQUENCE_KEY, sequenceID);
+// orgMessageCtx.getOptions().setProperty(
+// MercuryClientConstants.SEQUENCE_OFFER, offeredSeqID);
orgMessageCtx.getOptions().setProperty(
- SynapseConstants.MERCURY_LAST_MESSAGE, "true");
+ SandeshaClientConstants.LAST_MESSAGE, "true");
if (synLog.isTraceOrDebugEnabled()) {
- synLog.traceOrDebug("Using WS-RM version " + version +
- " and a single message sequence : " + sequenceID +
- " and offering sequence : " + offeredSeqID);
+ synLog.traceOrDebug("Using WS-RM version " + version);
}
} else {
@@ -102,23 +99,23 @@
if (!sequenceMap.containsKey(correlationValue)) {
offeredSeqID = UUIDGenerator.getUUID();
orgMessageCtx.getOptions().setProperty(
- MercuryClientConstants.SEQUENCE_OFFER, offeredSeqID);
+ SandeshaClientConstants.OFFERED_SEQUENCE_ID,
offeredSeqID);
}
String sequenceID = retrieveSequenceID(correlationValue);
orgMessageCtx.getOptions().setProperty(
- SynapseConstants.MERCURY_SEQUENCE_KEY, sequenceID);
+ SandeshaClientConstants.SEQUENCE_KEY, sequenceID);
if (lastMessage) {
orgMessageCtx.getOptions().setProperty(
- SynapseConstants.MERCURY_LAST_MESSAGE, "true");
+ SandeshaClientConstants.LAST_MESSAGE, "true");
sequenceMap.remove(correlationValue);
}
if (synLog.isTraceOrDebugEnabled()) {
synLog.traceOrDebug("Correlation value : " +
correlationValue +
- " last message = " + lastMessage + " using sequence :
" + sequenceID +
- (offeredSeqID != null ? " offering sequence : " +
offeredSeqID : ""));
+ " last message = " + lastMessage + " using
sequence : " + sequenceID +
+ (offeredSeqID != null ? " offering sequence : " +
offeredSeqID : ""));
}
}
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java?rev=750318&r1=750317&r2=750318&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
Thu Mar 5 05:23:09 2009
@@ -1,17 +1,14 @@
package org.apache.synapse.util;
-import org.apache.synapse.MessageContext;
-import org.apache.synapse.FaultHandler;
-import org.apache.synapse.mediators.eip.EIPConstants;
-import org.apache.synapse.core.axis2.Axis2MessageContext;
-import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPHeader;
-import org.apache.axiom.soap.SOAPHeaderBlock;
-import org.apache.axiom.soap.SOAP11Constants;
+
import org.apache.axiom.attachments.Attachments;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
+import org.apache.axiom.soap.SOAP11Constants;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPHeader;
+import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingConstants;
@@ -20,8 +17,12 @@
import org.apache.commons.logging.LogFactory;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
-import org.apache.synapse.SynapseConstants;
+import org.apache.sandesha2.client.SandeshaClientConstants;
+import org.apache.synapse.FaultHandler;
+import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
+import org.apache.synapse.mediators.eip.EIPConstants;
import java.util.*;
@@ -309,18 +310,18 @@
public static void copyRMOptions(org.apache.axis2.context.MessageContext
oriContext, Options targetOptions) {
Options oriOptions = oriContext.getOptions();
- if (oriOptions.getProperty(SynapseConstants.MERCURY_LAST_MESSAGE) !=
null) {
- targetOptions.setProperty(SynapseConstants.MERCURY_LAST_MESSAGE,
-
oriOptions.getProperty(SynapseConstants.MERCURY_LAST_MESSAGE));
- }
- if (oriOptions.getProperty(SynapseConstants.MERCURY_SPEC_VERSION) !=
null) {
- targetOptions.setProperty(SynapseConstants.MERCURY_SPEC_VERSION,
-
oriOptions.getProperty(SynapseConstants.MERCURY_SPEC_VERSION));
- }
- if (oriOptions.getProperty(SynapseConstants.MERCURY_SEQUENCE_KEY) !=
null) {
- targetOptions.setProperty(SynapseConstants.MERCURY_SEQUENCE_KEY,
-
oriOptions.getProperty(SynapseConstants.MERCURY_SEQUENCE_KEY));
- }
+ if (oriOptions.getProperty(SandeshaClientConstants.LAST_MESSAGE) !=
null) {
+ targetOptions.setProperty(SandeshaClientConstants.LAST_MESSAGE,
+
oriOptions.getProperty(SandeshaClientConstants.LAST_MESSAGE));
+ }
+ if (oriOptions.getProperty(SandeshaClientConstants.RM_SPEC_VERSION) !=
null) {
+ targetOptions.setProperty(SandeshaClientConstants.RM_SPEC_VERSION,
+
oriOptions.getProperty(SandeshaClientConstants.RM_SPEC_VERSION));
+ }
+ if (oriOptions.getProperty(SandeshaClientConstants.SEQUENCE_KEY) !=
null) {
+ targetOptions.setProperty(SandeshaClientConstants.SEQUENCE_KEY,
+
oriOptions.getProperty(SandeshaClientConstants.SEQUENCE_KEY));
+ }
}
/**
Modified: synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml?rev=750318&r1=750317&r2=750318&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml (original)
+++ synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml Thu Mar
5 05:23:09 2009
@@ -258,7 +258,7 @@
<exclude>mx4j:mx4j-jmx:jar</exclude>
<exclude>org.apache.axis2:addressing:mar</exclude>
<exclude>org.apache.rampart:rampart:mar</exclude>
- <exclude>org.wso2.mercury:mercury-mar:mar</exclude>
+ <exclude>org.apache.sandesha2:sandesha2:mar</exclude>
<exclude>org.apache.ant:ant:jar</exclude>
<exclude>org.apache.ant:ant-nodeps:jar</exclude>
<exclude>org.apache.ant:ant-launcher:jar</exclude>
@@ -299,7 +299,7 @@
<includes>
<include>org.apache.axis2:addressing:mar</include>
<include>org.apache.rampart:rampart:mar</include>
- <include>org.wso2.mercury:mercury-mar:mar</include>
+ <include>org.apache.sandesha2:sandesha2:mar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
@@ -310,7 +310,7 @@
<includes>
<include>org.apache.axis2:addressing:mar</include>
<include>org.apache.rampart:rampart:mar</include>
- <include>org.wso2.mercury:mercury-mar:mar</include>
+ <include>org.apache.sandesha2:sandesha2:mar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
@@ -321,7 +321,7 @@
<includes>
<include>org.apache.axis2:addressing:mar</include>
<include>org.apache.rampart:rampart:mar</include>
- <include>org.wso2.mercury:mercury-mar:mar</include>
+ <include>org.apache.sandesha2:sandesha2:mar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
Modified: synapse/trunk/java/modules/samples/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/pom.xml?rev=750318&r1=750317&r2=750318&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/pom.xml (original)
+++ synapse/trunk/java/modules/samples/pom.xml Thu Mar 5 05:23:09 2009
@@ -296,9 +296,9 @@
</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>org.wso2.mercury</groupId>
-
<artifactId>mercury-mar</artifactId>
-
<version>${mercury.version}</version>
+
<groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2</artifactId>
+
<version>${sandesha2.version}</version>
<type>mar</type>
<overWrite>true</overWrite>
<outputDirectory>target/test_repos/axis2Server/modules
@@ -325,9 +325,9 @@
</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>org.wso2.mercury</groupId>
-
<artifactId>mercury-mar</artifactId>
-
<version>${mercury.version}</version>
+
<groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2</artifactId>
+
<version>${sandesha2.version}</version>
<type>mar</type>
<overWrite>true</overWrite>
<outputDirectory>target/test_repos/synapse/modules
Modified:
synapse/trunk/java/modules/samples/services/ReliableStockQuoteService/conf/services.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/services/ReliableStockQuoteService/conf/services.xml?rev=750318&r1=750317&r2=750318&view=diff
==============================================================================
---
synapse/trunk/java/modules/samples/services/ReliableStockQuoteService/conf/services.xml
(original)
+++
synapse/trunk/java/modules/samples/services/ReliableStockQuoteService/conf/services.xml
Thu Mar 5 05:23:09 2009
@@ -20,7 +20,7 @@
<serviceGroup>
<service name="ReliableStockQuoteService">
- <module ref="Mercury"/>
+ <module ref="sandesha2"/>
<messageReceivers>
<messageReceiver mep="http://www.w3.org/ns/wsdl/in-only";
Modified:
synapse/trunk/java/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java?rev=750318&r1=750317&r2=750318&view=diff
==============================================================================
---
synapse/trunk/java/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java
(original)
+++
synapse/trunk/java/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java
Thu Mar 5 05:23:09 2009
@@ -33,8 +33,8 @@
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.rampart.RampartMessageData;
+import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.synapse.util.UUIDGenerator;
-import org.wso2.mercury.util.MercuryClientConstants;
import samples.common.StockQuoteHandler;
import java.io.File;
@@ -208,10 +208,10 @@
}
if (Boolean.parseBoolean(wsrm)) {
System.out.println("Using WS-RM");
- serviceClient.engageModule("Mercury");
- options.setProperty("MercuryLastMessage", Constants.VALUE_TRUE);
+ serviceClient.engageModule("sandesha2");
+ options.setProperty(SandeshaClientConstants.LAST_MESSAGE,
Constants.VALUE_TRUE);
options.setProperty(
- MercuryClientConstants.SEQUENCE_OFFER,
UUIDGenerator.getUUID());
+ SandeshaClientConstants.OFFERED_SEQUENCE_ID,
UUIDGenerator.getUUID());
}
if ("soap12".equals(soapVer)) {
Modified: synapse/trunk/java/modules/war/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/war/pom.xml?rev=750318&r1=750317&r2=750318&view=diff
==============================================================================
--- synapse/trunk/java/modules/war/pom.xml (original)
+++ synapse/trunk/java/modules/war/pom.xml Thu Mar 5 05:23:09 2009
@@ -60,9 +60,9 @@
<outputDirectory>target/temp/lib</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>org.wso2.mercury</groupId>
- <artifactId>mercury-mar</artifactId>
- <version>${mercury.version}</version>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2</artifactId>
+ <version>${sandesha2.version}</version>
<type>mar</type>
<outputDirectory>target/temp/lib</outputDirectory>
</artifactItem>
@@ -138,7 +138,7 @@
<includes>
<include>addressing-${addressing.version}.mar</include>
<include>rampart-${rampart.version}.mar</include>
-
<include>mercury-mar-${mercury.version}.mar</include>
+
<include>sandesha2-${sandesha2.version}.mar</include>
</includes>
</resource>
<resource>
Modified: synapse/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/pom.xml?rev=750318&r1=750317&r2=750318&view=diff
==============================================================================
--- synapse/trunk/java/pom.xml (original)
+++ synapse/trunk/java/pom.xml Thu Mar 5 05:23:09 2009
@@ -447,9 +447,9 @@
</dependency>
<dependency>
- <groupId>org.wso2.mercury</groupId>
- <artifactId>mercury-core</artifactId>
- <version>${mercury.version}</version>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-core</artifactId>
+ <version>${sandesha2.version}</version>
</dependency>
<dependency>
@@ -577,11 +577,11 @@
<type>mar</type>
</dependency>
- <!-- Mercury -->
+ <!-- Sandesha2 -->
<dependency>
- <groupId>org.wso2.mercury</groupId>
- <artifactId>mercury-mar</artifactId>
- <version>${mercury.version}</version>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2</artifactId>
+ <version>${sandesha2.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.axis2</groupId>
@@ -591,9 +591,9 @@
<type>mar</type>
</dependency>
<dependency>
- <groupId>org.wso2.mercury</groupId>
- <artifactId>mercury-core</artifactId>
- <version>${mercury.version}</version>
+ <groupId>org.apache.sandesha2</groupId>
+ <artifactId>sandesha2-core</artifactId>
+ <version>${sandesha2.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.axis2</groupId>
@@ -999,7 +999,7 @@
<!-- addressing, rampart, neethi -->
<addressing.version>1.5-beta-2</addressing.version>
<rampart.version>SNAPSHOT</rampart.version>
- <mercury.version>0.91</mercury.version>
+ <sandesha2.version>SNAPSHOT</sandesha2.version>
<neethi.version>2.0.4</neethi.version>
<wss4j.version>SNAPSHOT</wss4j.version>
<opensaml.version>1.1</opensaml.version>
