diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index cff36ccb..46023646 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -523,6 +523,13 @@
             <directory>src/api-resources/synapse-configs/default/sequences</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/apim-synapse-config/</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>src/api-resources/api_templates</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/api_templates</outputDirectory>
+            <includes>
+                <include>**/**.xml</include>
+            </includes>
+        </fileSet>
 
         <!-- Copying synapse-config directory -->
         <fileSet>
diff --git a/modules/distribution/src/repository/conf/api-manager.xml b/modules/distribution/src/repository/conf/api-manager.xml
index f293d46a..a20b8527 100755
--- a/modules/distribution/src/repository/conf/api-manager.xml
+++ b/modules/distribution/src/repository/conf/api-manager.xml
@@ -26,7 +26,7 @@
     <DataSourceName>jdbc/WSO2AM_DB</DataSourceName>
 
     <!-- This parameter is used when adding api management capability to other products like GReg, AS, DSS etc.-->
-    <GatewayType>None</GatewayType>
+    <GatewayType>Synapse</GatewayType>
 
     <!-- This parameter is used to enable the securevault support when try to publish endpoint secured APIs. Values should be "true" or "false".
 	By default secure vault is disabled.-->
@@ -94,7 +94,7 @@
 			jwt token, he needs to enable this parameter.
 			The DefaultClaimsRetriever class adds user claims from the default carbon user store.
 		-->
-        <!--ClaimsRetrieverImplClass>org.wso2.carbon.apimgt.impl.token.DefaultClaimsRetriever</ClaimsRetrieverImplClass-->
+        <ClaimsRetrieverImplClass>org.wso2.carbon.apimgt.impl.token.DefaultClaimsRetriever</ClaimsRetrieverImplClass>
 
         <!--
 			The dialectURI under which the claimURIs that need to be appended to the
@@ -102,17 +102,17 @@
 			same value is used in the keys for appending the default properties to the
 			JWT.
 		-->
-        <!--ConsumerDialectURI>http://wso2.org/claims</ConsumerDialectURI-->
+        <ConsumerDialectURI>http://wso2.org/claims</ConsumerDialectURI>
 
         <!--
 		Signature algorithm. Accepts "SHA256withRSA" or "NONE". To disable signing explicitly specify "NONE".
 	-->
-        <!--SignatureAlgorithm>SHA256withRSA</SignatureAlgorithm-->
+        <SignatureAlgorithm>SHA256withRSA</SignatureAlgorithm>
 
         <!--
 			Enable/Disable JWT generation. Default is false.
 		-->
-        <!--EnableTokenGeneration>false</EnableTokenGeneration-->
+        <EnableTokenGeneration>true</EnableTokenGeneration>
 
         <!--
 			Remove OAuth headers from outgoing message or keep with it.
@@ -161,7 +161,7 @@
                 <!--
 							Endpoint URLs for the APIs hosted in this API gateway.
 					-->
-                <GatewayEndpoint>http://${carbon.local.ip}:${mgt.transport.http.port},https://${carbon.local.ip}:${mgt.transport.https.port}</GatewayEndpoint>
+                <GatewayEndpoint>http://${carbon.local.ip}:${http.nio.port},https://${carbon.local.ip}:${https.nio.port}</GatewayEndpoint>
             </Environment>
         </Environments>
 
diff --git a/modules/distribution/src/repository/conf/axis2/axis2.xml b/modules/distribution/src/repository/conf/axis2/axis2.xml
index a62a90b9..fbe95442 100644
--- a/modules/distribution/src/repository/conf/axis2/axis2.xml
+++ b/modules/distribution/src/repository/conf/axis2/axis2.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~  Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
   ~
-  ~ WSO2 Inc. 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
+  ~  WSO2 Inc. 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
+  ~    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.
+  ~  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">
@@ -58,8 +58,8 @@
     <parameter name="ModulesDirectory">axis2modules</parameter>
 
     <!-- User agent and the server details to be used in the http communication -->
-    <parameter name="userAgent" locked="true">WSO2 ESB 4.9.0</parameter>
-    <parameter name="server" locked="true">WSO2 ESB 4.9.0</parameter>
+    <parameter name="userAgent" locked="true">WSO2 IoT 1.0.0</parameter>
+    <parameter name="server" locked="true">WSO2 IoT 1.O.0</parameter>
 
     <!-- During a fault, stacktrace can be sent with the fault message. The following flag -->
     <!-- will control that behaviour -->
@@ -153,9 +153,11 @@
     <!-- expected to be resolved based on the content type. -->
     <messageFormatters>
         <messageFormatter contentType="application/x-www-form-urlencoded"
-                          class="org.apache.synapse.commons.formatters.XFormURLEncodedFormatter"/>
+                          class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
         <messageFormatter contentType="multipart/form-data"
                           class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+        <messageFormatter contentType="text/html"
+                          class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
         <messageFormatter contentType="application/xml"
                           class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
         <messageFormatter contentType="text/xml"
@@ -167,25 +169,47 @@
 
         <!--JSON Message Formatters-->
         <messageFormatter contentType="application/json"
-                          class="org.apache.synapse.commons.json.JsonStreamFormatter"/>
-        <!--messageFormatter contentType="application/x-www-form-urlencoded"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
-        <!--messageFormatter contentType="multipart/form-data"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
-        <!--messageFormatter contentType="application/xml"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
-        <!--messageFormatter contentType="text/html"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
-        <!--messageFormatter contentType="application/soap+xml"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
-        <!--messageFormatter contentType="text/xml"
+                          class="org.apache.synapse.commons.json.JsonFormatter"/>
+        <!--messageFormatter contentType="application/json"
+                          class="org.apache.synapse.commons.json.JsonStreamFormatter"/-->
+        <messageFormatter contentType="application/json/badgerfish"
+                          class="org.apache.axis2.json.JSONBadgerfishMessageFormatter"/>
+        <messageFormatter contentType="text/javascript"
+                          class="org.apache.axis2.json.JSONMessageFormatter"/>
+
+        <!-- See https://wso2.org/jira/browse/ESBJAVA-1725 before enabling bellow line -->
+        <!--messageFormatter contentType=".*"
                         class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
+
+        <!--messageFormatter contentType="application/x-www-form-urlencoded"
+                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
+        <messageFormatter contentType="multipart/form-data"
+                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
+        <messageFormatter contentType="multipart/related"
+                          class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
+        <messageFormatter contentType="application/xml"
+                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
+        <messageFormatter contentType="text/html"
+                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
+        <messageFormatter contentType="text/plain"
+                          class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
+        <messageFormatter contentType="application/soap+xml"
+                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
+        <messageFormatter contentType="text/xml"
+                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
+        <messageFormatter contentType="application/json"
+                          class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
+        <messageFormatter contentType="application/json/badgerfish"
+                          class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
+        <messageFormatter contentType="text/javascript"
+                          class="org.wso2.carbon.relay.ExpandingMessageFormatter"/>
+        <messageFormatter contentType="application/octet-stream"
+                          class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
+
         <!--messageFormatter contentType="x-application/hessian"
-                         class="org.apache.synapse.format.hessian.HessianMessageFormatter"/-->
-        <!--messageFormatter contentType=""
-                         class="org.apache.synapse.format.hessian.HessianMessageFormatter"/-->
-        <!--messageFormatter contentType="application/edi-hl7"
-                         class="org.wso2.carbon.business.messaging.hl7.message.HL7MessageFormatter"/-->
+						 class="org.apache.synapse.format.hessian.HessianMessageFormatter"/>
+		<messageFormatter contentType=""
+						 class="org.apache.synapse.format.hessian.HessianMessageFormatter"/-->
     </messageFormatters>
 
     <!-- ================================================= -->
@@ -198,6 +222,8 @@
     <messageBuilders>
         <messageBuilder contentType="application/xml"
                         class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
+        <messageBuilder contentType="text/html"
+                        class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
         <messageBuilder contentType="application/x-www-form-urlencoded"
                         class="org.apache.synapse.commons.builders.XFormURLEncodedBuilder"/>
         <messageBuilder contentType="multipart/form-data"
@@ -207,35 +233,56 @@
 
         <!--JSON Message Builders-->
         <messageBuilder contentType="application/json"
-                        class="org.apache.synapse.commons.json.JsonStreamBuilder"/>
+                        class="org.apache.synapse.commons.json.JsonBuilder"/>
+        <!--messageBuilder contentType="application/json"
+                        class="org.apache.synapse.commons.json.JsonStreamBuilder"/-->
+        <messageBuilder contentType="application/json/badgerfish"
+                        class="org.apache.axis2.json.JSONBadgerfishOMBuilder"/>
+        <messageBuilder contentType="text/javascript"
+                        class="org.apache.axis2.json.JSONBuilder"/>
+        <!--messageBuilder contentType="text/javascript"
+                        class="org.apache.axis2.json.JSONStreamBuilder"/-->
+
+        <!--See  https://wso2.org/jira/browse/ESBJAVA-1725 before enabling bellow line -->
+        <!--messageBuilder contentType=".*"
+							class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
+
         <!--messageBuilder contentType="application/xml"
-                        class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
-        <!--messageBuilder contentType="application/x-www-form-urlencoded"
-                        class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
-        <!--messageBuilder contentType="multipart/form-data"
-                        class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
-        <!--messageBuilder contentType="multipart/related"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
-        <!--messageBuilder contentType="application/soap+xml"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
-        <!--messageBuilder contentType="text/plain"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
-        <!--messageBuilder contentType="text/xml"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
+							class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
+			<messageBuilder contentType="application/x-www-form-urlencoded"
+							class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
+			<messageBuilder contentType="multipart/form-data"
+							class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
+			<messageBuilder contentType="multipart/related"
+						   class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
+			<messageBuilder contentType="application/soap+xml"
+						   class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
+			<messageBuilder contentType="text/plain"
+						   class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
+			<messageBuilder contentType="text/html"
+							class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
+			<messageBuilder contentType="text/xml"
+						   class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
+			<messageBuilder contentType="application/json"
+							class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
+			<messageBuilder contentType="application/json/badgerfish"
+							class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
+			<messageBuilder contentType="text/javascript"
+							class="org.wso2.carbon.relay.BinaryRelayBuilder"/>
+			<messageBuilder contentType="application/octet-stream"
+							class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
+
         <!--messageBuilder contentType="x-application/hessian"
-                        class="org.apache.synapse.format.hessian.HessianMessageBuilder"/-->
-        <!--messageBuilder contentType=""
+                        class="org.apache.synapse.format.hessian.HessianMessageBuilder"/>
+        <messageBuilder contentType=""
                          class="org.apache.synapse.format.hessian.HessianMessageBuilder"/-->
-        <!--messageBuilder contentType="application/edi-hl7"
-                        class="org.wso2.carbon.business.messaging.hl7.message.HL7MessageBuilder"/-->
     </messageBuilders>
 
     <!-- ================================================= -->
     <!--             Transport Ins (Listeners)             -->
     <!-- ================================================= -->
 
-    <transportReceiver name="http"
-                       class="org.apache.synapse.transport.passthru.PassThroughHttpListener">
+    <transportReceiver name="http" class="org.apache.synapse.transport.passthru.PassThroughHttpListener">
         <parameter name="port" locked="false">8280</parameter>
         <parameter name="non-blocking" locked="false">true</parameter>
         <!--parameter name="bind-address" locked="false">hostname or IP address</parameter-->
@@ -244,11 +291,19 @@
         <!--<parameter name="priorityConfigFile" locked="false">location of priority configuration file</parameter>-->
     </transportReceiver>
 
-    <transportReceiver name="https"
-                       class="org.apache.synapse.transport.passthru.PassThroughHttpSSLListener">
+    <!-- the non blocking http transport based on HttpCore + NIO extensions -->
+    <!--transportReceiver name="http" class="org.apache.synapse.transport.nhttp.HttpCoreNIOListener">
+        <parameter name="port" locked="false">8280</parameter>
+        <parameter name="non-blocking" locked="false">true</parameter-->
+    <!--parameter name="bind-address" locked="false">hostname or IP address</parameter-->
+    <!--parameter name="WSDLEPRPrefix" locked="false">https://apachehost:port/somepath</parameter-->
+    <!--parameter name="httpGetProcessor" locked="false">org.wso2.carbon.transport.nhttp.api.NHttpGetProcessor</parameter-->
+    <!--<parameter name="priorityConfigFile" locked="false">location of priority configuration file</parameter>
+</transportReceiver-->
+
+    <transportReceiver name="https" class="org.apache.synapse.transport.passthru.PassThroughHttpSSLListener">
         <parameter name="port" locked="false">8243</parameter>
         <parameter name="non-blocking" locked="false">true</parameter>
-        <parameter name="HttpsProtocols">TLSv1,TLSv1.1,TLSv1.2</parameter>
         <!--parameter name="bind-address" locked="false">hostname or IP address</parameter-->
         <!--parameter name="WSDLEPRPrefix" locked="false">https://apachehost:port/somepath</parameter-->
         <parameter name="httpGetProcessor" locked="false">org.wso2.carbon.mediation.transport.handlers.PassThroughNHttpGetProcessor</parameter>
@@ -271,13 +326,76 @@
             supports optional|require or defaults to none -->
     </transportReceiver>
 
+    <!-- the non blocking https transport based on HttpCore + SSL-NIO extensions -->
+    <!--transportReceiver name="https" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSSLListener">
+        <parameter name="port" locked="false">8243</parameter>
+        <parameter name="non-blocking" locked="false">true</parameter-->
+    <!--parameter name="bind-address" locked="false">hostname or IP address</parameter-->
+    <!--parameter name="WSDLEPRPrefix" locked="false">https://apachehost:port/somepath</parameter-->
+    <!--<parameter name="priorityConfigFile" locked="false">location of priority configuration file</parameter>-->
+    <!--parameter name="httpGetProcessor" locked="false">org.wso2.carbon.transport.nhttp.api.NHttpGetProcessor</parameter>
+	<parameter name="keystore" locked="false">
+		<KeyStore>
+			<Location>repository/resources/security/wso2carbon.jks</Location>
+			<Type>JKS</Type>
+			<Password>wso2carbon</Password>
+			<KeyPassword>wso2carbon</KeyPassword>
+		</KeyStore>
+	</parameter>
+	<parameter name="truststore" locked="false">
+		<TrustStore>
+			<Location>repository/resources/security/client-truststore.jks</Location>
+			<Type>JKS</Type>
+			<Password>wso2carbon</Password>
+		</TrustStore>
+	</parameter-->
+    <!--<parameter name="SSLVerifyClient">require</parameter>
+		supports optional|require or defaults to none -->
+    <!--/transportReceiver-->
+
     <transportReceiver name="local" class="org.wso2.carbon.core.transports.local.CarbonLocalTransportReceiver"/>
+    <!-- Pass-through HTTP Transport Receivers -->
+    <!--<transportReceiver name="passthru-http" class="org.wso2.carbon.transport.passthru.PassThroughHttpListener">
+        <parameter name="port">8281</parameter>
+        <parameter name="non-blocking">true</parameter>-->
+    <!--parameter name="bind-address" locked="false">hostname or IP address</parameter-->
+    <!--parameter name="WSDLEPRPrefix" locked="false">https://apachehost:port/somepath</parameter-->
+    <!--</transportReceiver>-->
+
+    <!--<transportReceiver name="passthru-https" class="org.wso2.carbon.transport.passthru.PassThroughHttpSSLListener">
+        <parameter name="port" locked="false">8244</parameter>
+        <parameter name="non-blocking" locked="false">true</parameter>-->
+    <!--parameter name="bind-address" locked="false">hostname or IP address</parameter-->
+    <!--parameter name="WSDLEPRPrefix" locked="false">https://apachehost:port/somepath</parameter-->
+    <!--<parameter name="keystore" locked="false">
+		<KeyStore>
+			<Location>repository/resources/security/wso2carbon.jks</Location>
+			<Type>JKS</Type>
+			<Password>wso2carbon</Password>
+			<KeyPassword>wso2carbon</KeyPassword>
+		</KeyStore>
+	</parameter>
+	<parameter name="truststore" locked="false">
+		<TrustStore>
+			<Location>repository/resources/security/client-truststore.jks</Location>
+			<Type>JKS</Type>
+			<Password>wso2carbon</Password>
+		</TrustStore>
+	</parameter>-->
+    <!--<parameter name="SSLVerifyClient">require</parameter>
+		supports optional|require or defaults to none -->
+    <!--</transportReceiver>-->
 
     <!--<transportReceiver name="vfs" class="org.apache.synapse.transport.vfs.VFSTransportListener"/>-->
 
     <!--<transportReceiver name="mailto" class="org.apache.axis2.transport.mail.MailTransportListener">-->
     <!-- configure any optional POP3/IMAP properties
-    check com.sun.mail.pop3 and com.sun.mail.imap package documentation for more details-->
+	check com.sun.mail.pop3 and com.sun.mail.imap package documentation for more details-->
+    <!--</transportReceiver>-->
+
+    <!--<transportReceiver name="admin/https" class="org.wso2.esb.transport.tomcat.HttpsTransportListener">-->
+    <!--<parameter name="port" locked="false">9444</parameter>-->
+    <!--<parameter name="non-blocking" locked="false">true</parameter>-->
     <!--</transportReceiver>-->
 
     <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
@@ -328,61 +446,39 @@
         </parameter>
     </transportReceiver-->
 
-    <!--Uncomment this and configure as appropriate for JMS transport support with WSO2 MB 2.x.x -->
-    <!--transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
-        <parameter name="myTopicConnectionFactory" locked="false">
-           <parameter name="java.naming.factory.initial" locked="false">org.wso2.andes.jndi.PropertiesFileInitialContextFactory</parameter>
-            <parameter name="java.naming.provider.url" locked="false">repository/conf/jndi.properties</parameter>
-            <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter>
-            <parameter name="transport.jms.ConnectionFactoryType" locked="false">topic</parameter>
-        </parameter>
-
-        <parameter name="myQueueConnectionFactory" locked="false">
-            <parameter name="java.naming.factory.initial" locked="false">org.wso2.andes.jndi.PropertiesFileInitialContextFactory</parameter>
-            <parameter name="java.naming.provider.url" locked="false">repository/conf/jndi.properties</parameter>
-            <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
-           <parameter name="transport.jms.ConnectionFactoryType" locked="false">queue</parameter>
-        </parameter>
-
-        <parameter name="default" locked="false">
-            <parameter name="java.naming.factory.initial" locked="false">org.wso2.andes.jndi.PropertiesFileInitialContextFactory</parameter>
-            <parameter name="java.naming.provider.url" locked="false">repository/conf/jndi.properties</parameter>
-            <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
-            <parameter name="transport.jms.ConnectionFactoryType" locked="false">queue</parameter>
-        </parameter>
-    </transportReceiver-->
-
     <!--Uncomment this for FIX transport support
     <transportReceiver name="fix" class="org.apache.synapse.transport.fix.FIXTransportListener"/>
     -->
 
-    <!--transportReceiver name="hl7" class="org.wso2.carbon.business.messaging.hl7.transport.HL7TransportListener"/-->
-
-    <!-- SAP Transport Listeners -->
-    <!-- <transportReceiver name="idoc" class="org.wso2.carbon.transports.sap.SAPTransportListener"/> -->
-    <!-- <transportReceiver name="bapi" class="org.wso2.carbon.transports.sap.SAPTransportListener"/> -->
-
-    <!--Uncomment this and configure as appropriate for RabbitMQ transport support
-    <transportReceiver name="rabbitmq" class="org.apache.axis2.transport.rabbitmq.RabbitMQListener">
-        <parameter name="AMQPConnectionFactory" locked="false">
-            <parameter name="rabbitmq.server.host.name" locked="false">localhost</parameter>
-            <parameter name="rabbitmq.server.port" locked="false">5672</parameter>
-            <parameter name="rabbitmq.server.user.name" locked="false"></parameter>
-            <parameter name="rabbitmq.server.password" locked="false"></parameter>
-            <parameter name="rabbitmq.connection.retry.interval" locked="false">10000</parameter>
-            <parameter name="rabbitmq.connection.retry.count" locked="false">5</parameter>
-        </parameter>
-    </transportReceiver-->
+    <!--<transportReceiver name="http"-->
+    <!--class="org.wso2.carbon.core.transports.http.HttpTransportListener">-->
+    <!--
+	   Uncomment the following if you are deploying this within an application server. You
+	   need to specify the HTTP port of the application server
+	-->
+    <!--<parameter name="port">9763</parameter>-->
+
+    <!--
+   Uncomment the following to enable Apache2 mod_proxy. The port on the Apache server is 80
+   in this case.
+	-->
+    <!--<parameter name="proxyPort">80</parameter>-->
+    <!--</transportReceiver>-->
 
-    <!-- <transportReceiver name="mqtt" class="org.apache.axis2.transport.mqtt.MqttListener">
-         <parameter locked="false" name="mqttConFactory">
-             <parameter locked="false" name="mqtt.server.host.name">localhost</parameter>
-             <parameter name="mqtt.connection.factory">mqttConFactory</parameter>
-             <parameter locked="false" name="mqtt.server.port">1883</parameter>
-             <parameter locked="false" name="mqtt.client.id">client-id-1234</parameter>
-             <parameter locked="false" name="mqtt.topic.name">esb.test</parameter>
-         </parameter>
-     </transportReceiver>-->
+    <!--<transportReceiver name="https"-->
+    <!--class="org.wso2.carbon.core.transports.http.HttpsTransportListener">-->
+    <!--
+	   Uncomment the following if you are deploying this within an application server. You
+	   need to specify the HTTPS port of the application server
+	-->
+    <!--<parameter name="port">9443</parameter>-->
+
+    <!--
+   Uncomment the following to enable Apache2 mod_proxy. The port on the Apache server is 443
+   in this case.
+	-->
+    <!--<parameter name="proxyPort">443</parameter>-->
+    <!--</transportReceiver>-->
 
     <!-- ================================================= -->
     <!--             Transport Outs (Senders)              -->
@@ -390,12 +486,46 @@
 
     <transportSender name="http" class="org.apache.synapse.transport.passthru.PassThroughHttpSender">
         <parameter name="non-blocking" locked="false">true</parameter>
-        <!--<parameter name="warnOnHTTP500" locked="false">*</parameter>-->
-        <!--parameter name="http.proxyHost" locked="false">localhost</parameter-->
-        <!--<parameter name="http.proxyPort" locked="false">3128</parameter>-->
-        <!--<parameter name="http.nonProxyHosts" locked="false">localhost|moon|sun</parameter>-->
     </transportSender>
 
+    <!-- the non-blocking http transport based on HttpCore + NIO extensions -->
+    <!--transportSender name="http" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSender">
+        <parameter name="non-blocking" locked="false">true</parameter>
+    </transportSender>
+    <transportSender name="https" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSSLSender">
+        <parameter name="non-blocking" locked="false">true</parameter>
+        <parameter name="keystore" locked="false">
+            <KeyStore>
+                <Location>repository/resources/security/wso2carbon.jks</Location>
+                <Type>JKS</Type>
+                <Password>wso2carbon</Password>
+                <KeyPassword>wso2carbon</KeyPassword>
+            </KeyStore>
+        </parameter>
+        <parameter name="truststore" locked="false">
+            <TrustStore>
+                <Location>repository/resources/security/client-truststore.jks</Location>
+                <Type>JKS</Type>
+                <Password>wso2carbon</Password>
+            </TrustStore>
+        </parameter-->
+    <!--<parameter name="HostnameVerifier">DefaultAndLocalhost</parameter>-->
+    <!--supports Strict|AllowAll|DefaultAndLocalhost or the default if none specified -->
+    <!--/transportSender-->
+
+    <!-- Transport sender for the non blocking local transport-->
+    <!--transportSender name="local" class="org.apache.axis2.transport.local.NonBlockingLocalTransportSender"/-->
+    <transportSender name="local" class="org.wso2.carbon.core.transports.local.CarbonLocalTransportSender"/>
+
+    <!-- Pass-through HTTP Transport Senders -->
+    <!--<transportSender name="passthru-http"  class="org.wso2.carbon.transport.passthru.PassThroughHttpSender">
+        <parameter name="non-blocking" locked="false">true</parameter>
+        <parameter name="warnOnHTTP500" locked="false">*</parameter>-->
+    <!--parameter name="http.proxyHost" locked="false">localhost</parameter>
+	<parameter name="http.proxyPort" locked="false">3128</parameter>
+	<parameter name="http.nonProxyHosts" locked="false">localhost|moon|sun</parameter-->
+    <!--</transportSender>-->
+
     <transportSender name="https" class="org.apache.synapse.transport.passthru.PassThroughHttpSSLSender">
         <parameter name="non-blocking" locked="false">true</parameter>
         <parameter name="keystore" locked="false">
@@ -417,13 +547,29 @@
         <!--supports Strict|AllowAll|DefaultAndLocalhost or the default if none specified -->
     </transportSender>
 
-    <transportSender name="local" class="org.wso2.carbon.core.transports.local.CarbonLocalTransportSender"/>
-
-    <!--Uncomment this local transport to use local transport in mediation flow-->
-    <!--<transportSender name="local" class="org.apache.axis2.transport.local.NonBlockingLocalTransportSender"/>-->
+    <!--<transportSender name="passthru-https" class="org.wso2.carbon.transport.passthru.PassThroughHttpSSLSender">
+        <parameter name="non-blocking" locked="false">true</parameter>
+        <parameter name="keystore" locked="false">
+            <KeyStore>
+                <Location>repository/resources/security/wso2carbon.jks</Location>
+                <Type>JKS</Type>
+                <Password>wso2carbon</Password>
+                <KeyPassword>wso2carbon</KeyPassword>
+            </KeyStore>
+        </parameter>
+        <parameter name="truststore" locked="false">
+            <TrustStore>
+                <Location>repository/resources/security/client-truststore.jks</Location>
+                <Type>JKS</Type>
+                <Password>wso2carbon</Password>
+            </TrustStore>
+        </parameter>-->
+    <!--<parameter name="HostnameVerifier">DefaultAndLocalhost</parameter>-->
+    <!--supports Strict|AllowAll|DefaultAndLocalhost or the default if none specified -->
+    <!--</transportSender>-->
 
     <!-- uncomment this and configure to use connection pools for sending messages>
-      <transportSender name="jms" class="org.apache.axis2.transport.jms.JMSSender"/-->
+	<transportSender name="jms" class="org.apache.axis2.transport.jms.JMSSender"/-->
 
     <!--transportSender name="vfs" class="org.apache.synapse.transport.vfs.VFSTransportSender"/-->
 
@@ -443,16 +589,20 @@
     <transportSender name="fix" class="org.apache.synapse.transport.fix.FIXTransportSender"/>
     -->
 
-    <!--transportSender name="hl7" class="org.wso2.carbon.business.messaging.hl7.transport.HL7TransportSender"/-->
-
-    <!-- SAP Transport Senders -->
-    <!-- <transportSender name="idoc" class="org.wso2.carbon.transports.sap.SAPTransportSender"/> -->
-    <!-- <transportSender name="bapi" class="org.wso2.carbon.transports.sap.SAPTransportSender"/> -->
-
-    <!-- Uncomment this and configure to use RabbitMQ connection pools for sending messages
-    <transportSender name="rabbitmq" class="org.apache.axis2.transport.rabbitmq.RabbitMQSender"/-->
-
-    <!--<transportSender name="mqtt" class="org.apache.axis2.transport.mqtt.MqttSender"/>-->
+    <!--<transportSender name="http"-->
+    <!--class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">-->
+    <!--<parameter name="PROTOCOL">HTTP/1.1</parameter>-->
+    <!--<parameter name="Transfer-Encoding">chunked</parameter>-->
+    <!-- This parameter has been added to overcome problems encounted in SOAP action parameter -->
+    <!--<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>-->
+    <!-- This parameter has been added to overcome problems encounted in SOAP action parameter -->
+    <!--<parameter name="OmitSOAP12Action">true</parameter>-->
+    <!--</transportSender>-->
 
     <!-- ================================================= -->
     <!--             Global Engaged Modules                -->
@@ -461,6 +611,13 @@
     <!-- Comment this out to disable Addressing -->
     <module ref="addressing"/>
 
+    <!--
+    Uncomment out the following entry if SOAP (text/xml and application/soap+xml) messages
+    are processed through the message relay.
+    -->
+    <!--module ref="relay"/-->
+
+
     <!-- ================================================= -->
     <!--                Clustering                         -->
     <!-- ================================================= -->
@@ -493,7 +650,7 @@
                     is deemed to have left the cluster, it will be detected by the Group Membership
                     Service (GMS) using a TCP ping mechanism.
         -->
-        <parameter name="membershipScheme">wka</parameter>
+        <parameter name="membershipScheme">multicast</parameter>
         <!--<parameter name="licenseKey">xxx</parameter>-->
         <!--<parameter name="mgtCenterURL">http://localhost:8081/mancenter/</parameter>-->
 
@@ -537,7 +694,7 @@
         The TCP port used by this member. This is the port through which other nodes will
         contact this member
          -->
-        <parameter name="localMemberPort">4100</parameter>
+        <parameter name="localMemberPort">4000</parameter>
 
         <!--
             The bind port of this member. The difference between localMemberPort & localMemberBindPort
@@ -554,13 +711,7 @@
         <parameter name="properties">
             <property name="backendServerURL" value="https://${hostName}:${httpsPort}/services/"/>
             <property name="mgtConsoleURL" value="https://${hostName}:${httpsPort}/"/>
-            <!-- Manger Setup with Port Mapping-->
-            <!--property name="port.mapping.8280" value="9764"/>
-                <property name="port.mapping.8243" value="9444"/>
-                <property name="subDomain" value="mgt"/-->
-
-            <!-- Worker Setup-->
-            <!--property name="subDomain" value="worker"/-->
+            <property name="subDomain" value="worker"/>
         </parameter>
 
         <!--
@@ -580,8 +731,8 @@
         can be defined in this section.
         -->
         <groupManagement enable="false">
-            <applicationDomain name="wso2.esb.domain"
-                               description="ESB group"
+            <applicationDomain name="wso2.apim.domain"
+                               description="APIM group"
                                agent="org.wso2.carbon.core.clustering.hazelcast.HazelcastGroupManagementAgent"
                                subDomain="worker"
                                port="2222"/>
@@ -593,7 +744,7 @@
     <!-- ================================================= -->
 
     <!--
-        Uncomment and configure the following section to enable transactions support 
+        Uncomment and configure the following section to enable transactions support
     -->
     <!--<transaction timeout="30000">
         <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
@@ -621,14 +772,17 @@
         </phase>
         <phase name="Validation"/>
         <phase name="Transport">
+            <!--TEMPORALY-->
+            <!--handler name="TenantActiveCheckDispatcher"
+                     class="org.wso2.carbon.tenant.dispatcher.TenantActiveCheckDispatcher">
+                <order phase="Transport"/>
+            </handler-->
             <handler name="RequestURIBasedDispatcher"
                      class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
                 <order phase="Transport"/>
             </handler>
             <handler name="CarbonContextConfigurator"
                      class="org.wso2.carbon.mediation.initializer.handler.CarbonContextConfigurator"/>
-            <handler name="RelaySecuirtyMessageBuilderDispatchandler"
-                     class="org.apache.synapse.transport.passthru.util.RelaySecuirtyMessageBuilderDispatchandler"/>
             <handler name="SOAPActionBasedDispatcher"
                      class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
                 <order phase="Transport"/>
@@ -637,19 +791,21 @@
                      class="org.wso2.carbon.core.transports.smtp.SMTPFaultHandler">
                 <order phase="Transport"/>
             </handler-->
+            <!-- TEMPORALY-->
+            <!--handler name="CacheMessageBuilderDispatchandler"
+                     class="org.wso2.carbon.mediation.initializer.handler.CacheMessageBuilderDispatchandler"/-->
+            <handler name="CarbonContentConfigurator"
+                     class="org.wso2.carbon.mediation.initializer.handler.CarbonContextConfigurator"/>
         </phase>
         <phase name="Addressing">
             <handler name="AddressingBasedDispatcher"
                      class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
                 <order phase="Addressing"/>
             </handler>
+
         </phase>
         <phase name="Security"/>
-        <phase name="PreDispatch">
-            <!--Uncomment following handler to enable logging in ESB log UI-->
-            <!--<handler name="TenantDomainSetter"-->
-            <!--class="org.wso2.carbon.utils.logging.handler.TenantDomainSetter"/>-->
-        </phase>
+        <phase name="PreDispatch"/>
         <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="RequestURIBasedDispatcher"
                      class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
@@ -689,6 +845,7 @@
         <!--system predefined phase-->
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
+        <!--security handler for pass through -->
         <phase name="PTSecurityOutPhase">
             <handler name="RelaySecuirtyMessageBuilderDispatchandler"
                      class="org.apache.synapse.transport.passthru.util.RelaySecuirtyMessageBuilderDispatchandler"/>
@@ -697,7 +854,7 @@
         <phase name="Security"/>
 
         <!--
-           The MsgOutObservation phase is used to observe messages just before the
+           The MsgOutObservation phase is used tju,o observe messages just before the
            responses are sent out. In this phase, we could do some things such as SOAP message
            tracing & keeping track of the time at which a particular response was sent.
 
@@ -716,6 +873,7 @@
         -->
         <phase name="MsgInObservation"/>
         <phase name="Validation"/>
+
         <phase name="Transport">
             <handler name="RequestURIBasedDispatcher"
                      class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
@@ -725,13 +883,17 @@
                      class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
                 <order phase="Transport"/>
             </handler>
+            <handler name="CarbonContentConfigurator"
+                     class="org.wso2.carbon.mediation.initializer.handler.CarbonContextConfigurator"/>
         </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">
@@ -776,4 +938,4 @@
         <phase name="MsgOutObservation"/>
     </phaseOrder>
 
-</axisconfig>
+</axisconfig>
\ No newline at end of file