diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index cddd88268..3f783b068 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -57,9 +57,9 @@
                                 <mkdir dir="target/test_repos/axis2Server" />
                                 <mkdir dir="target/test_repos/axis2Client" />
                                 <mkdir dir="target/test_repos/synapse" />
-                                <mkdir dir="target/test_repos/synapse" />
                                 <mkdir dir="target/test_repos/synapse/modules" />
                                 <mkdir dir="target/test_repos/synapse/conf" />
+                                <mkdir dir="target/test_repos/synapse/samples" />
                                 <mkdir dir="target/test_repos/axis2Server/services" />
                                 <mkdir dir="target/test_repos/axis2Server/modules" />
                                 <mkdir dir="target/test_repos/axis2Server/conf" />
@@ -81,7 +81,11 @@
                                         <include name="*.xml" />
                                     </fileset>
                                 </copy>
-
+                                <copy todir="target/test_repos/synapse/samples">
+                                    <fileset dir="src/test/resources/extras">
+                                        <include name="*_altered_msmp.xml" />
+                                    </fileset>
+                                </copy>
                                 <!--<copy file="src/test/resources/trust.jks"-->
                                 <!--tofile="target/test_repos/synapse/conf/trust.jks" />-->
                                 <!--<copy file="src/test/resources/identity.jks"-->
diff --git a/modules/integration/src/test/java/org/apache/synapse/samples/framework/DerbyServerController.java b/modules/integration/src/test/java/org/apache/synapse/samples/framework/DerbyServerController.java
index 5af733a33..0b24448f6 100644
--- a/modules/integration/src/test/java/org/apache/synapse/samples/framework/DerbyServerController.java
+++ b/modules/integration/src/test/java/org/apache/synapse/samples/framework/DerbyServerController.java
@@ -82,7 +82,18 @@ private void initData() throws Exception {
 
         //client
         String dbName = "synapsedb";
-        String createTableQuery = "CREATE table company(name varchar(10), id varchar(10), price double)";
+        String createCompanyTableQuery = "CREATE table company(name varchar(10), id varchar(10), price double)";
+        final String createJDBCMessageStoreQuery = "CREATE TABLE jdbc_message_store" +
+                "(indexId INTEGER PRIMARY KEY GENERATED ALWAYS AS IDENTITY(Start with 1, Increment by 1)," +
+                "msg_id VARCHAR(200) NOT NULL,message BLOB NOT NULL)";
+        final String createResequenceMessageStoreQuery = "CREATE TABLE tbl_resequence" +
+                "(indexId INTEGER GENERATED ALWAYS AS IDENTITY(Start with 1, Increment by 1) PRIMARY KEY," +
+                "msg_id VARCHAR(200) NOT NULL UNIQUE," +
+                "seq_id INTEGER NOT NULL UNIQUE," +
+                "message BLOB NOT NULL)";
+        final String createLastProcessedIdTblQuery = "CREATE TABLE tbl_lastprocessid" +
+                "(statement VARCHAR(20) PRIMARY KEY,seq_id INTEGER NOT NULL UNIQUE)";
+
         String connectionURL = "jdbc:derby://localhost:1527/" + dbName + ";create=true";
 
         java.util.Properties props = new java.util.Properties();
@@ -96,7 +107,10 @@ private void initData() throws Exception {
             Class.forName("org.apache.derby.jdbc.ClientDriver").newInstance();
             conn = DriverManager.getConnection(connectionURL, props);
             Statement s = conn.createStatement();
-            s.execute(createTableQuery);
+            s.execute(createCompanyTableQuery);
+            s.execute(createJDBCMessageStoreQuery);
+            s.execute(createResequenceMessageStoreQuery);
+            s.execute(createLastProcessedIdTblQuery);
             s.execute("INSERT into company values ('IBM','c1',0.0)");
             s.execute(" INSERT into company values ('SUN','c2',0.0)");
             s.execute(" INSERT into company values ('MSFT','c3',0.0)");
diff --git a/modules/integration/src/test/java/org/apache/synapse/samples/framework/SynapseTestCase.java b/modules/integration/src/test/java/org/apache/synapse/samples/framework/SynapseTestCase.java
index fbec07fa3..0da6d5317 100644
--- a/modules/integration/src/test/java/org/apache/synapse/samples/framework/SynapseTestCase.java
+++ b/modules/integration/src/test/java/org/apache/synapse/samples/framework/SynapseTestCase.java
@@ -66,6 +66,36 @@ protected SynapseTestCase(int sampleId) {
         loadConfiguration();
     }
 
+    /**
+     * Apply configuration values to message store XML.
+     *
+     * @param synapseRepoPath         path to the synapse XML repository.
+     * @param axis2BlockingConfigPath path to axis2 blocking client.
+     */
+    private void applyMessageStoreConfigurationToFile(OMElement synapseRepoPath, OMElement axis2BlockingConfigPath,
+                                                      OMElement config) {
+        try {
+            if (null != synapseRepoPath && null != axis2BlockingConfigPath) {
+                String currentDir = SynapseTestUtils.getCurrentDir();
+                String sampleFilePath = SynapseTestUtils.getRequiredParameter(config.getFirstChildWithName
+                                (new QName(SampleConfigConstants.TAG_SYNAPSE_CONF)),
+                        SampleConfigConstants.TAG_SYNAPSE_CONF_XML);
+                String normalizeFilePath = FilenameUtils.normalize(currentDir + sampleFilePath);
+                File synapseSampleFile = new File(normalizeFilePath);
+                String synapseXml = FileUtils.readFileToString(synapseSampleFile);
+                String modifiedSynapseAxis2 = SynapseTestUtils.replace(synapseXml, "${AXIS2_REPO}",
+                        FilenameUtils.normalize(currentDir + synapseRepoPath.getText()));
+                String modifiedAxis2Blocking = SynapseTestUtils.replace(modifiedSynapseAxis2, "${AXIS2_CONFIG}",
+                        FilenameUtils.normalize(currentDir + axis2BlockingConfigPath.getText()));
+                FileUtils.writeStringToFile(synapseSampleFile, modifiedAxis2Blocking);
+            }
+        } catch (IOException e) {
+            String message = "Error occurred while reading the sample configuration";
+            log.error(message, e);
+            fail(message);
+        }
+    }
+
     private void loadConfiguration() {
         // Parse the sample descriptor
         OMElement sampleConfig = loadDescriptorInfoFile();
@@ -91,6 +121,17 @@ private void loadConfiguration() {
             this.sampleName = sampleNameElt.getText();
         }
 
+        // Load synapse repo name and axis2blocking client, needed for message stores
+        OMElement synapseConfigElement =
+                sampleConfig.getFirstChildWithName(new QName(SampleConfigConstants.TAG_SYNAPSE_CONF));
+        OMElement synapseRepoPath = synapseConfigElement.getFirstChildWithName(
+                new QName(SampleConfigConstants.TAG_SYNAPSE_CONF_AXIS2_REPO));
+        OMElement axis2BlockingConfigPath = synapseConfigElement.getFirstChildWithName(
+                new QName(SampleConfigConstants.TAG_AXIS2_BLOCKING_CONFIG));
+
+        //Apply the configurations to the file
+        applyMessageStoreConfigurationToFile(synapseRepoPath, axis2BlockingConfigPath, sampleConfig);
+
         // Load Synapse, backend server and client configurations
         synapseController = initSynapseConfigInfo(sampleConfig);
         backendServerControllers = initBackEndServersConfigInfo(sampleConfig);
diff --git a/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java b/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java
index 18b441700..12c3a2d1a 100644
--- a/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java
+++ b/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java
@@ -244,6 +244,8 @@ private static void populateSamplesMap() {
         sampleClassRepo.put("451", Sample451.class);
         sampleClassRepo.put("452", Sample452.class);
         sampleClassRepo.put("460", Sample460.class);
+        sampleClassRepo.put("706", Sample706.class);
+        sampleClassRepo.put("707", Sample707.class);
 
         sampleClassRepo.put("800", Sample800.class);
         sampleClassRepo.put("10001", Sample10001.class);
diff --git a/modules/integration/src/test/java/org/apache/synapse/samples/framework/config/SampleConfigConstants.java b/modules/integration/src/test/java/org/apache/synapse/samples/framework/config/SampleConfigConstants.java
index 08708f72c..6c6d610b5 100644
--- a/modules/integration/src/test/java/org/apache/synapse/samples/framework/config/SampleConfigConstants.java
+++ b/modules/integration/src/test/java/org/apache/synapse/samples/framework/config/SampleConfigConstants.java
@@ -44,6 +44,7 @@ public class SampleConfigConstants {
 
     public static final String TAG_BE_SERVER_CONF_AXIS2_REPO = "axis2Repo";
     public static final String TAG_BE_SERVER_CONF_AXIS2_XML = "axis2Xml";
+    public static final String TAG_AXIS2_BLOCKING_CONFIG = "axis2BlockingXml";
     public static final String TAG_BE_SERVER_CONF_AXIS2_HTTP_PORT = "httpPort";
     public static final String TAG_BE_SERVER_CONF_AXIS2_HTTPS_PORT = "httpsPort";
     public static final String TAG_BE_SERVER_CONF_AXIS2_COUNTER_ENABLED = "counterEnabled";
diff --git a/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/advanced/Sample706.java b/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/advanced/Sample706.java
new file mode 100644
index 000000000..07238e053
--- /dev/null
+++ b/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/advanced/Sample706.java
@@ -0,0 +1,40 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.synapse.samples.framework.tests.advanced;
+
+import org.apache.synapse.samples.framework.SampleClientResult;
+import org.apache.synapse.samples.framework.SynapseTestCase;
+import org.apache.synapse.samples.framework.clients.StockQuoteSampleClient;
+
+public class Sample706 extends SynapseTestCase {
+    public Sample706() {
+        super(706);
+    }
+
+    public void testJDBCMessageStore() throws InterruptedException {
+        String trpUrl = "http://localhost:8280/";
+        StockQuoteSampleClient client = getStockQuoteClient();
+        log.info("Running test: Introduction to JDBC message store ");
+        SampleClientResult result = client.placeOrder(null, trpUrl, null, "WSO2-1");
+        assertTrue("Client received response successfully ", result.responseReceived());
+        Thread.sleep(7000);
+        assertEquals(1, getAxis2Server().getMessageCount("SimpleStockQuoteService", "placeOrder"));
+    }
+}
diff --git a/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/advanced/Sample707.java b/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/advanced/Sample707.java
new file mode 100644
index 000000000..92b3a75eb
--- /dev/null
+++ b/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/advanced/Sample707.java
@@ -0,0 +1,42 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.synapse.samples.framework.tests.advanced;
+
+import org.apache.synapse.samples.framework.SynapseTestCase;
+import org.apache.synapse.samples.framework.clients.StockQuoteSampleClient;
+
+public class Sample707 extends SynapseTestCase {
+    public Sample707() {
+        super(707);
+    }
+
+    public void testResequenceMessageStore() throws InterruptedException {
+        String trpUrl = "http://localhost:8280/";
+        StockQuoteSampleClient client = getStockQuoteClient();
+        log.info("Running test: Introduction to the script mediator using js scripts ");
+        client.placeOrder(null, trpUrl, null, "WSO2-4");
+        client.placeOrder(null, trpUrl, null, "WSO2-2");
+        client.placeOrder(null, trpUrl, null, "WSO2-3");
+        client.placeOrder(null, trpUrl, null, "WSO2-1");
+        Thread.sleep(10000);
+        assertEquals(4, getAxis2Server().getMessageCount("SimpleStockQuoteService", "placeOrder"));
+
+    }
+}
diff --git a/modules/integration/src/test/resources/axis2Xml/synapse/axis2_blocking_client.xml b/modules/integration/src/test/resources/axis2Xml/synapse/axis2_blocking_client.xml
new file mode 100644
index 000000000..8aa5d6508
--- /dev/null
+++ b/modules/integration/src/test/resources/axis2Xml/synapse/axis2_blocking_client.xml
@@ -0,0 +1,325 @@
+<!--
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
+
+<axisconfig name="AxisJava2.0">
+    <!-- ================================================= -->
+    <!-- Parameters -->
+    <!-- ================================================= -->
+    <parameter name="hotdeployment">true</parameter>
+    <parameter name="hotupdate">false</parameter>
+    <parameter name="enableMTOM">false</parameter>
+    <parameter name="enableSwA">false</parameter>
+
+    <!--Uncomment if you want to enable file caching for attachments -->
+    <!--parameter name="cacheAttachments">true</parameter>
+    <parameter name="attachmentDIR"></parameter>
+    <parameter name="sizeThreshold">4000</parameter-->
+
+    <!--This will give out the timout of the configuration contexts, in milliseconds-->
+    <parameter name="ConfigContextTimeoutInterval">30000</parameter>
+
+    <!--During a fault, stacktrace can be sent with the fault message. The following flag will control -->
+    <!--that behavior.-->
+    <parameter name="sendStacktraceDetailsWithFaults">false</parameter>
+
+    <!--If there aren't any information available to find out the fault reason, we set the message of the exception-->
+    <!--as the faultreason/Reason. But when a fault is thrown from a service or some where, it will be -->
+    <!--wrapped by different levels. Due to this the initial exception message can be lost. If this flag-->
+    <!--is set, then Axis2 tries to get the first exception and set its message as the faultreason/Reason.-->
+    <parameter name="DrillDownToRootCauseForFaultReason">false</parameter>
+
+    <parameter name="userName">admin</parameter>
+    <parameter name="password">axis2</parameter>
+
+    <!--To override repository/services you need to uncomment following parameter and value SHOULD be absolute file path.-->
+    <!--ServicesDirectory only works on the following cases-->
+    <!---File based configurator and in that case the value should be a file URL (http:// not allowed)-->
+    <!---When creating URL Based configurator with URL "file://"  -->
+    <!--- War based configurator with expanded case , -->
+
+    <!--All the other scenarios it will be ignored.-->
+    <!--<parameter name="ServicesDirectory">service</parameter>-->
+    <!--To override repository/modules you need to uncomment following parameter and value SHOULD be absolute file path-->
+    <!--<parameter name="ModulesDirectory">modules</parameter>-->
+
+
+
+    <!--Following params will set the proper context paths for invocations. All the endpoints will have a commons context-->
+    <!--root which can configured using the following contextRoot parameter-->
+    <!--<parameter name="contextRoot">axis2</parameter>-->
+
+    <!--Our HTTP endpoints can handle both REST and SOAP. Following parameters can be used to distinguiush those endpoints-->
+    <!--In case of a servlet, if you change this you have to manually change the settings of your servlet container to map this -->
+    <!--context path to proper Axis2 servlets-->
+    <parameter name="servicePath" locked="false">services</parameter>
+    <parameter name="restPath" locked="false">rest</parameter>
+
+    <!-- Following parameter will completely disable REST handling in Axis2-->
+    <parameter name="disableREST" locked="true">false</parameter>
+
+    <!--POJO deployer , this will alow users to drop .class file and make that into a service-->
+    <deployer extension=".class" directory="pojo" class="org.apache.axis2.deployment.POJODeployer"/>
+
+    <!-- Following parameter will set the host name for the epr-->
+    <!--<parameter name="hostname" locked="true">myhost.com</parameter>-->
+
+    <!-- If you have a frontend host which exposes this webservice using a different public URL  -->
+    <!-- use this parameter to override autodetected url -->
+    <!--<parameter name="httpFrontendHostUrl">https://someotherhost/context</parameter>-->
+
+
+    <!--    The way of adding listener to the system-->
+    <!--    <listener class="org.apache.axis2.ObserverIMPL">-->
+    <!--        <parameter name="RSS_URL">http://127.0.0.1/rss</parameter>-->
+    <!--    </listener>-->
+
+    <!-- ================================================= -->
+    <!-- Message Receivers -->
+    <!-- ================================================= -->
+    <!--This is the deafult MessageReceiver for the system , if you want to have MessageReceivers for -->
+    <!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
+    <!--any operation -->
+    <!--Note : You can ovrride this for a particular service by adding the same element with your requirement-->
+    <messageReceivers>
+        <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only"
+                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+        <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out"
+                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+    </messageReceivers>
+
+    <!-- ================================================= -->
+    <!-- Message Formatter -->
+    <!-- ================================================= -->
+    <!--Following content type to message formatter mapping can be used to implement support for different message -->
+    <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
+    <messageFormatters>
+
+        <messageFormatter contentType="application/x-www-form-urlencoded"
+                          class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+        <messageFormatter contentType="multipart/form-data"
+                          class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+        <messageFormatter contentType="application/xml"
+                          class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+        <!--<messageFormatter contentType="x-application/hessian"
+                         class="org.apache.synapse.format.hessian.HessianMessageFormatter"/>-->
+        <!--<messageFormatter contentType=""
+                         class="org.apache.synapse.format.hessian.HessianMessageFormatter"/>-->
+        <!--<messageFormatter contentType="application/json"
+                         class="org.apache.axis2.json.JSONMessageFormatter"/>-->
+
+    </messageFormatters>
+
+    <!-- ================================================= -->
+    <!-- Message Builders -->
+    <!-- ================================================= -->
+    <!--Following content type to builder mapping can be used to implement support for different message -->
+    <!--formats in Axis2. These message formats are expected to be resolved based on the content type. -->
+    <messageBuilders>
+        <messageBuilder contentType="application/xml"
+                        class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
+        <messageBuilder contentType="application/x-www-form-urlencoded"
+                        class="org.apache.axis2.builder.XFormURLEncodedBuilder"/>
+        <messageBuilder contentType="multipart/form-data"
+                        class="org.apache.axis2.builder.MultipartFormDataBuilder"/>
+        <!--<messageBuilder contentType="x-application/hessian"
+                         class="org.apache.synapse.format.hessian.HessianMessageBuilder"/>-->
+        <!--<messageBuilder contentType=""
+                         class="org.apache.synapse.format.hessian.HessianMessageBuilder"/>-->
+        <!--<messageBuilder contentType="application/json"
+                         class="org.apache.axis2.json.JSONOMBuilder"/>-->
+    </messageBuilders>
+
+    <!-- ================================================= -->
+    <!-- Transport Ins -->
+    <!-- ================================================= -->
+	<transportReceiver name="http"
+                       class="org.apache.axis2.transport.http.SimpleHTTPServer">
+        <parameter name="port">8200</parameter>
+        <!-- Here is the complete list of supported parameters (see example settings further below):
+            port: the port to listen on (default 6060)
+            hostname:  if non-null, url prefix used in reply-to endpoint references                                 (default null)
+            originServer:  value of http Server header in outgoing messages                                         (default "Simple-Server/1.1")
+            requestTimeout:  value in millis of time that requests can wait for data                                (default 20000)
+            requestTcpNoDelay:  true to maximize performance and minimize latency                                   (default true)
+                                false to minimize bandwidth consumption by combining segments
+            requestCoreThreadPoolSize:  number of threads available for request processing (unless queue fills up)  (default 25)
+            requestMaxThreadPoolSize:  number of threads available for request processing if queue fills up         (default 150)
+                                       note that default queue never fills up:  see HttpFactory
+            threadKeepAliveTime:  time to keep threads in excess of core size alive while inactive                  (default 180)
+                                  note that no such threads can exist with default unbounded request queue
+            threadKeepAliveTimeUnit:  TimeUnit of value in threadKeepAliveTime (default SECONDS)                    (default SECONDS)
+        -->
+        <!-- <parameter name="hostname">http://www.myApp.com/ws</parameter> -->
+        <!-- <parameter name="originServer">My-Server/1.1</parameter>           -->
+        <!-- <parameter name="requestTimeout">10000</parameter>                   -->
+        <!-- <parameter name="requestTcpNoDelay">false</parameter>                   -->
+        <!-- <parameter name="requestCoreThreadPoolSize">50</parameter>                      -->
+        <!-- <parameter name="RequestMaxThreadPoolSize">100</parameter>                     -->
+        <!-- <parameter name="threadKeepAliveTime">240000</parameter>                  -->
+        <!-- <parameter name="threadKeepAliveTimeUnit">MILLISECONDS</parameter>            -->
+    </transportReceiver>
+
+    <!-- ================================================= -->
+    <!-- Transport Outs -->
+    <!-- ================================================= -->
+
+    <!-- transportSender name="tcp"
+                     class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
+    <transportSender name="udp"
+                     class="org.apache.axis2.transport.udp.UDPSender"/>
+    <transportSender name="local"
+                     class="org.apache.axis2.transport.local.LocalTransportSender"/ -->
+	<transportSender name="http"
+                     class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+        <parameter name="PROTOCOL">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding">chunked</parameter>
+        <parameter name="cacheHttpClient">true</parameter>
+        <parameter name="defaultMaxConnectionsPerHost">200</parameter>
+        <!-- If following is set to 'true', optional action part of the Content-Type will not be added to the SOAP 1.2 messages -->
+        <!--  <parameter name="OmitSOAP12Action">true</parameter>  -->
+    </transportSender>
+
+    <transportSender name="https"
+                     class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
+        <parameter name="PROTOCOL">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding">chunked</parameter>
+        <parameter name="cacheHttpClient">true</parameter>
+        <parameter name="defaultMaxConnectionsPerHost">200</parameter>
+    </transportSender>
+    <transportSender name="jms"
+                     class="org.apache.axis2.transport.jms.JMSSender"/>
+
+    <!-- ================================================= -->
+    <!-- Global Modules  -->
+    <!-- ================================================= -->
+    <!-- Comment this to disable Addressing -->
+    <module ref="addressing"/>
+
+    <!--Configuring module , providing parameters for modules whether they refer or not-->
+    <!--<moduleConfig name="addressing">-->
+    <!--<parameter name="addressingPara">N/A</parameter>-->
+    <!--</moduleConfig>-->
+
+    <!-- ================================================= -->
+    <!-- Clustering  -->
+    <!-- ================================================= -->
+    <!-- Configure and uncomment following for preparing Axis2 to a clustered environment -->
+    <!--
+    <clustering class="org.apache.axis2.cluster.tribes.TribesClusteringAgent">
+        <parameter name="param1">value1</parameter>
+        <parameter name="domain">apache.axis2.domain</parameter>
+    	<configurationManager class="org.apache.axis2.cluster.configuration.TribesConfigurationManager">
+    	    <listener class="org.apache.axis2.cluster.configuration.DefaultConfigurationManagerListener"/>
+    	</configurationManager>
+    	<contextManager class="org.apache.axis2.cluster.context.TribesContextManager">
+    	    <listener class="org.apache.axis2.cluster.context.DefaultContextManagerListener"/>
+    	</contextManager>
+    </clustering>
+     -->
+
+    <!-- ================================================= -->
+    <!-- Phases  -->
+    <!-- ================================================= -->
+    <phaseOrder type="InFlow">
+        <!--  System pre defined phases       -->
+        <phase name="Transport">
+            <handler name="RequestURIBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
+                <order phase="Transport"/>
+            </handler>
+            <handler name="SOAPActionBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
+                <order phase="Transport"/>
+            </handler>
+        </phase>
+        <phase name="Addressing">
+             <handler name="AddressingBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+                 <order phase="Addressing"/>
+            </handler>
+        </phase>
+        <phase name="Security"/>
+        <phase name="PreDispatch"/>
+        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+            <handler name="RequestURIBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
+            <handler name="SOAPActionBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+            <handler name="RequestURIOperationDispatcher"
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
+            <handler name="SOAPMessageBodyBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+
+            <handler name="HTTPLocationBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
+        </phase>
+        <phase name="RMPhase"/>
+        <!--  System predefined phases       -->
+        <!--   After Postdispatch phase module author or service author can add any phase he want      -->
+        <phase name="OperationInPhase"/>
+        <phase name="soapmonitorPhase"/>
+    </phaseOrder>
+    <phaseOrder type="OutFlow">
+        <!--      user can add his own phases to this area  -->
+        <phase name="soapmonitorPhase"/>
+        <phase name="OperationOutPhase"/>
+        <!--system predefined phase-->
+        <!--these phase will run irrespective of the service-->
+        <phase name="RMPhase"/>
+        <phase name="PolicyDetermination"/>
+        <phase name="MessageOut"/>
+        <phase name="Security"/>
+    </phaseOrder>
+    <phaseOrder type="InFaultFlow">
+        <phase name="Addressing">
+             <handler name="AddressingBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+                 <order phase="Addressing"/>
+            </handler>
+        </phase>
+        <phase name="Security"/>
+        <phase name="PreDispatch"/>
+        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+            <handler name="RequestURIBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
+            <handler name="SOAPActionBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+            <handler name="RequestURIOperationDispatcher"
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
+            <handler name="SOAPMessageBodyBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+
+            <handler name="HTTPLocationBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
+        </phase>
+        <phase name="RMPhase"/>
+        <!--      user can add his own phases to this area  -->
+        <phase name="OperationInFaultPhase"/>
+        <phase name="soapmonitorPhase"/>
+    </phaseOrder>
+    <phaseOrder type="OutFaultFlow">
+        <!--      user can add his own phases to this area  -->
+        <phase name="soapmonitorPhase"/>
+        <phase name="OperationOutFaultPhase"/>
+        <phase name="RMPhase"/>
+        <phase name="PolicyDetermination"/>
+        <phase name="MessageOut"/>
+        <phase name="Security"/>
+    </phaseOrder>
+</axisconfig>
diff --git a/modules/integration/src/test/resources/extras/synapse_sample_706_altered_msmp.xml b/modules/integration/src/test/resources/extras/synapse_sample_706_altered_msmp.xml
new file mode 100644
index 000000000..f3b836efe
--- /dev/null
+++ b/modules/integration/src/test/resources/extras/synapse_sample_706_altered_msmp.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~   * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
+
+<!-- Introduction to Synapse JDBC message store -->
+
+<definitions xmlns="http://ws.apache.org/ns/synapse">
+    <endpoint name="StockQuoteServiceEp">
+        <address uri="http://localhost:9000/services/SimpleStockQuoteService">
+            <suspendOnFailure>
+                <errorCodes>-1</errorCodes>
+                <progressionFactor>1.0</progressionFactor>
+            </suspendOnFailure>
+        </address>
+    </endpoint>
+    <sequence name="fault">
+        <log level="full">
+            <property name="MESSAGE" value="Executing default 'fault' sequence"/>
+            <property name="ERROR_CODE" expression="get-property('ERROR_CODE')"/>
+            <property name="ERROR_MESSAGE" expression="get-property('ERROR_MESSAGE')"/>
+        </log>
+        <drop/>
+    </sequence>
+    <sequence name="main">
+        <in>
+            <log level="full"/>
+            <property name="FORCE_SC_ACCEPTED" value="true" scope="axis2"/>
+            <property name="OUT_ONLY" value="true"/>
+            <property name="target.endpoint" value="StockQuoteServiceEp"/>
+            <store messageStore="MyStore"/>
+        </in>
+        <description>The main sequence for the message mediation</description>
+    </sequence>
+    <messageStore class="org.apache.synapse.message.store.impl.jdbc.JDBCMessageStore"
+                  name="MyStore" xmlns="http://ws.apache.org/ns/synapse">
+        <parameter name="store.jdbc.driver">org.apache.derby.jdbc.ClientDriver</parameter>
+        <parameter name="store.producer.guaranteed.delivery.enable">false</parameter>
+        <parameter name="store.jdbc.username">synapse</parameter>
+        <parameter name="store.jdbc.connection.url">jdbc:derby://localhost:1527/synapsedb</parameter>
+        <parameter name="store.jdbc.password">synapse</parameter>
+        <parameter name="store.jdbc.table">jdbc_message_store</parameter>
+    </messageStore>
+    <messageProcessor
+            class="org.apache.synapse.message.processors.forward.ScheduledMessageForwardingProcessor"
+            name="ScheduledProcessor" messageStore="MyStore">
+        <parameter name="interval">10000</parameter>
+        <parameter name="axis2.repo">${AXIS2_REPO}</parameter>
+        <parameter name="axis2.config">${AXIS2_CONFIG}</parameter>
+    </messageProcessor>
+</definitions>
diff --git a/modules/integration/src/test/resources/extras/synapse_sample_707_altered_msmp.xml b/modules/integration/src/test/resources/extras/synapse_sample_707_altered_msmp.xml
new file mode 100644
index 000000000..5da49b249
--- /dev/null
+++ b/modules/integration/src/test/resources/extras/synapse_sample_707_altered_msmp.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~   * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
+
+<!-- Introduction to Synapse Resequence message store -->
+
+<definitions xmlns="http://ws.apache.org/ns/synapse">
+    <endpoint name="StockQuoteServiceEp">
+        <address uri="http://localhost:9000/services/SimpleStockQuoteService">
+            <suspendOnFailure>
+                <errorCodes>-1</errorCodes>
+                <progressionFactor>1.0</progressionFactor>
+            </suspendOnFailure>
+        </address>
+    </endpoint>
+    <sequence name="fault">
+        <log level="full">
+            <property name="MESSAGE" value="Executing default 'fault' sequence"/>
+            <property name="ERROR_CODE" expression="get-property('ERROR_CODE')"/>
+            <property name="ERROR_MESSAGE" expression="get-property('ERROR_MESSAGE')"/>
+        </log>
+        <drop/>
+    </sequence>
+    <sequence name="main">
+        <in>
+            <log level="full"/>
+            <property name="FORCE_SC_ACCEPTED" value="true" scope="axis2"/>
+            <property name="OUT_ONLY" value="true"/>
+            <property name="target.endpoint" value="StockQuoteServiceEp"/>
+            <store messageStore="MyStore"/>
+        </in>
+        <description>The main sequence for the message mediation</description>
+    </sequence>
+    <messageStore xmlns="http://ws.apache.org/ns/synapse"
+                  class="org.apache.synapse.message.store.impl.resequencer.ResequenceMessageStore"
+                  name="MyStore">
+        <parameter name="store.resequence.timeout">-1</parameter>
+        <parameter name="store.producer.guaranteed.delivery.enable">false</parameter>
+        <parameter name="store.failover.message.store.name">MyStore</parameter>
+        <parameter xmlns:m0="http://services.samples"
+                   name="store.resequence.id.path"
+                   expression="substring-after(//m0:placeOrder/m0:order/m0:symbol,'-')"/>
+        <parameter name="store.jdbc.password">synapse</parameter>
+        <parameter name="store.jdbc.driver">org.apache.derby.jdbc.ClientDriver</parameter>
+        <parameter name="store.jdbc.username">synapse</parameter>
+        <parameter name="store.jdbc.connection.url">jdbc:derby://localhost:1527/synapsedb</parameter>
+        <parameter name="store.jdbc.table">tbl_resequence</parameter>
+    </messageStore>
+    <messageProcessor class="org.apache.synapse.message.processors.forward.ScheduledMessageForwardingProcessor"
+                      name="ScheduledProcessor" messageStore="MyStore">
+        <parameter name="interval">10000</parameter>
+        <parameter name="axis2.repo">${AXIS2_REPO}</parameter>
+        <parameter name="axis2.config">${AXIS2_CONFIG}</parameter>
+    </messageProcessor>
+</definitions>
diff --git a/modules/integration/src/test/resources/sample706.xml b/modules/integration/src/test/resources/sample706.xml
new file mode 100644
index 000000000..6dfd6f96c
--- /dev/null
+++ b/modules/integration/src/test/resources/sample706.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<synapseSample>
+    <sampleID>706</sampleID>
+    <sampleName>Introduction to JDBC Message Store</sampleName>
+    <synapseConfig>
+        <axis2Repo>modules/integration/target/test_repos/synapse</axis2Repo>
+        <axis2Xml>modules/integration/target/test_repos/synapse/conf/axis2_def.xml</axis2Xml>
+        <axis2BlockingXml>modules/integration/target/test_repos/synapse/conf/axis2_blocking_client.xml</axis2BlockingXml>
+        <synapseXml>modules/integration/target/test_repos/synapse/samples/synapse_sample_706_altered_msmp.xml</synapseXml>
+    </synapseConfig>
+    <backEndServerConfig>
+        <axis2Server id='0'>
+            <axis2Repo>modules/integration/target/test_repos/axis2Server</axis2Repo>
+            <axis2Xml>modules/integration/target/test_repos/axis2Server/conf/axis2_def.xml</axis2Xml>
+            <counterEnabled>true</counterEnabled>
+        </axis2Server>
+        <derbyServer id='1'>
+        </derbyServer>
+    </backEndServerConfig>
+    <clientConfig>
+        <clientRepo>modules/integration/target/test_repos/axis2Client</clientRepo>
+    </clientConfig>
+</synapseSample>
diff --git a/modules/integration/src/test/resources/sample707.xml b/modules/integration/src/test/resources/sample707.xml
new file mode 100644
index 000000000..83ea0d023
--- /dev/null
+++ b/modules/integration/src/test/resources/sample707.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0'?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<synapseSample>
+    <sampleID>707</sampleID>
+    <sampleName>Introduction to Resequence Message Store</sampleName>
+    <synapseConfig>
+        <axis2Repo>modules/integration/target/test_repos/synapse</axis2Repo>
+        <axis2Xml>modules/integration/target/test_repos/synapse/conf/axis2_def.xml</axis2Xml>
+        <axis2BlockingXml>modules/integration/target/test_repos/synapse/conf/axis2_blocking_client.xml</axis2BlockingXml>
+        <synapseXml>modules/integration/target/test_repos/synapse/samples/synapse_sample_707_altered_msmp.xml</synapseXml>
+    </synapseConfig>
+    <backEndServerConfig>
+        <axis2Server id='0'>
+            <axis2Repo>modules/integration/target/test_repos/axis2Server</axis2Repo>
+            <axis2Xml>modules/integration/target/test_repos/axis2Server/conf/axis2_def.xml</axis2Xml>
+            <counterEnabled>true</counterEnabled>
+        </axis2Server>
+        <derbyServer id='1'>
+        </derbyServer>
+    </backEndServerConfig>
+    <clientConfig>
+        <clientRepo>modules/integration/target/test_repos/axis2Client</clientRepo>
+    </clientConfig>
+</synapseSample>