Author: indika Date: Thu Dec 18 23:27:14 2008 New Revision: 27377 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=27377
Log: mercury to sandesha2 Modified: branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java branches/synapse/1.2.wso2v1/modules/samples/pom.xml branches/synapse/1.2.wso2v1/modules/samples/services/ReliableStockQuoteService/conf/services.xml branches/synapse/1.2.wso2v1/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java branches/synapse/1.2.wso2v1/modules/war/pom.xml branches/synapse/1.2.wso2v1/pom.xml branches/synapse/1.2.wso2v1/src/main/assembly/bin.xml Modified: branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java?rev=27377&r1=27376&r2=27377&view=diff ============================================================================== --- branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java (original) +++ branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java Thu Dec 18 23:27:14 2008 @@ -135,14 +135,7 @@ /** The message context property name which holds the exception (if any) for the last encountered exception */ public static final String ERROR_EXCEPTION = "ERROR_EXCEPTION"; /** 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"; + public static final int DEFAULT_ERROR= 0; /** 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: branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java?rev=27377&r1=27376&r2=27377&view=diff ============================================================================== --- branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java (original) +++ branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java Thu Dec 18 23:27:14 2008 @@ -46,6 +46,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.neethi.Policy; import org.apache.neethi.PolicyEngine; +import org.apache.sandesha2.client.SandeshaClientConstants; import org.apache.synapse.SynapseConstants; import org.apache.synapse.SynapseException; import org.apache.synapse.endpoints.EndpointDefinition; @@ -316,17 +317,17 @@ private static void copyRMOptions(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)); } // todo:[ruwan] migrate to Mercury // if (oriOptions.getProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID) != null) { Modified: branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java?rev=27377&r1=27376&r2=27377&view=diff ============================================================================== --- branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java (original) +++ branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java Thu Dec 18 23:27:14 2008 @@ -32,10 +32,11 @@ 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.ServerManager; import org.apache.synapse.SynapseConstants; import org.apache.synapse.SynapseException; -import org.apache.synapse.ServerManager; import org.apache.synapse.config.SynapseConfiguration; import org.apache.synapse.endpoints.Endpoint; import org.apache.synapse.endpoints.dispatch.Dispatcher; @@ -108,7 +109,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: branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java?rev=27377&r1=27376&r2=27377&view=diff ============================================================================== --- branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java (original) +++ branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java Thu Dec 18 23:27:14 2008 @@ -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.config.Entry; import org.apache.synapse.config.xml.XMLConfigConstants; import org.apache.synapse.core.axis2.Axis2MessageContext; @@ -29,11 +29,9 @@ 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; -import java.util.Iterator; import java.util.Map; public class RMSequenceMediator extends AbstractMediator { @@ -47,7 +45,7 @@ private static final String WSRM_SpecVersion_1_1 = "Spec_2007_02"; // set sequence expiry time to 5 minutes private static final long SEQUENCE_EXPIRY_TIME = 300000; - private static Map sequenceMap = Collections.synchronizedMap(new HashMap()); + private static final Map sequenceMap = Collections.synchronizedMap(new HashMap()); public boolean mediate(MessageContext synCtx) { @@ -70,29 +68,21 @@ } else { Axis2MessageContext axis2MessageCtx = (Axis2MessageContext) synCtx; org.apache.axis2.context.MessageContext orgMessageCtx = - axis2MessageCtx.getAxis2MessageContext(); + axis2MessageCtx.getAxis2MessageContext(); cleanupSequenceMap(); 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); - orgMessageCtx.getOptions().setProperty( - SynapseConstants.MERCURY_LAST_MESSAGE, "true"); + SandeshaClientConstants.LAST_MESSAGE, "true"); if (traceOrDebugOn) { - traceOrDebug(traceOn, "Using WS-RM version " + version + - " and a single message sequence : " + sequenceID + - " and offering sequence : " + offeredSeqID); + traceOrDebug(traceOn, "Using WS-RM version " + version); } } else { @@ -104,23 +94,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 (traceOrDebugOn) { traceOrDebug(traceOn, "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 : "")); } } } @@ -132,7 +122,7 @@ } private String retrieveSequenceID(String correlationValue) { - String sequenceID = null; + String sequenceID; if (!sequenceMap.containsKey(correlationValue)) { sequenceID = UUIDGenerator.getUUID(); if (log.isDebugEnabled()) { @@ -160,12 +150,12 @@ return node.getText(); } else { handleException("XPath expression : " + getCorrelation() + - " did not return any node", smc); + " did not return any node", smc); } } catch (JaxenException e) { handleException("Error evaluating XPath expression to determine correlation : " + - getCorrelation(), e, smc); + getCorrelation(), e, smc); } return null; // never called } @@ -186,16 +176,14 @@ return getLastMessage().booleanValueOf(smc); } catch (JaxenException e) { handleException("Error evaluating XPath expression to determine if last message : " + - getLastMessage(), e, smc); + getLastMessage(), e, smc); } return false; } } private synchronized void cleanupSequenceMap() { - Iterator itKey = sequenceMap.keySet().iterator(); - while (itKey.hasNext()) { - Object key = itKey.next(); + for (Object key : sequenceMap.keySet()) { Entry sequenceEntry = (Entry) sequenceMap.get(key); if (sequenceEntry.isExpired()) { sequenceMap.remove(key); @@ -204,12 +192,7 @@ } public boolean isSingle() { - if (getSingle() != null && getSingle().booleanValue()) { - return true; - - } else { - return false; - } + return getSingle() != null && getSingle(); } public SynapseXPath getCorrelation() { Modified: branches/synapse/1.2.wso2v1/modules/samples/pom.xml URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/samples/pom.xml?rev=27377&r1=27376&r2=27377&view=diff ============================================================================== --- branches/synapse/1.2.wso2v1/modules/samples/pom.xml (original) +++ branches/synapse/1.2.wso2v1/modules/samples/pom.xml Thu Dec 18 23:27:14 2008 @@ -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: branches/synapse/1.2.wso2v1/modules/samples/services/ReliableStockQuoteService/conf/services.xml URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/samples/services/ReliableStockQuoteService/conf/services.xml?rev=27377&r1=27376&r2=27377&view=diff ============================================================================== --- branches/synapse/1.2.wso2v1/modules/samples/services/ReliableStockQuoteService/conf/services.xml (original) +++ branches/synapse/1.2.wso2v1/modules/samples/services/ReliableStockQuoteService/conf/services.xml Thu Dec 18 23:27:14 2008 @@ -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: branches/synapse/1.2.wso2v1/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java?rev=27377&r1=27376&r2=27377&view=diff ============================================================================== --- branches/synapse/1.2.wso2v1/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java (original) +++ branches/synapse/1.2.wso2v1/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java Thu Dec 18 23:27:14 2008 @@ -32,6 +32,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 samples.common.StockQuoteHandler; import java.io.File; @@ -185,10 +187,10 @@ } if (Boolean.parseBoolean(wsrm)) { System.out.println("Using WS-RM"); -// serviceClient.engageModule("Mercury"); -// options.setProperty("MercuryLastMessage", Constants.VALUE_TRUE); -// options.setProperty( -// MercuryClientConstants.SEQUENCE_OFFER, UUIDGenerator.getUUID()); + serviceClient.engageModule("sandesha2"); + options.setProperty(SandeshaClientConstants.LAST_MESSAGE, Constants.VALUE_TRUE); + options.setProperty( + SandeshaClientConstants.OFFERED_SEQUENCE_ID, UUIDGenerator.getUUID()); } serviceClient.setOptions(options); Modified: branches/synapse/1.2.wso2v1/modules/war/pom.xml URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/war/pom.xml?rev=27377&r1=27376&r2=27377&view=diff ============================================================================== --- branches/synapse/1.2.wso2v1/modules/war/pom.xml (original) +++ branches/synapse/1.2.wso2v1/modules/war/pom.xml Thu Dec 18 23:27:14 2008 @@ -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: branches/synapse/1.2.wso2v1/pom.xml URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/pom.xml?rev=27377&r1=27376&r2=27377&view=diff ============================================================================== --- branches/synapse/1.2.wso2v1/pom.xml (original) +++ branches/synapse/1.2.wso2v1/pom.xml Thu Dec 18 23:27:14 2008 @@ -210,7 +210,7 @@ <groupId>org.apache.synapse</groupId> <artifactId>synapse-tasks</artifactId> <version>${project.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.synapse</groupId> <artifactId>synapse-core</artifactId> @@ -420,9 +420,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> @@ -547,11 +547,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> @@ -561,9 +561,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> @@ -1174,7 +1174,7 @@ <!-- addressing, rampart, neethi --> <addressing.version>1.4</addressing.version> <rampart.version>1.4</rampart.version> - <mercury.version>0.91</mercury.version> + <sandesha2.version>1.4-wso2</sandesha2.version> <neethi.version>2.0.4</neethi.version> <wss4j.version>1.5.4</wss4j.version> <opensaml.version>1.1</opensaml.version> Modified: branches/synapse/1.2.wso2v1/src/main/assembly/bin.xml URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/src/main/assembly/bin.xml?rev=27377&r1=27376&r2=27377&view=diff ============================================================================== --- branches/synapse/1.2.wso2v1/src/main/assembly/bin.xml (original) +++ branches/synapse/1.2.wso2v1/src/main/assembly/bin.xml Thu Dec 18 23:27:14 2008 @@ -283,7 +283,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> @@ -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>${artifactId}.${extension}</outputFileNameMapping> </dependencySet> @@ -331,7 +331,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>${artifactId}.${extension}</outputFileNameMapping> </dependencySet> @@ -341,7 +341,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>${artifactId}.${extension}</outputFileNameMapping> </dependencySet> _______________________________________________ Esb-java-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
