Adding iot distribution with restructure components.

8 years ago · 2f3eb595a2
parent 2a9f940b48
commit 2f3eb595a2
313 changed files with 63479 additions and 4 deletions
--- a/modules/components/org.wso2.iot.core.admin.styles/pom.xml
+++ b/modules/components/org.wso2.iot.core.admin.styles/pom.xml
@ -0,0 +1,63 @@
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~ 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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.wso2.iot</groupId>
+        <artifactId>wso2iot-components</artifactId>
+        <version>3.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.iot.core.admin.styles</artifactId>
+    <packaging>bundle</packaging>
+    <name>WSO2 IoT - Core - UI Styles</name>
+    <url>http://wso2.org</url>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Import-Package>
+                            org.osgi.framework,
+                            org.osgi.service.http,
+                            org.wso2.carbon.ui,
+                            javax.servlet.*;version="2.4.0",
+                            *;resolution:=optional
+                        </Import-Package>
+                        <Fragment-Host>org.wso2.carbon.ui</Fragment-Host>
+                        <Carbon-Component>UIBundle</Carbon-Component>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/META-INF/product.xml
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/META-INF/product.xml
@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~ 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.
+  -->
+<product xmlns="http://products.wso2.org/carbon">
+    <properties>
+        <property name="userforum">http://stackoverflow.com/questions/tagged/wso2/</property>
+        <property name="userguide">https://docs.wso2.org/display/IOT100/WSO2+IoT+Server</property>
+        <property name="mailinglist">http://wso2.org/mail</property>
+        <property name="issuetracker">https://wso2.org/jira/browse/IoT</property>
+    </properties>
+</product>
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/product/about.html
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/product/about.html
@ -0,0 +1,49 @@
+<!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~ 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.
+  -->
+<html>
+<head>
+    <meta http-equiv="content-type" content=""/>
+    <title>WSO2 IoT 1.0.0</title>
+    <link href="./tools/cmd/css/gs-dist-doc.css" rel="stylesheet"
+          type="text/css" media="all"/>
+</head>
+
+<body>
+<h1>WSO2 IoT 1.0.0</h1>
+
+<p>
+    With its modular, extensible, and customizable capabilities,
+    WSO2 Internet of Things Server (IoT Server) offers a complete, secure,
+    open source, enterprise-grade IoT device management solution.
+
+    Built by re-using WSO2 middleware platform capabilities,
+    WSO2 IoT Server provides the server-side of IoT device management architecture for device manufacturers;
+    the extensibility of the underlying WSO2 Connected Device Management Framework enables WSO2 IoT Server
+    to be extended to any device type and support other protocols and data formats.
+    Moreover, it’s in-built tooling capability allows developers to extend WSO2 IoT Server’s functionality.
+
+    It offers customizable and advanced IoT device analytics via WSO2 Data Analytics Server
+    that include predictive analytics using machine learning capabilities.
+    It also supports edge computing devices and policy-based edge analytics as well
+    as pre-built instant visualization for sensor readings using live data streams gathered from devices.
+</p>
+
+<h2>Features</h2>
+
+</body>
+</html>
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/styles/css/main.css
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/styles/css/main.css
@ -0,0 +1,315 @@
+/*
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) 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
+ *
+ * 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.
+ */
+
+/* ---------------- template styles ------------------------- */
+
+table#main-table td#header {
+    background-image: none !important;
+    border-bottom: 1px solid #CCC;
+}
+
+table#main-table td#menu-panel {
+    border-right: solid 1px #6F97CD;
+    /*background-image: url(../images/app-server-menu-panel-bg.gif);*/
+    background-position: right top;
+    background-repeat: repeat-y;
+}
+
+/* ---------------- header styles ------------------ */
+div#header-div {
+    background-color: #222222;
+    background-image: none !important;
+}
+
+div#header-div div.left-logo {
+    background-image: url(../images/logo.png);
+    width: 138px;
+    margin: 12px 20px !important;
+}
+
+div#header-div div.right-logo {
+    /*background-image: url( ../images/wsas-mgt-logo.gif);*/
+    color: #FFF;
+    font-family: Arial;
+    font-size: 12px;
+    padding: 0px !important;
+    margin: 18px !important;
+
+}
+
+div#header-div div.header-links {
+    margin-top: 0px;
+    float: right !important;
+}
+
+div#header-div div.header-links div.right-links {
+    margin-right: 0px;
+    height: 35px;
+    padding-top: 0px;
+}
+
+div#header-div div.header-links div.right-links ul {
+
+    background-position: left top;
+    background-repeat: repeat-x;
+    padding-top: 9px;
+    padding-bottom: 7px;
+}
+
+/* ------------- menu styles ---------------------- */
+div#menu {
+}
+
+div#menu ul.main {
+}
+
+div#menu ul.main li {
+}
+
+div#menu ul.main li.normal {
+}
+
+div#menu ul.main li a.menu-home {
+    color: #0067B1;
+    background-image: none;
+    height: 30px;
+    line-height: 30px;
+}
+
+div#menu ul.main li a.menu-home:hover {
+    color: #f47b20;
+    background-image: none;
+    background-color: #ffffff;
+}
+
+div#menu ul.main li.menu-header {
+    /*background-image: url(../images/app-server-menu-header.png);*/
+    background-image: none !important;
+    background-position: left bottom;
+    background-repeat: repeat-x;
+
+    border-top: 1px solid #CCC;
+    border-bottom: 1px solid #CCC;
+    color: #502D16 !important;
+    height: 32px;
+    line-height: 32px;
+    background-color: #F3f3f3;
+    font-weight: bold;
+    text-transform: uppercase;
+}
+
+div#menu ul.main li.menu-header img {
+    margin-right: -14px;
+    margin-top: 7px;
+}
+
+div#menu ul.main li a.menu-default {
+
+}
+
+div#menu ul.main li a.menu-default:hover {
+    background-color: #ffffff;
+    border-bottom: solid 1px #CCC;
+    border-top: solid 1px #CCC;
+    color: #00447C;
+
+}
+
+div#menu ul.sub {
+}
+
+div#menu ul.main li.menu-disabled-link {
+    background-color: #E9EDF7;
+}
+
+/* -------------- child no-01 styles -------------- */
+
+div#menu ul.sub li.normal {
+
+}
+
+div#menu ul.sub li a.menu-default {
+}
+
+/* ----------- child no-01 (disabled) styles ------------------- */
+
+div#menu ul.sub li a.menu-disabled-link {
+}
+
+div#menu ul.sub li a.menu-disabled-link:hover {
+}
+
+/* -------------- child no-02 styles -------------- */
+
+div#menu ul.sub li.normal ul.sub li a.menu-default {
+
+}
+
+/* -------------- child no-03 styles -------------- */
+
+div#menu ul.sub li.normal ul.sub li.normal ul.sub li a.menu-default {
+}
+
+/* ------------- footer styles -------------------- */
+
+div#footer-div div.footer-content div.poweredby {
+    /*background-image: url( ../images/axis2-powered.gif);*/
+}
+
+/* ---- login styles ----- */
+
+/* --------------- table styles -------------------- */
+
+.tableOddRow {
+    background-color: white;
+}
+
+.tableEvenRow {
+    background-color: #eeeffb;
+}
+
+.button:hover {
+    /*background-image:url(../images/wsas-button-bg-hover.gif);
+    border:solid 1px #9D9FA1;*/
+}
+
+/* -------------- work area ---------------------- */
+
+table#main-table td#middle-content {
+    background-color: none !important;
+    background: transparent !important;
+}
+
+div#middle {
+    background-color: #ffffff;
+}
+
+div#middle h2 {
+    margin-top: 5px;
+}
+
+div#middle div#workArea {
+    background-color: none !important;
+    background: transparent !important;
+    padding: 10px;
+}
+
+div#workArea table.styledLeft thead th {
+    /*background-image:url("../images/app-server-table-header.gif");*/
+    background-image: none;
+    background-color: #efd7a5;
+    border-bottom: 1px solid #CCC;
+    border-left: 1px solid #CCC;
+    border-right: 1px solid #CCC;
+    border-top: 1px solid #CCC;
+    height: 27px;
+    line-height: 25px;
+    text-transform: uppercase;
+    font-weight: bold;
+}
+
+div#workArea table.styledLeft .tableOddRow {
+    background-color: none !important;
+}
+
+div#workArea table.styledLeft .tableEvenRow {
+    background-color: none !important;
+    background: none;
+}
+
+div#workArea table.styledLeft tbody tr td.middle-header {
+    /*background-image:url("../images/app-server-table-header.gif");*/
+    border-bottom: 1px solid #A7A9AC;
+    border-left: 1px solid #cccccc;
+    border-right: 1px solid #cccccc;
+    border-top: 1px solid #cccccc;
+    height: 22px;
+    line-height: 22px;
+}
+
+div#workArea table.styledLeft tbody tr td.buttonRow {
+    /*background-image:url("../images/app-server-buttonRow-bg.gif");*/
+    background-color: #F5F5F6;
+    padding-bottom: 5px;
+    padding-top: 5px;
+}
+
+.button {
+    /*background-image:url("../images/app-server-button-bg.gif");*/
+    background-position: left bottom;
+    border: 1px solid #666666;
+    padding: 2px 5px;
+}
+
+/** TEAGUE EDITS FOR JAGGERY SERVER ADMIN **/
+
+div#header-div {
+    height: 52px !important;
+}
+
+.left-logo img {
+    display: none !important;
+}
+
+body {
+    /*background-image:url("../images/bg.png");*/
+    font-family: Arial !important;
+}
+
+div.right-links ul a {
+
+}
+
+a {
+    color: #502D16 !important;
+}
+
+a:hover {
+    color: #784421 !important;
+}
+
+table#main-table td#menu-panel {
+    border-right: 1px solid #784421;
+}
+
+div#middle h2 {
+    color: #502D16 !important;
+    font-weight: bold;
+    padding-bottom: 10px;
+    border-bottom: 1px solid #CCC !important;
+}
+
+div#features tr.feature td {
+    border-top: 1px solid #CCC;
+}
+
+div#features tr.feature-top td {
+    border-top: 0px;
+}
+
+#main-table {
+    background-color: none !important;
+
+}
+
+#middle {
+    background: transparent !important;
+    background-color: none !important;
+}
+
+/* --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/styles/images/logo.png
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/styles/images/logo.png
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/css/dashboard-common.css
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/css/dashboard-common.css
@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) 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
+ *
+ * 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.
+ */
+
+.tip-table {
+    border-collapse: collapse;
+    width: 868px;
+}
+
+.tip-table tr td.tip-empty {
+    width: 20px;
+}
+
+.tip-top {
+    width: 202px;
+    height: 85px;
+    z-index: 90;
+}
+
+.tip-content-lifter {
+    margin-top: -20px;
+    position: relative;
+    font-size: 11px;
+}
+
+.tip-content a.dashboard-subtitle {
+    line-height: 30px;
+}
+
+.tip-content {
+    background: transparent url(../images/tip-back.png) repeat-y left top;
+    padding: 10px !important;
+    width: 182px;
+    z-index: 100;
+}
+
+.tip-bottom {
+    background: transparent url(../images/tip-bottom.png) no-repeat left top;
+    height: 11px;
+    width: 202px;
+}
+
+a.tip-title, h3.tip-title {
+    color: #333333 !important;
+    font-size: 18px !important;
+    text-decoration: none;
+    margin-bottom: 0 !important;
+    margin-top: 0 !important;
+    display: block;
+}
+
+a.tip-title {
+    cursor: pointer;
+}
+
+a.tip-title:hover {
+    color: #930000 !important;
+}
+
+div#workArea h2.dashboard-title {
+    background-image: url(../images/dashboard-title-bg.gif);
+    background-position: left bottom;
+    background-repeat: repeat-x;
+    border-bottom: 0 none;
+    color: #000000;
+    font-size: 150%;
+    font-weight: bold;
+    line-height: 25px;
+    margin-bottom: 20px;
+    padding-bottom: 10px;
+}
+
+.tip-table-div {
+    height: 10px;
+}
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/css/main.css
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/css/main.css
@ -0,0 +1,315 @@
+/*
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) 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
+ *
+ * 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.
+ */
+
+/* ---------------- template styles ------------------------- */
+
+table#main-table td#header {
+    background-image: none !important;
+    border-bottom: 1px solid #CCC;
+}
+
+table#main-table td#menu-panel {
+    border-right: solid 1px #6F97CD;
+    /*background-image: url(../images/app-server-menu-panel-bg.gif);*/
+    background-position: right top;
+    background-repeat: repeat-y;
+}
+
+/* ---------------- header styles ------------------ */
+div#header-div {
+    background-color: #222222;
+    background-image: none !important;
+}
+
+div#header-div div.left-logo {
+    background-image: url(../images/logo.png);
+    width: 200px;
+    margin: 12px 20px !important;
+}
+
+div#header-div div.right-logo {
+    /*background-image: url( ../images/wsas-mgt-logo.gif);*/
+    color: #FFF;
+    font-family: Arial;
+    font-size: 12px;
+    padding: 0px !important;
+    margin: 18px !important;
+
+}
+
+div#header-div div.header-links {
+    margin-top: 0px;
+    float: right !important;
+}
+
+div#header-div div.header-links div.right-links {
+    margin-right: 0px;
+    height: 35px;
+    padding-top: 0px;
+}
+
+div#header-div div.header-links div.right-links ul {
+
+    background-position: left top;
+    background-repeat: repeat-x;
+    padding-top: 9px;
+    padding-bottom: 7px;
+}
+
+/* ------------- menu styles ---------------------- */
+div#menu {
+}
+
+div#menu ul.main {
+}
+
+div#menu ul.main li {
+}
+
+div#menu ul.main li.normal {
+}
+
+div#menu ul.main li a.menu-home {
+    color: #0067B1;
+    background-image: none;
+    height: 30px;
+    line-height: 30px;
+}
+
+div#menu ul.main li a.menu-home:hover {
+    color: #f47b20;
+    background-image: none;
+    background-color: #ffffff;
+}
+
+div#menu ul.main li.menu-header {
+    /*background-image: url(../images/app-server-menu-header.png);*/
+    background-image: none !important;
+    background-position: left bottom;
+    background-repeat: repeat-x;
+
+    border-top: 1px solid #CCC;
+    border-bottom: 1px solid #CCC;
+    color: #502D16 !important;
+    height: 32px;
+    line-height: 32px;
+    background-color: #F3f3f3;
+    font-weight: bold;
+    text-transform: uppercase;
+}
+
+div#menu ul.main li.menu-header img {
+    margin-right: -14px;
+    margin-top: 7px;
+}
+
+div#menu ul.main li a.menu-default {
+
+}
+
+div#menu ul.main li a.menu-default:hover {
+    background-color: #ffffff;
+    border-bottom: solid 1px #CCC;
+    border-top: solid 1px #CCC;
+    color: #00447C;
+
+}
+
+div#menu ul.sub {
+}
+
+div#menu ul.main li.menu-disabled-link {
+    background-color: #E9EDF7;
+}
+
+/* -------------- child no-01 styles -------------- */
+
+div#menu ul.sub li.normal {
+
+}
+
+div#menu ul.sub li a.menu-default {
+}
+
+/* ----------- child no-01 (disabled) styles ------------------- */
+
+div#menu ul.sub li a.menu-disabled-link {
+}
+
+div#menu ul.sub li a.menu-disabled-link:hover {
+}
+
+/* -------------- child no-02 styles -------------- */
+
+div#menu ul.sub li.normal ul.sub li a.menu-default {
+
+}
+
+/* -------------- child no-03 styles -------------- */
+
+div#menu ul.sub li.normal ul.sub li.normal ul.sub li a.menu-default {
+}
+
+/* ------------- footer styles -------------------- */
+
+div#footer-div div.footer-content div.poweredby {
+    /*background-image: url( ../images/axis2-powered.gif);*/
+}
+
+/* ---- login styles ----- */
+
+/* --------------- table styles -------------------- */
+
+.tableOddRow {
+    background-color: white;
+}
+
+.tableEvenRow {
+    background-color: #eeeffb;
+}
+
+.button:hover {
+    /*background-image:url(../images/wsas-button-bg-hover.gif);
+    border:solid 1px #9D9FA1;*/
+}
+
+/* -------------- work area ---------------------- */
+
+table#main-table td#middle-content {
+    background-color: none !important;
+    background: transparent !important;
+}
+
+div#middle {
+    background-color: #ffffff;
+}
+
+div#middle h2 {
+    margin-top: 5px;
+}
+
+div#middle div#workArea {
+    background-color: none !important;
+    background: transparent !important;
+    padding: 10px;
+}
+
+div#workArea table.styledLeft thead th {
+    /*background-image:url("../images/app-server-table-header.gif");*/
+    background-image: none;
+    background-color: #efd7a5;
+    border-bottom: 1px solid #CCC;
+    border-left: 1px solid #CCC;
+    border-right: 1px solid #CCC;
+    border-top: 1px solid #CCC;
+    height: 27px;
+    line-height: 25px;
+    text-transform: uppercase;
+    font-weight: bold;
+}
+
+div#workArea table.styledLeft .tableOddRow {
+    background-color: none !important;
+}
+
+div#workArea table.styledLeft .tableEvenRow {
+    background-color: none !important;
+    background: none;
+}
+
+div#workArea table.styledLeft tbody tr td.middle-header {
+    /*background-image:url("../images/app-server-table-header.gif");*/
+    border-bottom: 1px solid #A7A9AC;
+    border-left: 1px solid #cccccc;
+    border-right: 1px solid #cccccc;
+    border-top: 1px solid #cccccc;
+    height: 22px;
+    line-height: 22px;
+}
+
+div#workArea table.styledLeft tbody tr td.buttonRow {
+    /*background-image:url("../images/app-server-buttonRow-bg.gif");*/
+    background-color: #F5F5F6;
+    padding-bottom: 5px;
+    padding-top: 5px;
+}
+
+.button {
+    /*background-image:url("../images/app-server-button-bg.gif");*/
+    background-position: left bottom;
+    border: 1px solid #666666;
+    padding: 2px 5px;
+}
+
+/** TEAGUE EDITS FOR JAGGERY SERVER ADMIN **/
+
+div#header-div {
+    height: 52px !important;
+}
+
+.left-logo img {
+    display: none !important;
+}
+
+body {
+    /*background-image:url("../images/bg.png");*/
+    font-family: Arial !important;
+}
+
+div.right-links ul a {
+
+}
+
+a {
+    color: #502D16 !important;
+}
+
+a:hover {
+    color: #784421 !important;
+}
+
+table#main-table td#menu-panel {
+    border-right: 1px solid #784421;
+}
+
+div#middle h2 {
+    color: #502D16 !important;
+    font-weight: bold;
+    padding-bottom: 10px;
+    border-bottom: 1px solid #CCC !important;
+}
+
+div#features tr.feature td {
+    border-top: 1px solid #CCC;
+}
+
+div#features tr.feature-top td {
+    border-top: 0px;
+}
+
+#main-table {
+    background-color: none !important;
+
+}
+
+#middle {
+    background: transparent !important;
+    background-color: none !important;
+}
+
+/* --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/docs/images/dashboard.png
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/docs/images/dashboard.png
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/docs/userguide.html
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/docs/userguide.html
@ -0,0 +1,43 @@
+<!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~ 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.
+  -->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+    <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"/>
+    <title>Cloud Application Server Home - User Guide</title>
+    <link href="../../admin/css/documentation.css" rel="stylesheet" type="text/css" media="all"/>
+</head>
+
+<body>
+<h1>Cloud Application Server Home</h1>
+
+<p>
+    The WSO2 Application Server supports the development, deployment, and management of Web services
+    through a lean, simple and inter-operable platform for hosting Java-based services. With
+    capabilities such as clustering and high availability, Eclipse IDE integration, and full support
+    for key WS-* and REST standards, AppServer is becoming the platform of choice for developers and
+    SOA architects.
+</p>
+
+<img src="../../tenant-dashboard/docs/images/dashboard.png"/>
+
+<p>Figure1: Cloud Application Server Home</p>
+</body>
+
+</html>
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/dashboard-title-bg.gif
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/dashboard-title-bg.gif
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/java2wsdl.png
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/java2wsdl.png
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/message-tracing.png
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/message-tracing.png
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/modules.png
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/modules.png
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/service-hosting.png
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/service-hosting.png
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/service-testing.png
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/service-testing.png
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/tip-back.png
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/tip-back.png
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/tip-bottom.png
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/tip-bottom.png
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/web-applications.png
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/web-applications.png
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/wsdl-validator.png
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/wsdl-validator.png
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/wsdl2java.png
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/images/wsdl2java.png
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/index-old.jsp
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/index-old.jsp
@ -0,0 +1,105 @@
+<%--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~ 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.
+  --%>
+
+<!--
+~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) 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
+~
+~ 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.
+-->
+<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
+
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<jsp:include page="../dialog/display_messages.jsp"/>
+
+<script type="text/javascript" src="../statistics/js/statistics.js"></script>
+<script type="text/javascript" src="../statistics/js/graphs.js"></script>
+
+<script type="text/javascript" src="../admin/js/jquery.flot.js"></script>
+<script type="text/javascript" src="../admin/js/excanvas.js"></script>
+
+<%@include file="../admin/index.jsp" %>
+
+<script id="source" type="text/javascript">
+    jQuery.noConflict();
+    var responseTimeGraphWidth = 500;
+    var responseTimeXScale = 25;
+
+    initStats(responseTimeXScale, 25);
+
+    function drawResponseTimeGraph() {
+        jQuery.plot(jQuery("#responseTimeGraph"), [
+            {
+                data: graphAvgResponse.get(),
+                lines: {show: true, fill: true}
+            }
+        ], {
+            xaxis: {
+                ticks: graphAvgResponse.tick(),
+                min: 0
+            },
+            yaxis: {
+                ticks: 10,
+                min: 0
+            }
+        });
+    }
+</script>
+
+<fmt:bundle basename="org.wso2.carbon.statistics.ui.i18n.Resources">
+    <div id="middle">
+        <div id="workArea">
+            <div id="systemStats"></div>
+            <script type="text/javascript">
+                jQuery.noConflict();
+                var varRefreshSystemStats;
+                function refreshSystemStats() {
+                    var url = "../tenant-dashboard/system_stats_ajaxprocessor.jsp";
+                    jQuery("#systemStats").load(url, null, function (responseText, status,
+                                                                     XMLHttpRequest) {
+                        if (status != "success") {
+                            stopRefreshSystemStats();
+                            document.getElementById('systemStats').innerHTML = responseText;
+                        }
+                    });
+                }
+                function stopRefreshSystemStats() {
+                    if (varRefreshSystemStats) {
+                        clearInterval(varRefreshSystemStats);
+                    }
+                }
+                jQuery(document).ready(function () {
+                    refreshSystemStats();
+                    varRefreshSystemStats = setInterval("refreshSystemStats()", 10000);
+                });
+            </script>
+        </div>
+    </div>
+</fmt:bundle>
+
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/index.jsp
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/index.jsp
@ -0,0 +1,147 @@
+<%--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~ 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.
+  --%>
+
+<!--
+~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) 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
+~
+~ 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.
+-->
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar" prefix="carbon" %>
+<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
+<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
+<link href="../tenant-dashboard/css/dashboard-common.css" rel="stylesheet" type="text/css"
+      media="all"/>
+<%
+    Object param = session.getAttribute("authenticated");
+    String passwordExpires = (String) session.getAttribute(ServerConstants.PASSWORD_EXPIRATION);
+    boolean hasModMgtPermission = CarbonUIUtil.isUserAuthorized(request,
+                                                                "/permission/admin/manage/add/module");
+    boolean hasServiceMgtPermission = CarbonUIUtil.isUserAuthorized(request, "/permission/admin/manage/add/service");
+    boolean hasWebAppMgtPermission = CarbonUIUtil.isUserAuthorized(request, "/permission/admin/manage/manage/webapp");
+    boolean loggedIn = false;
+    if (param != null) {
+        loggedIn = (Boolean) param;
+    }
+%>
+
+<div id="passwordExpire">
+    <%
+        if (loggedIn && passwordExpires != null) {
+    %>
+    <div class="info-box"><p>Your password expires at <%=passwordExpires%>. Please change by
+                             visiting <a
+                href="../user/change-passwd.jsp?isUserChange=true&returnPath=../admin/index.jsp">here</a>
+    </p></div>
+    <%
+        }
+    %>
+</div>
+<div id="middle">
+    <div id="workArea">
+        <style type="text/css">
+            .tip-table td.service-hosting {
+                background-image: url(../../carbon/tenant-dashboard/images/service-hosting.png);
+            }
+
+            .tip-table td.web-applications {
+                background-image: url(../../carbon/tenant-dashboard/images/web-applications.png);
+            }
+
+            .tip-table td.service-testing {
+                background-image: url(../../carbon/tenant-dashboard/images/service-testing.png);
+            }
+
+            .tip-table td.message-tracing {
+                background-image: url(../../carbon/tenant-dashboard/images/message-tracing.png);
+            }
+
+            .tip-table td.wsdl2java {
+                background-image: url(../../carbon/tenant-dashboard/images/wsdl2java.png);
+            }
+
+            .tip-table td.java2wsdl {
+                background-image: url(../../carbon/tenant-dashboard/images/java2wsdl.png);
+            }
+
+            .tip-table td.wsdl-validator {
+                background-image: url(../../carbon/tenant-dashboard/images/wsdl-validator.png);
+            }
+
+            .tip-table td.modules {
+                background-image: url(../../carbon/tenant-dashboard/images/modules.png);
+            }
+        </style>
+        <h2 class="dashboard-title">WSO2 Enterprise Mobility Server quick start dashboard</h2>
+        <table class="tip-table">
+            <tr>
+                <td class="tip-top service-hosting"></td>
+                <td class="tip-top"></td>
+                <td class="tip-top"></td>
+                <td class="tip-top"></td>
+                <td class="tip-top"></td>
+            </tr>
+            <tr>
+
+                <td class="tip-content">
+                    <div class="tip-content-lifter">
+                        <%
+                            if (hasWebAppMgtPermission) {
+                        %>
+                        <a class="tip-title"
+                           href="../webapp-list/index.jsp?region=region1&item=webapps_list_menu">Web
+                                                                                                 Applications</a>
+                        <br/>
+                        <%
+                        } else {
+                        %>
+                        <h3>Web Applications</h3> <br/>
+                        <%
+                            }
+                        %>
+                        <p>Web Application hosting features in AppServer supports deployment of
+                           Tomcat compliant Webapps. Deployed Webapps can be easily managed using
+                           the Webapp management facilities available in the management console.</p>
+
+                    </div>
+                </td>
+                <td class="tip-empty"></td>
+
+            </tr>
+            <tr>
+            </tr>
+        </table>
+        <div class="tip-table-div"></div>
+
+
+        <p>
+            <br/>
+        </p></div>
+</div>
--- a/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/system_stats_ajaxprocessor.jsp
+++ b/modules/components/org.wso2.iot.core.admin.styles/src/main/resources/web/tenant-dashboard/system_stats_ajaxprocessor.jsp
@ -0,0 +1,146 @@
+<%--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~ 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.
+  --%>
+
+<!--
+~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) 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
+~
+~ 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.
+-->
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
+<%@ page import="org.wso2.carbon.CarbonConstants" %>
+<%@ page import="org.wso2.carbon.statistics.ui.StatisticsAdminClient" %>
+<%@ page import="org.wso2.carbon.statistics.ui.types.carbon.SystemStatistics" %>
+<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
+<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
+<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
+
+<%
+    response.setHeader("Cache-Control", "no-cache");
+
+    String backendServerURL = CarbonUIUtil.getServerURL(config.getServletContext(), session);
+    ConfigurationContext configContext =
+            (ConfigurationContext) config.getServletContext().getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
+
+    String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
+    StatisticsAdminClient client = new StatisticsAdminClient(cookie, backendServerURL,
+                                                             configContext, request.getLocale());
+
+    SystemStatistics systemStats;
+    try {
+        systemStats = client.getSystemStatistics();
+    } catch (Exception e) {
+        response.setStatus(500);
+        CarbonUIMessage uiMsg = new CarbonUIMessage(CarbonUIMessage.ERROR, e.getMessage(), e);
+        session.setAttribute(CarbonUIMessage.ID, uiMsg);
+%>
+<jsp:include page="../admin/error.jsp"/>
+<%
+        return;
+    }
+%>
+
+<fmt:bundle basename="org.wso2.carbon.statistics.ui.i18n.Resources">
+    <table width="100%">
+        <tr>
+            <td width="49%">
+                <!-- Service Summary -->
+                <table class="styledLeft" width="100%" id="serviceSummaryTable"
+                       style="margin-left: 0px;">
+                    <thead>
+                    <tr>
+                        <th colspan="2"><fmt:message key="service.summary"/></th>
+                    </tr>
+                    </thead>
+                    <tr class="tableOddRow">
+                        <td width="60%"><fmt:message key="average.response.time"/></td>
+                        <td><%= ((float) Math.round(systemStats.getAvgResponseTime() * 1000)) / 1000 %>
+                            ms
+                        </td>
+                    </tr>
+                    <tr class="tableEvenRow">
+                        <td width="60%"><fmt:message key="minimum.response.time"/></td>
+                        <td>
+                            <% if (systemStats.getMinResponseTime() <= 0) {%>
+                            &lt; 1.00 ms
+                            <% } else {%>
+                            <%= systemStats.getMinResponseTime()%> ms
+                            <% }%>
+                        </td>
+                    </tr>
+                    <tr class="tableOddRow">
+                        <td width="60%"><fmt:message key="maximum.response.time"/></td>
+                        <td><%= systemStats.getMaxResponseTime()%> ms</td>
+                    </tr>
+                    <tr class="tableEvenRow">
+                        <td width="60%"><fmt:message key="total.request.count"/></td>
+                        <td><%= systemStats.getRequestCount()%>
+                        </td>
+                    </tr>
+                    <tr class="tableOddRow">
+                        <td width="60%"><fmt:message key="total.response.count"/></td>
+                        <td><%= systemStats.getResponseCount()%>
+                        </td>
+                    </tr>
+                    <tr class="tableEvenRow">
+                        <td width="60%"><fmt:message key="total.fault.count"/></td>
+                        <td><%= systemStats.getFaultCount()%>
+                        </td>
+                    </tr>
+                    <tr class="tableOddRow">
+                        <td width="60%"><fmt:message key="active.services"/></td>
+                        <td><%= systemStats.getServices()%>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+            <td width="2%">&nbsp;</td>
+            <td width="49%">
+                <table class="styledLeft" width="100%" style="margin-left: 0px;">
+                    <thead>
+                    <tr>
+                        <th><fmt:message key="average.response.time.vs.time.units"/></th>
+                    </tr>
+                    </thead>
+                    <tr>
+                        <td>
+                            <div id="responseTimeGraph"
+                                 style="width:500px;height:205px;"></div>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+        <script type="text/javascript">
+            graphAvgResponse.add(<%= systemStats.getAvgResponseTime()%>);
+            drawResponseTimeGraph();
+        </script>
+    </table>
+</fmt:bundle>
--- a/modules/components/pom.xml
+++ b/modules/components/pom.xml
@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~ 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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.wso2.iot</groupId>
+        <artifactId>wso2iot-parent</artifactId>
+        <version>3.1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wso2iot-components</artifactId>
+    <packaging>pom</packaging>
+    <name>WSO2 IoT Server - Components Module</name>
+    <url>http://wso2.org</url>
+
+    <modules>
+       <module>org.wso2.iot.core.admin.styles</module>
+    </modules>
+
+</project>
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@ -0,0 +1,766 @@
+<?org.wso2.uesxml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~ 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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<parent>
+		<groupId>org.wso2.iot</groupId>
+		<artifactId>wso2iot-parent</artifactId>
+		<version>3.1.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>wso2iot</artifactId>
+	<packaging>pom</packaging>
+	<name>WSO2 IoT - Distribution</name>
+	<description>WSO2 IoT Distribution</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.h2database.wso2</groupId>
+			<artifactId>h2-database-engine</artifactId>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>buildnumber-maven-plugin</artifactId>
+				<version>${maven-buildnumber-plugin.version}</version>
+				<configuration>
+					<format>{0,date,dd MMM yyyy}</format>
+					<items>
+						<item>timestamp</item>
+					</items>
+					<doCheck>false</doCheck>
+					<doUpdate>false</doUpdate>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>create</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<inherited>false</inherited>
+				<executions>
+					<execution>
+						<id>2-unpack-wso2carbon</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.wso2.carbon</groupId>
+									<artifactId>wso2carbon-core</artifactId>
+									<version>${carbon.kernel.version}</version>
+									<type>zip</type>
+									<overWrite>true</overWrite>
+									<outputDirectory>target</outputDirectory>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>com.google.code.maven-replacer-plugin</groupId>
+				<artifactId>replacer</artifactId>
+				<version>1.5.2</version>
+				<executions>
+					<!-- Replace Datasource, Scope mpl classes and OAuth callback class in identity.xml -->
+					<execution>
+						<id>replace-for-identity</id>
+						<phase>package</phase>
+						<goals>
+							<goal>replace</goal>
+						</goals>
+						<configuration>
+							<file>${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/identity/identity.xml</file>
+							<replacements>
+								<replacement>
+									<xpath>/Server/JDBCPersistenceManager/DataSource/Name</xpath>
+									<token>(jdbc/WSO2CarbonDB)</token>
+									<value>jdbc/WSO2AM_DB</value>
+								</replacement>
+								<replacement>
+									<xpath>/Server/OAuth/SupportedGrantTypes/SupportedGrantType</xpath>
+									<token>(org.wso2.carbon.identity.oauth2.token.handlers.grant.AuthorizationCodeGrantHandler)</token>
+									<value>org.wso2.carbon.apimgt.keymgt.handlers.ExtendedAuthorizationCodeGrantHandler</value>
+								</replacement>
+								<replacement>
+									<xpath>/Server/OAuth/SupportedGrantTypes/SupportedGrantType</xpath>
+									<token>(org.wso2.carbon.identity.oauth2.token.handlers.grant.PasswordGrantHandler)</token>
+									<value>org.wso2.carbon.apimgt.keymgt.handlers.ExtendedPasswordGrantHandler</value>
+								</replacement>
+								<replacement>
+									<xpath>/Server/OAuth/SupportedGrantTypes/SupportedGrantType</xpath>
+									<token>(org.wso2.carbon.identity.oauth2.token.handlers.grant.ClientCredentialsGrantHandler)</token>
+									<value>org.wso2.carbon.apimgt.keymgt.handlers.ExtendedClientCredentialsGrantHandler</value>
+								</replacement>
+								<replacement>
+									<xpath>/Server/OAuth/SupportedGrantTypes/SupportedGrantType</xpath>
+									<token>(org.wso2.carbon.identity.oauth2.token.handlers.grant.saml.SAML2BearerGrantHandler)</token>
+									<value>org.wso2.carbon.apimgt.keymgt.handlers.ExtendedSAML2BearerGrantHandler</value>
+								</replacement>
+								<replacement>
+									<xpath>/Server/OAuth/SupportedGrantTypes/SupportedGrantType</xpath>
+									<token>(org.wso2.carbon.identity.oauth2.token.handlers.grant.iwa.ntlm.NTLMAuthenticationGrantHandler)</token>
+									<value>org.wso2.carbon.identity.oauth2.token.handlers.grant.iwa.ntlm.NTLMAuthenticationGrantHandlerWithHandshake</value>
+								</replacement>
+								<replacement>
+									<xpath>/Server/OAuth/OAuthCallbackHandlers</xpath>
+									<token>(org.wso2.carbon.identity.oauth.callback.DefaultCallbackHandler)</token>
+									<value>org.wso2.carbon.apimgt.keymgt.util.APIManagerOAuthCallbackHandler</value>
+								</replacement>
+								<replacement>
+									<xpath>/Server/SSOService/UseAuthenticatedUserDomainCrypto</xpath>
+									<token>(false)</token>
+									<value>true</value>
+								</replacement>
+							</replacements>
+						</configuration>
+					</execution>
+					<!-- Replace Datasource, Scope mpl classes and OAuth callback class in identity.xml -->
+
+					<!-- Replace the Datasource in the thrift-authentication.xml file -->
+					<execution>
+						<id>replace-for-thrift</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>replace</goal>
+						</goals>
+						<configuration>
+							<file>${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/identity/thrift-authentication.xml</file>
+							<replacements>
+								<replacement>
+									<xpath>/Server/JDBCPersistenceManager/DataSource/Name</xpath>
+									<token>(jdbc/WSO2CarbonDB)</token>
+									<value>jdbc/WSO2AM_DB</value>
+								</replacement>
+							</replacements>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- Add the input and output adapter configs to the file -->
+			<plugin>
+				<groupId>com.google.code.maven-config-processor-plugin</groupId>
+				<artifactId>config-processor-maven-plugin</artifactId>
+				<version>2.6</version>
+				<executions>
+					<execution>
+						<id>init-input-adapter-config</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>process</goal>
+						</goals>
+						<configuration>
+							<failOnMissingXpath>false</failOnMissingXpath>
+							<transformations>
+								<transformation>
+									<input>${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/input-event-adapters.xml</input>
+									<output>../../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/input-event-adapters.xm</output>
+									<config>src/core/conf/input-adapter-change.xml</config>
+								</transformation>
+							</transformations>
+						</configuration>
+					</execution>
+					<execution>
+						<id>init-output-adapter-config</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>process</goal>
+						</goals>
+						<configuration>
+							<failOnMissingXpath>false</failOnMissingXpath>
+							<transformations>
+								<transformation>
+									<input>${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/output-event-adapters.xml</input>
+									<output>../../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/output-event-adapters.xml</output>
+									<config>src/core/conf/output-adapter-change.xml</config>
+								</transformation>
+							</transformations>
+						</configuration>
+					</execution>
+					<execution>
+						<id>add-scope-validator</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>process</goal>
+						</goals>
+						<configuration>
+							<failOnMissingXpath>false</failOnMissingXpath>
+							<transformations>
+								<transformation>
+									<input>${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/identity/identity.xml</input>
+									<output>../../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/identity/identity.xml</output>
+									<config>src/core/conf/identity_config_change.xml</config>
+								</transformation>
+							</transformations>
+							<namespaceContexts>
+								<s>http://wso2.org/projects/carbon/carbon.xml</s>
+							</namespaceContexts>
+						</configuration>
+					</execution>
+					<execution>
+						<id>init-claim-manager</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>process</goal>
+						</goals>
+						<configuration>
+							<failOnMissingXpath>false</failOnMissingXpath>
+							<transformations>
+								<transformation>
+									<input>${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/user-mgt.xml</input>
+									<output>../../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/user-mgt.xml</output>
+									<config>src/core/conf/user_mgt_config_change.xml</config>
+								</transformation>
+							</transformations>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+
+					<execution>
+						<!-- Creating Device Management schema -->
+						<id>copy-con</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<echo message="########### Create Device Management H2 Schema ###########" />
+
+								<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
+								<property name="userid" value="wso2carbon" />
+								<property name="password" value="wso2carbon" />
+								<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" />
+
+								<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
+									<classpath refid="maven.dependency.classpath" />
+									<classpath refid="maven.compile.classpath" />
+									<classpath refid="maven.runtime.classpath" />
+
+									<fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/h2.sql" />
+								</sql>
+								<echo message="##################### END ####################" />
+							</tasks>
+						</configuration>
+					</execution>
+
+					<execution>
+						<!-- Creating Device Management schema -->
+						<id>create-device-mgt-schema</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<echo message="########### Create Device Management H2 Schema ###########" />
+
+								<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
+								<property name="userid" value="wso2carbon" />
+								<property name="password" value="wso2carbon" />
+								<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" />
+
+								<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
+									<classpath refid="maven.dependency.classpath" />
+									<classpath refid="maven.compile.classpath" />
+									<classpath refid="maven.runtime.classpath" />
+
+									<fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/h2.sql" />
+								</sql>
+								<echo message="##################### END ####################" />
+							</tasks>
+						</configuration>
+					</execution>
+                    <execution>
+                        <!-- Creating Certificate Management schema -->
+                        <id>create-certificate-mgt-schema</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <echo message="########### Create Certificate Management H2 Schema ###########" />
+
+                                <property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
+                                <property name="userid" value="wso2carbon" />
+                                <property name="password" value="wso2carbon" />
+                                <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" />
+
+                                <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
+                                    <fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/certMgt/h2.sql" />
+                                </sql>
+                                <echo message="##################### END ####################" />
+                            </tasks>
+                        </configuration>
+                    </execution>
+					<execution>
+						<!-- Creating API Management schema -->
+						<id>create-api-mgt-schema</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<echo message="########### Create API Management H2 Schema ###########" />
+
+								<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
+								<property name="userid" value="wso2carbon" />
+								<property name="password" value="wso2carbon" />
+								<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2AM_DB;DB_CLOSE_ON_EXIT=FALSE" />
+
+								<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
+									<classpath refid="maven.dependency.classpath" />
+									<classpath refid="maven.compile.classpath" />
+									<classpath refid="maven.runtime.classpath" />
+
+									<fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/apimgt/h2.sql" />
+								</sql>
+								<echo message="##################### END ####################" />
+							</tasks>
+						</configuration>
+					</execution>
+
+					<execution>
+						<!-- Creating App Management schema -->
+						<id>create-app-mgt-schema</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<echo message="########### Create App Management H2 Schema ###########" />
+
+								<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
+								<property name="userid" value="wso2carbon" />
+								<property name="password" value="wso2carbon" />
+								<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2APPM_DB;DB_CLOSE_ON_EXIT=FALSE" />
+
+								<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
+									<classpath refid="maven.dependency.classpath" />
+									<classpath refid="maven.compile.classpath" />
+									<classpath refid="maven.runtime.classpath" />
+
+									<fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/appmgt/h2.sql" />
+								</sql>
+								<echo message="##################### END ####################" />
+							</tasks>
+						</configuration>
+					</execution>
+
+					<execution>
+                        <!-- Creating JAGH2 schema -->
+                        <id>create-JAGH2-schema</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <echo message="########### Create JAGH2 Schema ###########" />
+
+                                <property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
+                                <property name="userid" value="wso2carbon" />
+                                <property name="password" value="wso2carbon" />
+                                <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/ES_STORAGE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" />
+                                <!--<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" />-->
+
+                                <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
+
+                                    <fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/storage/h2/h2.sql" />
+                                </sql>
+                                <echo message="##################### END ####################" />
+                            </tasks>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <!-- Creating Social DB schema -->
+                        <id>create-social-db-schema</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <echo message="########### Create Social Plugin H2 Schema ###########" />
+
+                                <property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
+                                <property name="userid" value="wso2carbon" />
+                                <property name="password" value="wso2carbon" />
+                                <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2_SOCIAL_DB;DB_CLOSE_ON_EXIT=FALSE" />
+
+                                <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
+                                    <classpath refid="maven.dependency.classpath" />
+                                    <classpath refid="maven.compile.classpath" />
+                                    <classpath refid="maven.runtime.classpath" />
+
+                                    <fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social/h2/resource.sql" />
+                                </sql>
+                                <echo message="##################### END ####################" />
+                            </tasks>
+                        </configuration>
+                    </execution>
+					<execution>
+						<!-- Creating Android Mobile Plugin Management schema -->
+						<id>create-mobile-android-plugin-mgt-schema</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<echo message="########### Create ANDROID Mobile plugin Management H2 Schema ###########" />
+
+								<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
+								<property name="userid" value="wso2carbon" />
+								<property name="password" value="wso2carbon" />
+								<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2MobileAndroid_DB;DB_CLOSE_ON_EXIT=FALSE" />
+
+								<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
+									<classpath refid="maven.dependency.classpath" />
+									<classpath refid="maven.compile.classpath" />
+									<classpath refid="maven.runtime.classpath" />
+
+									<fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/android/h2.sql" />
+								</sql>
+								<echo message="##################### END ####################" />
+							</tasks>
+						</configuration>
+					</execution>
+					<execution>
+						<!-- Creating Windows Mobile Plugin Management schema -->
+						<id>create-mobile-windows-plugin-mgt-schema</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<echo message="########### Create WINDOWS Mobile plugin Management H2 Schema ###########" />
+								<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
+								<property name="userid" value="wso2carbon" />
+								<property name="password" value="wso2carbon" />
+								<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2MobileWindows_DB;DB_CLOSE_ON_EXIT=FALSE" />
+
+								<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
+									<classpath refid="maven.dependency.classpath" />
+									<classpath refid="maven.compile.classpath" />
+									<classpath refid="maven.runtime.classpath" />
+
+									<fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/windows/h2.sql" />
+								</sql>
+								<echo message="##################### END ####################" />
+							</tasks>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>3-extract-docs-from-components</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<property name="tempdir" value="target/docs-temp" />
+								<property name="jardir" value="target/jars" />
+								<!--<property name="shindig.version" value="2.5.0-beta5" />-->
+
+								<mkdir dir="${tempdir}" />
+								<mkdir dir="${tempdir}/${project.artifactId}-${project.version}/wso2/components" />
+								<mkdir dir="${tempdir}/${project.artifactId}-${project.version}/repository/deployment/server" />
+								<mkdir dir="${tempdir}/${project.artifactId}-${project.version}/repository/deployment/server/webapps" />
+								<unzip dest="${tempdir}">
+									<fileset dir="target">
+										<include name="${project.artifactId}-${project.version}.zip" />
+									</fileset>
+								</unzip>
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/wso2/components" overwrite="true">
+									<fileset dir="${tempdir}/${project.artifactId}-${project.version}/wso2/components" />
+								</copy>
+								<!--testing -->
+								<!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}">
+									<patternset>
+										<exclude name="**/shindig.properties" />
+                                        <exclude name="**/shindig.properties" />
+									</patternset>
+								</unzip>
+								<copy file="src/repository/conf/shindig.properties" todir="${jardir}/shindig-common-${shindig.version}" />
+								<delete file="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" />
+								<zip destfile="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" basedir="${jardir}/shindig-common-${shindig.version}" />
+								<delete>
+									<fileset dir="target/shindig/WEB-INF/lib" includes="slf4j*" />
+								</delete>
+								<copy file="src/repository/resources/shindig/index.jsp" todir="target/shindig" />-->
+
+								<delete file="target/${project.artifactId}-${project.version}.zip" />
+								<delete dir="${tempdir}" />
+							</tasks>
+						</configuration>
+					</execution>
+
+					<execution>
+						<id>copy_modules_apps</id>
+						<phase>package</phase>
+						<configuration>
+							<tasks>
+								<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps" />
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+
+
+					<execution>
+						<id>clean_target</id>
+						<phase>install</phase>
+						<configuration>
+							<tasks>
+								<delete dir="target/jars" />
+								<delete dir="target/*.xml" />
+								<delete dir="target/archive-tmp" />
+								<delete dir="target/dependency-maven-plugin-markers" />
+								<delete dir="target/maven-archiver" />
+								<delete dir="target/wso2carbon-core-${carbon.kernel.version}" />
+								<delete dir="target/wso2carbon-core-${carbon.kernel.version}" />
+								<delete file="target/${project.artifactId}-${project.version}.jar" />
+								<delete dir="target/sources" />
+								<delete dir="target/site" />
+								<delete dir="target/antrun" />
+								<delete dir="src/site" />
+								<!--<delete dir="target/shindig" />-->
+								<delete dir="target/jaxwebapps" />
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+					<execution>
+                        <id>modify_entitlement_properties</id>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <tasks>
+            			<replace token="PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP" value="#PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP" dir="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/identity/">
+              			   <include name="entitlement.properties" />
+            			</replace>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+
+
+					<execution>
+						<id>replace-web-xmls-in-war-files</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<property name="tempdir" value="target/webapp-temp" />
+								<property name="xmldir" value="src/core/resources/web-apps/web-xml" />
+								<property name="srcdir" value="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/webapps" />
+
+								<mkdir dir="${tempdir}" />
+								<mkdir dir="${tempdir}/api-application-registration" />
+								<mkdir dir="${tempdir}/api#certificate-mgt#v1.0" />
+								<mkdir dir="${tempdir}/api#identity#entitlement" />
+								<mkdir dir="${tempdir}/api#scep-mgt#v1.0" />
+								<mkdir dir="${tempdir}/authenticationendpoint" />
+								<mkdir dir="${tempdir}/client-registration#v0.11" />
+								<mkdir dir="${tempdir}/oauth2" />
+								<mkdir dir="${tempdir}/secured-websocket" />
+								<mkdir dir="${tempdir}/shindig" />
+
+								<unzip dest="${tempdir}/api-application-registration">
+									<fileset dir="${srcdir}">
+										<include name="api-application-registration.war" />
+									</fileset>
+								</unzip>
+								<unzip dest="${tempdir}/api#certificate-mgt#v1.0">
+									<fileset dir="${srcdir}">
+										<include name="api#certificate-mgt#v1.0.war" />
+									</fileset>
+								</unzip>
+								<unzip dest="${tempdir}/api#identity#entitlement">
+									<fileset dir="${srcdir}">
+										<include name="api#identity#entitlement.war" />
+									</fileset>
+								</unzip>
+								<unzip dest="${tempdir}/api#scep-mgt#v1.0">
+									<fileset dir="${srcdir}">
+										<include name="api#scep-mgt#v1.0.war" />
+									</fileset>
+								</unzip>
+								<unzip dest="${tempdir}/authenticationendpoint">
+									<fileset dir="${srcdir}">
+										<include name="authenticationendpoint.war" />
+									</fileset>
+								</unzip>
+								<unzip dest="${tempdir}/client-registration#v0.11">
+									<fileset dir="${srcdir}">
+										<include name="client-registration#v0.11.war" />
+									</fileset>
+								</unzip>
+								<unzip dest="${tempdir}/oauth2">
+									<fileset dir="${srcdir}">
+										<include name="oauth2.war" />
+									</fileset>
+								</unzip>
+								<unzip dest="${tempdir}/secured-websocket">
+									<fileset dir="${srcdir}">
+										<include name="secured-websocket.war" />
+									</fileset>
+								</unzip>
+								<unzip dest="${tempdir}/shindig">
+									<fileset dir="${srcdir}">
+										<include name="shindig.war" />
+									</fileset>
+								</unzip>
+
+								<delete file="${tempdir}/api-application-registration/WEB-INF/web.xml" />
+								<delete file="${tempdir}/api#certificate-mgt#v1.0/WEB-INF/web.xml" />
+								<delete file="${tempdir}/api#identity#entitlement/WEB-INF/web.xml" />
+								<delete file="${tempdir}/api#scep-mgt#v1.0/WEB-INF/web.xml" />
+								<delete file="${tempdir}/authenticationendpoint/WEB-INF/web.xml" />
+								<delete file="${tempdir}/client-registration#v0.11/WEB-INF/web.xml" />
+								<delete file="${tempdir}/oauth2/WEB-INF/web.xml" />
+								<delete file="${tempdir}/secured-websocket/WEB-INF/web.xml" />
+								<delete file="${tempdir}/shindig/WEB-INF/web.xml" />
+
+								<copy file="src/core/resources/web-apps/web-xml/api-application-registration/web.xml" tofile="${tempdir}/api-application-registration/WEB-INF/web.xml" />
+								<copy file="src/core/resources/web-apps/web-xml/api#certificate-mgt#v1.0/web.xml" tofile="${tempdir}/api#certificate-mgt#v1.0/WEB-INF/web.xml" />
+								<copy file="src/core/resources/web-apps/web-xml/api#identity#entitlement/web.xml" tofile="${tempdir}/api#identity#entitlement/WEB-INF/web.xml" />
+								<copy file="src/core/resources/web-apps/web-xml/api#scep-mgt#v1.0/web.xml" tofile="${tempdir}/api#scep-mgt#v1.0/WEB-INF/web.xml" />
+								<copy file="src/core/resources/web-apps/web-xml/authenticationendpoint/web.xml" tofile="${tempdir}/authenticationendpoint/WEB-INF/web.xml" />
+								<copy file="src/core/resources/web-apps/web-xml/client-registration#v0.11/web.xml" tofile="${tempdir}/client-registration#v0.11/WEB-INF/web.xml" />
+								<copy file="src/core/resources/web-apps/web-xml/oauth2/web.xml" tofile="${tempdir}/oauth2/WEB-INF/web.xml" />
+								<copy file="src/core/resources/web-apps/web-xml/secured-websocket/web.xml" tofile="${tempdir}/secured-websocket/WEB-INF/web.xml" />
+								<copy file="src/core/resources/web-apps/web-xml/shindig/web.xml" tofile="${tempdir}/shindig/WEB-INF/web.xml" />
+
+								<zip destfile="${tempdir}/api-application-registration.war" basedir="${tempdir}/api-application-registration" />
+								<zip destfile="${tempdir}/api#certificate-mgt#v1.0.war" basedir="${tempdir}/api#certificate-mgt#v1.0" />
+								<zip destfile="${tempdir}/api#identity#entitlement.war" basedir="${tempdir}/api#identity#entitlement" />
+								<zip destfile="${tempdir}/api#scep-mgt#v1.0.war" basedir="${tempdir}/api#scep-mgt#v1.0" />
+								<zip destfile="${tempdir}/authenticationendpoint.war" basedir="${tempdir}/authenticationendpoint" />
+								<zip destfile="${tempdir}/client-registration#v0.11.war" basedir="${tempdir}/client-registration#v0.11" />
+								<zip destfile="${tempdir}/oauth2.war" basedir="${tempdir}/oauth2" />
+								<zip destfile="${tempdir}/secured-websocket.war" basedir="${tempdir}/secured-websocket" />
+								<zip destfile="${tempdir}/shindig.war" basedir="${tempdir}/shindig" />
+
+							</tasks>
+						</configuration>
+					</execution>
+
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>1-pre-dist</id>
+						<phase>test</phase>
+						<!--we are creating a temporary carbon distribution for document extracting purposes during the test phase-->
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<appendAssemblyId>false</appendAssemblyId>
+							<encoding>UTF-8</encoding>
+							<filters>
+								<filter>${basedir}/src/assembly/filter.properties</filter>
+							</filters>
+							<descriptors>
+								<descriptor>${basedir}/src/assembly/dist.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+					<execution>
+						<id>2-dist</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<appendAssemblyId>false</appendAssemblyId>
+							<encoding>UTF-8</encoding>
+							<filters>
+								<filter>${basedir}/src/assembly/filter.properties</filter>
+							</filters>
+							<escapeString>\</escapeString>
+							<descriptors>
+								<descriptor>${basedir}/src/assembly/bin.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
--- a/modules/distribution/src/assembly/dist.xml
+++ b/modules/distribution/src/assembly/dist.xml
@ -0,0 +1,39 @@
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~ 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.
+  -->
+<assembly>
+    <id>wso2-iot-dist</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <!-- Copying p2 profile and osgi bundles-->
+        <fileSet>
+            <directory>../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/components</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/components</outputDirectory>
+            <excludes>
+                <exclude>**/eclipse.ini</exclude>
+                <exclude>**/*.lock</exclude>
+                <exclude>**/.data</exclude>
+                <exclude>**/.settings</exclude>
+                <exclude>features/**</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+</assembly>
--- a/modules/distribution/src/assembly/filter.properties
+++ b/modules/distribution/src/assembly/filter.properties
@ -0,0 +1,26 @@
+#
+# Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) 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
+#
+# 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.
+#
+
+product.name=WSO2 IoT Server
+product.key=IoT
+product.version=6.0.0
+
+carbon.version=4.4.14
+ei.version=3.1.0
+default.server.role=IoTServer
+bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator
--- a/modules/distribution/src/core/INSTALL.txt
+++ b/modules/distribution/src/core/INSTALL.txt
@ -0,0 +1,44 @@
+Installing WSO2 IoT Server 3.0.0
+
+Running the server
+-----------------
+1. The directory containing this INSTALL file will be the root and it is treated as the IoTS home directory, and is referred to as <IoT_HOME>.
+
+2. WSO2 IoT Server comes as a composition of three components namely broker, core, and analytics.
+
+3. The starting order of the WSO2 IoTS components should be broker, core, analytics.
+
+4. To start/stop/restart the IoTS components, run wso2server.sh for *nix systems and wso2server.bat for Windows systems, which can be found in following locations.
+ <IoT_HOME>/broker/bin
+ <IoT_HOME>/core/bin
+ <IoT_HOME>/analytics/bin
+
+5. The wso2server.sh and wso2server.bat startup scripts have the following commands:
+
+      i)  ./wso2server.sh {console|start|stop|restart|status|dump|version}
+     ii)  wso2server.bat {start|stop|version}
+
+    Usage: wso2server.sh [command]
+    command:
+    	--debug <port> 	Start the server in remote debugging mode
+    			<port> The remote debugging port
+    	--run		Run the server
+    	--start		Start the server as a Unix daemon in the background
+    	--console	Start the server as a Unix daemon in the foreground
+    	--stop		Stop the server Unix daemon
+    	--status	Get the status of the Carbon Unix daemon
+    	--dump		Print a thread dump of the Carbon Unix daemon
+    	--restart	Restart the Carbon Unix daemon
+    	--version	The version of the Carbon server are you running
+	--n 		Start multiple instances of the same server after you
+			have successfully installed the Multiple-instances feature
+			from a feature repository
+
+System Requirements
+-------------------
+1. Minimum memory - 4GB
+2. The WSO2 IOTS Management Console requires full Javascript enablement in the Web browser
+   NOTE:
+     On Windows Server 2003, it is not allowed to go below the medium security
+     level when using Internet Explorer 6.x.
+
--- a/modules/distribution/src/core/LICENSE.txt
+++ b/modules/distribution/src/core/LICENSE.txt
@ -0,0 +1,787 @@
+
+This product is licensed by WSO2 Inc. under Apache License 2.0. The license
+can be downloaded from the following locations:
+	http://www.apache.org/licenses/LICENSE-2.0.html
+	http://www.apache.org/licenses/LICENSE-2.0.txt
+
+This product also contains software under different licenses. This table below
+all the contained libraries (jar files) and the license under which they are 
+provided to you.
+
+At the bottom of this file is a table that shows what each license indicated
+below is and where the actual text of the license can be found.
+
+Name                                                                            Type           License   
+---------------------------------------------------------------------------------------------------------
+abdera_1.0.0.wso2v3.jar                                                         bundle         apache2   907       
+addressing-1.6.1-wso2v20.mar                                                    bundle         apache2   9597
+ajaxtags_1.3.0.beta-rc7-wso2v1.jar                                              bundle         apache2   905
+annogen_0.1.0.wso2v1.jar                                                        bundle         apache2   942
+ant-contrib-1.0b3.jar                                                           jar            apache2   549
+antlr-runtime_3.2.0.wso2v1.jar                                                  bundle         bsd       817
+antlr_3.2.0.wso2v1.jar                                                          bundle         bsd       838
+ant_1.7.0.wso2v1.jar                                                            bundle         apache2   1012
+aopalliance-1.0.jar                                                             jar            apache2   512
+apache-zookeeper_3.3.4.wso2v1.jar                                               bundle         apache2   4219
+asm-3.3.1.jar                                                                   jar            bsd       1268
+axiom_1.2.11.wso2v11.jar                                                        bundle         apache2   8489
+axis2-json_1.6.1.wso2v20.jar                                                    bundle         apache2   9596
+axis2-transport-mail_1.1.0.wso2v17.jar                                          bundle         apache2   5260
+axis2-transport-tcp_1.1.0.wso2v17.jar                                           bundle         apache2   5257
+axis2_1.6.1.wso2v20.jar                                                         bundle         apache2   9595
+backport-util-concurrent_3.1.0.wso2v1.jar                                       bundle         apache2   1007
+bcpkix-jdk15on-1.52.jar                                                         jarinbundle    bouncy    1343
+bcpkix-jdk15on_1.52.0.wso2v2.jar                                                bundle         bouncy    10221
+bcprov-jdk15on-1.52.jar                                                         jarinbundle    bouncy    1819
+bcprov-jdk15on_1.52.0.wso2v1.jar                                                bundle         bouncy    8485
+bcprov-jdk15-132.jar                                                            jar            bouncy    285
+bsf-all_3.0.0.wso2v5.jar                                                        bundle         apache2   5254
+com.fasterxml.jackson.core.jackson-annotations_2.8.2.jar                        bundle         apache2   2057
+com.fasterxml.jackson.core.jackson-core_2.8.2.jar                               bundle         apache2   2056
+com.fasterxml.jackson.core.jackson-databind_2.8.2.jar                           bundle         apache2   2055
+com.fasterxml.jackson.dataformat.jackson-dataformat-yaml_2.8.2.jar              bundle         apache2   2054
+com.google.gson_2.7.0.jar                                                       bundle         apache2   1853
+com.google.guava_18.0.0.jar                                                     bundle         apache2   1511
+com.google.guava_19.0.0.jar                                                     bundle         apache2   1627
+com.googlecode.plist.dd-plist_1.8.0.jar                                         bundle         mit       913
+com.jayway.jsonpath.json-path_0.9.1.jar                                         bundle         apache2   798
+com.samskivert.jmustache_1.13.0.jar                                             bundle         bsd       2053
+com.sun.jersey.jersey-core_1.9.0.jar                                            bundle         cddl+gpl  1307
+commons-beanutils-1.7.0.jar                                                     jarinbundle    apache2   383
+commons-cli_1.2.0.wso2v1.jar                                                    bundle         apache2   922
+commons-codec_1.4.0.wso2v1.jar                                                  bundle         apache2   980
+commons-collections-3.2.2.jar                                                   bundle         apache2   2042
+commons-collections_3.2.2.wso2v1.jar                                            bundle         apache2   6268
+commons-dbcp_1.4.0.wso2v1.jar                                                   bundle         apache2   962
+commons-digester-1.8.jar                                                        jarinbundle    apache2   384
+commons-fileupload_1.3.2.wso2v1.jar                                             bundle         apache2   9594
+commons-httpclient_3.1.0.wso2v3.jar                                             bundle         apache2   8483
+commons-io_2.4.0.wso2v1.jar                                                     bundle         apache2   4217
+commons-lang-2.6.0.wso2v1.jar                                                   bundle         apache2   664
+commons-lang-2.6.jar                                                            bundle         apache2   506
+commons-lang3_3.4.0.wso2v1.jar                                                  bundle         apache2   8739
+commons-lang_2.6.0.wso2v1.jar                                                   bundle         apache2   940
+commons-logging-1.1.1.jar                                                       jar            apache2   274
+commons-pool_1.5.6.wso2v1.jar                                                   bundle         apache2   1009
+commons-scxml-0.9.jar                                                           jarinbundle    apache2   401
+commons-scxml_0.9.0.wso2v1.jar                                                  bundle         apache2   1070
+compass_2.0.1.wso2v2.jar                                                        bundle         apache2   897
+cors-filter_1.7.0.wso2v1.jar                                                    bundle         apache2   2106
+csrfguard_3.1.0.wso2v2.jar                                                      bundle         bsd       8482
+cxf-bundle-2.7.16.jar                                                           bundle         apache2   1154
+cxf-xjc-boolean-3.0.2.jar                                                       jar            apache2   1153
+cxf-xjc-bug671-3.0.2.jar                                                        jar            apache2   1152
+cxf-xjc-dv-3.0.2.jar                                                            jar            apache2   1151
+cxf-xjc-runtime-3.0.2.jar                                                       bundle         apache2   1150
+cxf-xjc-ts-3.0.2.jar                                                            jar            apache2   1149
+disruptor_3.3.2.wso2v2.jar                                                      bundle         apache2   4377
+ehcache-core-2.5.1.jar                                                          jar            apache2   267
+ehcache_1.5.0.wso2v3.jar                                                        bundle         apache2   852
+encoder_1.2.0.wso2v1.jar                                                        bundle         apache2   4030
+feign-jaxrs-9.3.1.jar                                                           jarinbundle    apache2   2058
+fontbox_1.8.10.wso2v2.jar                                                       bundle         bsd       6702
+gdata-core_1.47.0.wso2v1.jar                                                    bundle         apache2   1481
+geronimo-jaxws_2.2_spec-1.0.jar                                                 bundle         apache2   395
+geronimo-jms_1.1_spec-1.1.0.wso2v1.jar                                          bundle         apache2   661
+geronimo-jta_1.1_spec-1.1.jar                                                   jar            apache2   1066
+geronimo-saaj_1.3_spec_1.0.0.wso2v3.jar                                         bundle         apache2   893
+guava_12.0.0.wso2v1.jar			 					            apache2
+guice_3.0.0.wso2v1.jar                                                          bundle         apache2   1505
+h2-1.3.175.jar                                                                  jarinbundle    epl1      1999
+h2_1.3.175.wso2v1.jar                                                           bundle         apache2   9731
+handy-uri-templates_1.1.7.wso2v1.jar                                            bundle         apache2   1989
+hapi_2.1.0.wso2v1.jar                                                           bundle         mpl10     5251
+hazelcast_3.5.4.wso2v2.jar                                                      bundle         apache2   8481
+hector-core_1.1.4.wso2v1.jar                                                    bundle         apache2   2878
+high-scale-lib_1.0.0.wso2v1.jar                                                 bundle         apache2   4216
+httpasyncclient-4.0-beta3.jar                                                   jar            apache2   280
+httpclient-4.2.5.jar                                                            jar            apache2   548
+httpclient_4.3.1.wso2v2.jar                                                     bundle         apache2   4214
+httpcore-4.2.4.jar                                                              jar            apache2   533
+httpcore-nio-4.2.4.jar                                                          jar            apache2   534
+httpcore-nio_4.3.3.wso2v4.jar                                                   bundle         apache2   8736
+httpcore_4.3.3.wso2v1.jar                                                       bundle         apache2   3638
+httpmime-4.3.6.jar                                                              jarinbundle    apache2   1139
+httpmime_4.3.1.wso2v2.jar                                                       bundle         apache2   4375
+icu4j-3.8.jar                                                                   jarinbundle    icu       321
+io.dropwizard.metrics.core_3.1.2.jar                                            bundle         apache2   1305
+io.dropwizard.metrics.jvm_3.1.2.jar                                             bundle         apache2   1302
+io.github.openfeign.feign-core_9.3.1.jar                                        bundle         apache2   2060
+io.github.openfeign.feign-gson_9.3.1.jar                                        bundle         apache2   2059
+io.netty.buffer_4.0.30.Final.jar                                                bundle         apache2   1544
+io.netty.codec-http_4.0.30.Final.jar                                            bundle         apache2   1543
+io.netty.codec_4.0.30.Final.jar                                                 bundle         apache2   1542
+io.netty.common_4.0.30.Final.jar                                                bundle         apache2   1541
+io.netty.handler_4.0.30.Final.jar                                               bundle         apache2   1540
+io.netty.transport_4.0.30.Final.jar                                             bundle         apache2   1539
+io.swagger.annotations_1.5.10.jar                                               bundle         apache2   2052
+io.swagger.core_1.5.10.jar                                                      bundle         apache2   2051
+io.swagger.models_1.5.10.jar                                                    bundle         apache2   2050
+jackson-annotations_2.6.1.wso2v1.jar                                            bundle         apache2   7757
+jackson-core_2.6.1.wso2v1.jar                                                   bundle         apache2   7756
+jackson-databind_2.6.1.wso2v3.jar                                               bundle         apache2   8735
+javassist-3.12.1.GA.jar                                                         jarinbundle    lgpl2     1768
+javasysmon_0.3.3.wso2v1.jar                                                     bundle         bsd       721
+javax.cache.wso2_4.4.11.jar                                                     bundle         apache2   2045
+javax.servlet.jsp-api_2.2.1.jar                                                 bundle         cddl+gpl  1301
+javax.validation.api_1.1.0.Final.jar                                            bundle         apache2   1840
+javax.ws.rs-api-2.0-m10.jar                                                     bundle         cddl+gpl  263
+javax.ws.rs-api-2.0.1.jar                                                       jarinbundle    cddl+gpl  1452
+jaxb-impl-2.2.6.jar                                                             jarinbundle    cddl+gpl  1823
+jaxb-impl-2.2.6.jar                                                             jar            cddl1     1148
+jaxb-xjc-2.2.6.jar                                                              jarinbundle    cddl+gpl  1822
+jaxb-xjc-2.2.6.jar                                                              jar            cddl1     1147
+jdbc-pool_7.0.34.wso2v2.jar                                                     bundle         apache2   3637
+jdom_1.0.0.wso2v1.jar                                                           bundle         apache2   693
+jericho-html-2.4.jar                                                            jarinbundle    epl1      363
+jersey-client-1.12.jar                                                          jarinbundle    cddl+gpl  1821
+jettison-1.3.4.jar                                                              bundle         apache2   542
+jettison_1.3.4.wso2v1.jar                                                       bundle         apache2   2162
+joda-time_2.8.2.wso2v1.jar                                                      bundle         apache2   6879
+jscep_2.3.0.wso2v2.jar                                                          bundle         mit       10220
+json-schema-validator-all_2.2.6.wso2v2.jar                                      bundle         apache2   10931
+json-simple_1.1.0.wso2v1.jar                                                    bundle         apache2   828
+json_3.0.0.wso2v1.jar                                                           bundle         apache2   6503
+jsoup-1.8.1.jar                                                                 jarinbundle    mit       1138
+jsr311-api-1.1.1.jar                                                            jarinbundle    cddl1     553
+jstl_1.2.1.wso2v2.jar                                                           bundle         cddl1     2204
+js_1.7.0.R4wso2v1.jar                                                           bundle         mpl10     2199
+kaptcha_2.3.0.wso2v1.jar                                                        bundle         apache2   854
+kryo_2.24.0.wso2v1.jar                                                          bundle         bsd       4692
+libphonenumber_7.4.2.wso2v1.jar                                                 bundle         apache2   8733
+libthrift_0.8.0.wso2v1.jar                                                      bundle         apache2   1117
+libthrift_0.9.2.wso2v1.jar                                                      bundle         apache2   5912
+localizer-1.0.jar                                                               jarinbundle    apache2   551
+lucene_5.2.1.wso2v1.jar                                                         bundle         apache2   4502
+maven-scm_1.7.0.wso2v2.jar                                                      bundle         apache2   1331
+neethi-3.0.3.jar                                                                bundle         apache2   1146
+neethi_2.0.4.wso2v5.jar                                                         bundle         apache2   6267
+nekohtml-1.9.10.jar                                                             jarinbundle    apache2   1576
+net.minidev.json-smart_1.3.0.jar                                                bundle         apache2   1337
+nimbus-jose-jwt_2.26.1.wso2v3.jar                                               bundle         apache2   4885
+noggit_0.6.0.wso2v1.jar                                                         bundle         apache2   4211
+objenesis_2.1.0.wso2v1.jar                                                      bundle         mit       4688
+oltu_1.0.0.wso2v3.jar                                                           bundle         apache2   6502
+opencsv-1.8.jar                                                                 jarinbundle    apache2   368
+opencsv_1.8.0.wso2v1.jar                                                        bundle         apache2   928
+openid4java_1.0.0.wso2v2.jar                                                    bundle         apache2   6216
+opensaml_2.6.4.wso2v3.jar                                                       bundle         apache2   8480
+openxri-client-1.2.0.jar                                                        jarinbundle    apache2   433
+openxri-syntax-1.2.0.jar                                                        jarinbundle    apache2   434
+org.apache.aries.blueprint_1.1.0.jar                                            bundle         apache2   1346
+org.apache.aries.proxy_1.0.1.jar                                                bundle         apache2   1345
+org.apache.aries.util_1.1.0.jar                                                 bundle         apache2   1344
+org.apache.felix.gogo.command_0.10.0.v201209301215.jar                          bundle         apache2   1134
+org.apache.felix.gogo.runtime_0.10.0.v201209301036.jar                          bundle         apache2   1133
+org.apache.felix.gogo.shell_0.10.0.v201212101605.jar                            bundle         apache2   1132
+org.apache.velocity_1.7.0.jar                                                   bundle         apache2   1839
+org.eclipse.core.contenttype_3.4.200.v20130326-1255.jar                         bundle         epl1      1131
+org.eclipse.core.expressions_3.4.500.v20130515-1343.jar                         bundle         epl1      1130
+org.eclipse.core.jobs_3.5.300.v20130429-1813.jar                                bundle         epl1      1129
+org.eclipse.core.runtime_3.9.0.v20130326-1255.jar                               bundle         epl1      1128
+org.eclipse.ecf.filetransfer_5.0.0.v20130604-1622.jar                           bundle         epl1      1127
+org.eclipse.ecf.identity_3.2.0.v20130604-1622.jar                               bundle         epl1      1126
+org.eclipse.ecf.provider.filetransfer.httpclient_4.0.200.v20120319-0616.jar     bundle         epl1      289
+org.eclipse.ecf.provider.filetransfer_3.2.0.v20130604-1622.jar                  bundle         epl1      1125
+org.eclipse.ecf_3.2.0.v20130604-1622.jar                                        bundle         epl1      1124
+org.eclipse.equinox.app_1.3.100.v20130327-1442.jar                              bundle         epl1      1123
+org.eclipse.equinox.common_3.6.200.v20130402-1505.jar                           bundle         epl1      1122
+org.eclipse.equinox.concurrent_1.1.0.v20130327-1442.jar                         bundle         epl1      1121
+org.eclipse.equinox.console_1.0.100.v20130429-0953.jar                          bundle         epl1      1120
+org.eclipse.equinox.ds_1.4.101.v20130813-1853.jar                               bundle         epl1      1119
+org.eclipse.equinox.frameworkadmin.equinox_1.0.500.v20130327-2119.jar           bundle         epl1      1118
+org.eclipse.equinox.frameworkadmin_2.0.100.v20130327-2119.jar                   bundle         epl1      1117
+org.eclipse.equinox.http.helper_1.1.0.wso2v1.jar                                bundle         epl1      839
+org.eclipse.equinox.http.servlet_1.1.400.v20130418-1354.jar                     bundle         epl1      1116
+org.eclipse.equinox.jsp.jasper_1.0.400.v20120522-2049.jar                       bundle         epl1      388
+org.eclipse.equinox.launcher_1.3.0.v20130327-1440.jar                           bundle         epl1      1115
+org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110519.jar                bundle         epl1      337
+org.eclipse.equinox.p2.console_1.0.300.v20130327-2119.jar                       bundle         epl1      1114
+org.eclipse.equinox.p2.core_2.3.0.v20130327-2119.jar                            bundle         epl1      1113
+org.eclipse.equinox.p2.director.app_1.0.300.v20130819-1621.jar                  bundle         epl1      1112
+org.eclipse.equinox.p2.directorywatcher_1.0.300.v20130327-2119.jar              bundle         epl1      1110
+org.eclipse.equinox.p2.director_2.3.0.v20130526-0335.jar                        bundle         epl1      1111
+org.eclipse.equinox.p2.engine_2.3.0.v20130526-2122-wso2v1.jar                   bundle         epl1      3873
+org.eclipse.equinox.p2.extensionlocation_1.2.100.v20130327-2119.jar             bundle         epl1      1109
+org.eclipse.equinox.p2.garbagecollector_1.0.200.v20130327-2119.jar              bundle         epl1      1108
+org.eclipse.equinox.p2.jarprocessor_1.0.300.v20130327-2119.jar                  bundle         epl1      1107
+org.eclipse.equinox.p2.metadata.repository_1.2.100.v20130327-2119.jar           bundle         epl1      1106
+org.eclipse.equinox.p2.metadata_2.2.0.v20130523-1557.jar                        bundle         epl1      1105
+org.eclipse.equinox.p2.publisher_1.2.0.v20110511.jar                            bundle         epl1      306
+org.eclipse.equinox.p2.repository.tools_2.1.0.v20130327-2119.jar                bundle         epl1      1104
+org.eclipse.equinox.p2.repository_2.3.0.v20130412-2032.jar                      bundle         epl1      1103
+org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110511-wso2v1.jar            bundle         epl1      703
+org.eclipse.equinox.p2.touchpoint.natives_1.1.100.v20130327-2119.jar            bundle         epl1      1102
+org.eclipse.equinox.p2.transport.ecf_1.0.100.v20110902-0807.jar                 bundle         epl1      369
+org.eclipse.equinox.p2.updatechecker_1.1.200.v20130327-2119.jar                 bundle         epl1      1101
+org.eclipse.equinox.p2.updatesite_1.0.400.v20130515-2028.jar                    bundle         epl1      1100
+org.eclipse.equinox.preferences_3.5.100.v20130422-1538.jar                      bundle         epl1      1099
+org.eclipse.equinox.registry_3.5.301.v20130717-1549.jar                         bundle         epl1      1098
+org.eclipse.equinox.security_1.2.0.v20130424-1801.jar                           bundle         epl1      1097
+org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20130327-2119.jar     bundle         epl1      1096
+org.eclipse.equinox.simpleconfigurator_1.0.400.v20130327-2119.jar               bundle         epl1      1095
+org.eclipse.equinox.util_1.0.500.v20130404-1337.jar                             bundle         epl1      1094
+org.eclipse.jdt.core.compiler.batch_3.10.2.v20150120-1634.jar                   bundle         epl1      1141
+org.eclipse.osgi.services_3.3.100.v20130513-1956.jar                            bundle         epl1      1093
+org.eclipse.osgi_3.9.1.v20130814-1242.jar                                       bundle         epl1      1092
+org.eclipse.paho.client.mqttv3_1.0.2.jar                                        bundle         epl1      1769
+org.eclipse.wst.jsdt.debug.rhino.debugger_1.0.300.v201109150503.jar             bundle         epl1      558
+org.eclipse.wst.jsdt.debug.transport_1.0.100.v201109150330.jar                  bundle         epl1      557
+org.jaggeryjs.hostobjects.db_0.12.8.jar                                         bundle         apache2   1998
+org.jaggeryjs.hostobjects.feed_0.12.8.jar                                       bundle         apache2   1997
+org.jaggeryjs.hostobjects.file_0.12.8.jar                                       bundle         apache2   1996
+org.jaggeryjs.hostobjects.jaggeryparser_0.12.8.jar                              bundle         apache2   1995
+org.jaggeryjs.hostobjects.log_0.12.8.jar                                        bundle         apache2   1994
+org.jaggeryjs.hostobjects.registry_0.12.8.jar                                   bundle         apache2   1993
+org.jaggeryjs.hostobjects.stream_0.12.8.jar                                     bundle         apache2   1992
+org.jaggeryjs.hostobjects.uri_0.12.8.jar                                        bundle         apache2   1991
+org.jaggeryjs.hostobjects.web_0.12.8.jar                                        bundle         apache2   1990
+org.jaggeryjs.hostobjects.xhr_0.12.8.jar                                        bundle         apache2   1989
+org.jaggeryjs.hostobjects.xslt_0.12.8.jar                                       bundle         apache2   1988
+org.jaggeryjs.jaggery.app.mgt.stub_0.12.8.jar                                   bundle         apache2   1987
+org.jaggeryjs.jaggery.app.mgt.ui_0.12.8.jar                                     bundle         apache2   1986
+org.jaggeryjs.jaggery.app.mgt_0.12.8.jar                                        bundle         apache2   1985
+org.jaggeryjs.jaggery.core_0.12.8.jar                                           bundle         apache2   1984
+org.jaggeryjs.jaggery.deployer_0.12.8.jar                                       bundle         apache2   1983
+org.jaggeryjs.jaggery.tools_0.12.8.jar                                          bundle         apache2   1982
+org.jaggeryjs.modules.process_1.5.5.jar                                         bundle         apache2   1953
+org.jaggeryjs.modules.sso_1.5.5.jar                                             bundle         apache2   1952
+org.jaggeryjs.modules.uuid_1.5.5.jar                                            bundle         apache2   1951
+org.jaggeryjs.modules.ws_1.5.5.jar                                              bundle         apache2   1981
+org.jaggeryjs.scriptengine_0.12.8.jar                                           bundle         apache2   1980
+org.restlet_2.3.0.wso2v1.jar                                                    bundle         apache2   4501
+org.sat4j.core_2.3.5.v201308161310.jar                                          bundle         epl1+lgpl21091
+org.sat4j.pb_2.3.5.v201308161310.jar                                            bundle         epl1+lgpl21090
+org.wso2.balana_1.1.2.jar                                                       bundle         apache2   10593
+org.wso2.caching_4.0.3.jar                                                      bundle         apache2   2919
+org.wso2.carbon.addressing_4.4.11.jar                                           bundle         apache2   10386
+org.wso2.carbon.analytics.api_1.3.3.jar                                         bundle         apache2   10830
+org.wso2.carbon.analytics.dataservice.commons_1.3.3.jar                         bundle         apache2   10828
+org.wso2.carbon.analytics.datasource.commons_1.3.3.jar                          bundle         apache2   10825
+org.wso2.carbon.analytics.io.commons_1.3.3.jar                                  bundle         apache2   10819
+org.wso2.carbon.apimgt.annotations_2.0.8.jar                                    bundle         apache2   11056
+org.wso2.carbon.apimgt.api_6.1.35.jar                                           bundle         apache2   11055
+org.wso2.carbon.apimgt.application.extension_2.0.8.jar                          bundle         apache2   11054
+org.wso2.carbon.apimgt.authenticator.oidc.stub_6.1.35.jar                       bundle         apache2   11053
+org.wso2.carbon.apimgt.authenticator.oidc.ui_6.1.35.jar                         bundle         apache2   11052
+org.wso2.carbon.apimgt.authenticator.oidc_6.1.35.jar                            bundle         apache2   11051
+org.wso2.carbon.apimgt.core_6.1.35.jar                                          bundle         apache2   11050
+org.wso2.carbon.apimgt.gateway.stub_6.1.35.jar                                  bundle         apache2   11049
+org.wso2.carbon.apimgt.gateway_6.1.35.jar                                       bundle         apache2   11048
+org.wso2.carbon.apimgt.handlers.security.stub_6.1.35.jar                        bundle         apache2   11047
+org.wso2.carbon.apimgt.handlers_2.0.8.jar                                       bundle         apache2   11046
+org.wso2.carbon.apimgt.hostobjects.oidc_6.1.35.jar                              bundle         apache2   11045
+org.wso2.carbon.apimgt.hostobjects_6.1.35.jar                                   bundle         apache2   11044
+org.wso2.carbon.apimgt.impl_6.1.35.jar                                          bundle         apache2   11043
+org.wso2.carbon.apimgt.keymgt.client_6.1.35.jar                                 bundle         apache2   11042
+org.wso2.carbon.apimgt.keymgt.stub_6.1.35.jar                                   bundle         apache2   11041
+org.wso2.carbon.apimgt.keymgt_6.1.35.jar                                        bundle         apache2   11040
+org.wso2.carbon.apimgt.registry.cache.stub_6.1.35.jar                           bundle         apache2   11039
+org.wso2.carbon.apimgt.statsupdate.stub_6.1.35.jar                              bundle         apache2   11038
+org.wso2.carbon.apimgt.tier.cache.stub_6.1.35.jar                               bundle         apache2   11037
+org.wso2.carbon.apimgt.usage.client_6.1.35.jar                                  bundle         apache2   11036
+org.wso2.carbon.apimgt.usage.publisher_6.1.35.jar                               bundle         apache2   11035
+org.wso2.carbon.apimgt.webapp.publisher_2.0.8.jar                               bundle         apache2   11034
+org.wso2.carbon.application.deployer.synapse_4.6.9.jar                          bundle         apache2   10902
+org.wso2.carbon.application.deployer.webapp_4.7.2.jar                           bundle         apache2   11033
+org.wso2.carbon.application.deployer_4.4.11.jar                                 bundle         apache2   10385
+org.wso2.carbon.application.mgt.stub_4.5.4.jar                                  bundle         apache2   8688
+org.wso2.carbon.application.mgt.synapse_4.6.9.jar                               bundle         apache2   10901
+org.wso2.carbon.application.mgt.ui_4.5.4.jar                                    bundle         apache2   8686
+org.wso2.carbon.application.mgt_4.5.4.jar                                       bundle         apache2   8685
+org.wso2.carbon.application.upload_4.5.4.jar                                    bundle         apache2   8684
+org.wso2.carbon.appmgt.api_1.2.10.jar                                           bundle         apache2   11032
+org.wso2.carbon.appmgt.core_1.2.10.jar                                          bundle         apache2   11031
+org.wso2.carbon.appmgt.gateway.stub_1.2.10.jar                                  bundle         apache2   11030
+org.wso2.carbon.appmgt.hostobjects_1.2.10.jar                                   bundle         apache2   11029
+org.wso2.carbon.appmgt.impl_1.2.10.jar                                          bundle         apache2   11028
+org.wso2.carbon.appmgt.mdm.osgiconnector_3.0.7.jar                              bundle         apache2   11027
+org.wso2.carbon.appmgt.mdm.restconnector_1.2.10.jar                             bundle         apache2   11026
+org.wso2.carbon.appmgt.mdm.wso2emm_1.1.4.jar                                    bundle         apache2   8176
+org.wso2.carbon.appmgt.mobile_1.2.10.jar                                        bundle         apache2   11025
+org.wso2.carbon.appmgt.publisher_1.2.10.jar                                     bundle         apache2   11024
+org.wso2.carbon.appmgt.sample.deployer_1.2.10.jar                               bundle         apache2   11023
+org.wso2.carbon.appmgt.usage.client_1.2.10.jar                                  bundle         apache2   11022
+org.wso2.carbon.appmgt.usage.publisher_1.2.10.jar                               bundle         apache2   11021
+org.wso2.carbon.authenticator.proxy_4.4.11.jar                                  bundle         apache2   10384
+org.wso2.carbon.authenticator.stub_4.4.11.jar                                   bundle         apache2   10383
+org.wso2.carbon.bam.presentation.stub_4.2.0.jar                                 bundle         apache2   2165
+org.wso2.carbon.base_4.4.11.jar                                                 bundle         apache2   10382
+org.wso2.carbon.bootstrap-4.4.11.jar                                            bundle         apache2   10337
+org.wso2.carbon.captcha.mgt_4.2.0.jar                                           bundle         apache2   2154
+org.wso2.carbon.certificate.mgt.core_2.0.8.jar                                  bundle         apache2   11020
+org.wso2.carbon.claim.mgt.stub_5.7.5.jar                                        bundle         apache2   10773
+org.wso2.carbon.claim.mgt.ui_5.7.5.jar                                          bundle         apache2   10772
+org.wso2.carbon.claim.mgt_5.7.5.jar                                             bundle         apache2   10771
+org.wso2.carbon.cluster.mgt.core_4.4.11.jar                                     bundle         apache2   10381
+org.wso2.carbon.connector.core_4.6.9.jar                                        bundle         apache2   10900
+org.wso2.carbon.core.bootup.validator_4.4.11.jar                                bundle         apache2   10380
+org.wso2.carbon.core.commons.stub_4.4.11.jar                                    bundle         apache2   10378
+org.wso2.carbon.core.common_4.4.11.jar                                          bundle         apache2   10379
+org.wso2.carbon.core.services_4.4.11.jar                                        bundle         apache2   10377
+org.wso2.carbon.core_4.4.11.jar                                                 bundle         apache2   10376
+org.wso2.carbon.cxf.ext-4.7.2.jar                                               bundle         apache2   10222
+org.wso2.carbon.dashboard.deployment_2.0.5.jar                                  bundle         apache2   11019
+org.wso2.carbon.dashboard.store.filter_2.0.5.jar                                bundle         apache2   11018
+org.wso2.carbon.databridge.agent_5.1.5.jar                                      bundle         apache2   11017
+org.wso2.carbon.databridge.commons.binary_5.1.5.jar                             bundle         apache2   11016
+org.wso2.carbon.databridge.commons.thrift_5.1.5.jar                             bundle         apache2   11015
+org.wso2.carbon.databridge.commons_5.1.5.jar                                    bundle         apache2   11014
+org.wso2.carbon.databridge.core_5.1.5.jar                                       bundle         apache2   11013
+org.wso2.carbon.databridge.streamdefn.filesystem_5.1.5.jar                      bundle         apache2   11012
+org.wso2.carbon.deployment.synchronizer.subversion_4.5.4.jar                    bundle         apache2   8451
+org.wso2.carbon.deployment.synchronizer_4.5.4.jar                               bundle         apache2   8450
+org.wso2.carbon.device.mgt.analytics.dashboard_2.0.8.jar                        bundle         apache2   11011
+org.wso2.carbon.device.mgt.analytics.data.publisher_2.0.8.jar                   bundle         apache2   11010
+org.wso2.carbon.device.mgt.common_2.0.8.jar                                     bundle         apache2   11009
+org.wso2.carbon.device.mgt.core_2.0.8.jar                                       bundle         apache2   11008
+org.wso2.carbon.device.mgt.extensions.device.type.deployer_2.0.8.jar            bundle         apache2   11007
+org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt_2.0.8.jar bundle         apache2   11006
+org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp_2.0.8.jar bundle         apache2   11005
+org.wso2.carbon.device.mgt.extensions_2.0.8.jar                                 bundle         apache2   11004
+org.wso2.carbon.device.mgt.input.adapter.extension_3.0.7.jar                    bundle         apache2   11003
+org.wso2.carbon.device.mgt.input.adapter.http_3.0.7.jar                         bundle         apache2   11002
+org.wso2.carbon.device.mgt.input.adapter.mqtt_3.0.7.jar                         bundle         apache2   11001
+org.wso2.carbon.device.mgt.input.adapter.xmpp_3.0.7.jar                         bundle         apache2   11000
+org.wso2.carbon.device.mgt.oauth.extensions_2.0.8.jar                           bundle         apache2   10999
+org.wso2.carbon.device.mgt.output.adapter.mqtt_3.0.7.jar                        bundle         apache2   10998
+org.wso2.carbon.device.mgt.output.adapter.websocket_3.0.7.jar                   bundle         apache2   10997
+org.wso2.carbon.device.mgt.output.adapter.xmpp_3.0.7.jar                        bundle         apache2   10996
+org.wso2.carbon.device.mgt.url.printer_2.0.10.jar                                bundle         apache2   10995
+org.wso2.carbon.directory.server.manager.common_5.7.5.jar                       bundle         apache2   10770
+org.wso2.carbon.directory.server.manager.stub_5.7.5.jar                         bundle         apache2   10769
+org.wso2.carbon.directory.server.manager.ui_5.7.5.jar                           bundle         apache2   10768
+org.wso2.carbon.directory.server.manager_5.7.5.jar                              bundle         apache2   10767
+org.wso2.carbon.discovery.cxf_4.7.2.jar                                         bundle         apache2   10308
+org.wso2.carbon.dynamic.client.registration_2.0.10.jar                           bundle         apache2   10994
+org.wso2.carbon.dynamic.client.web.app.registration_2.0.10.jar                   bundle         apache2   10993
+org.wso2.carbon.email.sender.core_2.0.10.jar                                     bundle         apache2   10992
+org.wso2.carbon.email.verification.stub_4.5.4.jar                               bundle         apache2   8678
+org.wso2.carbon.email.verification.ui_4.5.4.jar                                 bundle         apache2   8677
+org.wso2.carbon.email.verification_4.5.4.jar                                    bundle         apache2   8676
+org.wso2.carbon.endpoint.stub_4.6.9.jar                                         bundle         apache2   10991
+org.wso2.carbon.endpoint_4.6.9.jar                                              bundle         apache2   10899
+org.wso2.carbon.event.admin_4.5.4.jar                                           bundle         apache2   8444
+org.wso2.carbon.event.application.deployer_5.1.5.jar                            bundle         apache2   10990
+org.wso2.carbon.event.client.stub_4.5.4.jar                                     bundle         apache2   8442
+org.wso2.carbon.event.client_4.5.4.jar                                          bundle         apache2   8441
+org.wso2.carbon.event.common_4.5.4.jar                                          bundle         apache2   8440
+org.wso2.carbon.event.core_4.5.4.jar                                            bundle         apache2   8439
+org.wso2.carbon.event.input.adapter.core_5.1.5.jar                              bundle         apache2   10989
+org.wso2.carbon.event.output.adapter.core_5.1.5.jar                             bundle         apache2   10988
+org.wso2.carbon.event.processor.stub_2.1.6.jar                                  bundle         apache2   10648
+org.wso2.carbon.event.stream.admin_5.1.5.jar                                    bundle         apache2   10987
+org.wso2.carbon.event.stream.core_5.1.5.jar                                     bundle         apache2   10986
+org.wso2.carbon.event.stream.persistence.stub_5.1.5.jar                         bundle         apache2   10985
+org.wso2.carbon.event.stream.stub_5.1.5.jar                                     bundle         apache2   10984
+org.wso2.carbon.event.stream.ui_5.1.5.jar                                       bundle         apache2   10983
+org.wso2.carbon.event.template.manager.stub_5.1.7.jar                           bundle         apache2   10625
+org.wso2.carbon.event.ws_4.5.4.jar                                              bundle         apache2   8417
+org.wso2.carbon.feature.mgt.core_4.4.11.jar                                     bundle         apache2   10375
+org.wso2.carbon.feature.mgt.services_4.4.11.jar                                 bundle         apache2   10374
+org.wso2.carbon.feature.mgt.stub_4.4.11.jar                                     bundle         apache2   10373
+org.wso2.carbon.feature.mgt.ui_4.4.11.jar                                       bundle         apache2   10372
+org.wso2.carbon.forum_6.1.35.jar                                                bundle         apache2   10982
+org.wso2.carbon.framework.exporter_4.4.11.jar                                   bundle         apache2   10371
+org.wso2.carbon.ganalytics.publisher_4.5.4.jar                                  bundle         apache2   8630
+org.wso2.carbon.governance.api_4.7.0.jar                                        bundle         apache2   9505
+org.wso2.carbon.governance.client_4.7.0.jar                                     bundle         apache2   9504
+org.wso2.carbon.governance.common_4.7.0.jar                                     bundle         apache2   9503
+org.wso2.carbon.governance.custom.lifecycles.checklist.stub_4.7.0.jar           bundle         apache2   9502
+org.wso2.carbon.governance.custom.lifecycles.checklist.ui_4.7.0.jar             bundle         apache2   9501
+org.wso2.carbon.governance.custom.lifecycles.checklist_4.7.0.jar                bundle         apache2   9500
+org.wso2.carbon.governance.custom.lifecycles.history.ui_4.7.0.jar               bundle         apache2   9499
+org.wso2.carbon.governance.generic.stub_4.7.0.jar                               bundle         apache2   9498
+org.wso2.carbon.governance.generic.ui_4.7.0.jar                                 bundle         apache2   9497
+org.wso2.carbon.governance.generic_4.7.0.jar                                    bundle         apache2   9496
+org.wso2.carbon.governance.lcm.stub_4.7.0.jar                                   bundle         apache2   9495
+org.wso2.carbon.governance.lcm.ui_4.7.0.jar                                     bundle         apache2   9494
+org.wso2.carbon.governance.lcm_4.7.0.jar                                        bundle         apache2   9493
+org.wso2.carbon.governance.list_4.7.0.jar                                       bundle         apache2   9492
+org.wso2.carbon.governance.registry.eventing_4.7.0.jar                          bundle         apache2   9491
+org.wso2.carbon.governance.registry.extensions_4.7.0.jar                        bundle         apache2   9490
+org.wso2.carbon.governance.wsdltool.stub_4.7.0.jar                              bundle         apache2   9486
+org.wso2.carbon.governance.wsdltool.ui_4.7.0.jar                                bundle         apache2   9485
+org.wso2.carbon.governance.wsdltool_4.7.0.jar                                   bundle         apache2   9484
+org.wso2.carbon.hostobjects.sso_4.5.4.jar                                       bundle         apache2   10161
+org.wso2.carbon.hostobjects.sso_6.1.35.jar                                      bundle         apache2   10981
+org.wso2.carbon.i18n_4.4.11.jar                                                 bundle         apache2   10370
+org.wso2.carbon.identity.application.authentication.endpoint.util_5.7.5.jar     bundle         apache2   10766
+org.wso2.carbon.identity.application.authentication.framework_5.7.5.jar         bundle         apache2   10765
+org.wso2.carbon.identity.application.authenticator.basicauth_5.2.4.jar          bundle         apache2   10980
+org.wso2.carbon.identity.application.authenticator.requestpath.oauth_5.1.1.jar  bundle         apache2   8394
+org.wso2.carbon.identity.application.authenticator.samlsso_5.1.4.jar            bundle         apache2   10979
+org.wso2.carbon.identity.application.common_5.7.5.jar                           bundle         apache2   10764
+org.wso2.carbon.identity.application.mgt.stub_5.7.5.jar                         bundle         apache2   10763
+org.wso2.carbon.identity.application.mgt.ui_5.7.5.jar                           bundle         apache2   10762
+org.wso2.carbon.identity.application.mgt_5.7.5.jar                              bundle         apache2   10761
+org.wso2.carbon.identity.authentication_4.5.4.jar                               bundle         apache2   8609
+org.wso2.carbon.identity.authenticator.backend.oauth_2.0.10.jar                  bundle         apache2   10978
+org.wso2.carbon.identity.authenticator.saml2.sso.common_5.1.6.jar               bundle         apache2   10977
+org.wso2.carbon.identity.authenticator.saml2.sso.stub_5.1.6.jar                 bundle         apache2   10976
+org.wso2.carbon.identity.authenticator.saml2.sso.ui_5.1.6.jar                   bundle         apache2   10975
+org.wso2.carbon.identity.authenticator.saml2.sso_5.1.6.jar                      bundle         apache2   10974
+org.wso2.carbon.identity.authenticator.thrift_5.7.5.jar                         bundle         apache2   10760
+org.wso2.carbon.identity.base_5.6.89.jar                                        bundle         apache2   10973
+org.wso2.carbon.identity.base_5.7.5.jar                                         bundle         apache2   10759
+org.wso2.carbon.identity.claim.metadata.mgt.stub_5.7.5.jar                      bundle         apache2   10758
+org.wso2.carbon.identity.claim.metadata.mgt.ui_5.7.5.jar                        bundle         apache2   10757
+org.wso2.carbon.identity.claim.metadata.mgt_5.7.5.jar                           bundle         apache2   10756
+org.wso2.carbon.identity.core.ui_5.7.5.jar                                      bundle         apache2   10755
+org.wso2.carbon.identity.core_5.7.5.jar                                         bundle         apache2   10754
+org.wso2.carbon.identity.discovery_5.3.4.jar                                    bundle         apache2   10946
+org.wso2.carbon.identity.entitlement.common_5.7.5.jar                           bundle         apache2   10752
+org.wso2.carbon.identity.entitlement.proxy_5.1.3.jar                            bundle         apache2   10972
+org.wso2.carbon.identity.entitlement.stub_5.6.89.jar                            bundle         apache2   10971
+org.wso2.carbon.identity.entitlement_5.7.5.jar                                  bundle         apache2   10749
+org.wso2.carbon.identity.governance.stub_5.7.5.jar                              bundle         apache2   10747
+org.wso2.carbon.identity.inbound.metadata.saml2_0.1.1.jar                       bundle         apache2   10970
+org.wso2.carbon.identity.jwt.client.extension_2.0.10.jar                         bundle         apache2   10969
+org.wso2.carbon.identity.notification.mgt_5.7.5.jar                             bundle         apache2   10742
+org.wso2.carbon.identity.oauth.common_5.3.4.jar                                 bundle         apache2   10944
+org.wso2.carbon.identity.oauth.dcr_5.3.4.jar                                    bundle         apache2   10943
+org.wso2.carbon.identity.oauth.stub_5.3.1.jar                                   bundle         apache2   10505
+org.wso2.carbon.identity.oauth.stub_5.3.4.jar                                   bundle         apache2   10942
+org.wso2.carbon.identity.oauth.ui_5.3.4.jar                                     bundle         apache2   10941
+org.wso2.carbon.identity.oauth2.grant.jwt_1.0.2.jar                             bundle         apache2   8152
+org.wso2.carbon.identity.oauth_5.3.4.jar                                        bundle         apache2   10940
+org.wso2.carbon.identity.oidc.dcr_5.3.4.jar                                     bundle         apache2   10939
+org.wso2.carbon.identity.oidc.session_5.3.4.jar                                 bundle         apache2   10938
+org.wso2.carbon.identity.provider_5.1.1.jar                                     bundle         apache2   8360
+org.wso2.carbon.identity.query.saml_5.3.0.jar                                   bundle         apache2   10496
+org.wso2.carbon.identity.sp.metadata.saml2_0.1.6.jar                            bundle         apache2   10968
+org.wso2.carbon.identity.sp.metadata.saml2_1.0.0.jar                            bundle         apache2   10491
+org.wso2.carbon.identity.sso.agent_5.1.0.jar                                    bundle         apache2   8353
+org.wso2.carbon.identity.sso.saml.stub_5.1.3.jar                                bundle         apache2   10490
+org.wso2.carbon.identity.sso.saml.stub_5.3.0.jar                                bundle         apache2   10489
+org.wso2.carbon.identity.sso.saml.ui_5.3.0.jar                                  bundle         apache2   10488
+org.wso2.carbon.identity.sso.saml_5.3.0.jar                                     bundle         apache2   10487
+org.wso2.carbon.identity.user.profile.stub_5.7.5.jar                            bundle         apache2   10732
+org.wso2.carbon.identity.user.profile.ui_5.7.5.jar                              bundle         apache2   10731
+org.wso2.carbon.identity.user.profile_5.7.5.jar                                 bundle         apache2   10730
+org.wso2.carbon.identity.user.registration.stub_5.6.89.jar                      bundle         apache2   10967
+org.wso2.carbon.identity.user.registration.stub_5.7.5.jar                       bundle         apache2   10729
+org.wso2.carbon.identity.user.registration_5.7.5.jar                            bundle         apache2   10728
+org.wso2.carbon.identity.user.store.configuration.deployer_5.7.5.jar            bundle         apache2   10727
+org.wso2.carbon.identity.user.store.configuration.stub_5.7.5.jar                bundle         apache2   10726
+org.wso2.carbon.identity.user.store.configuration.ui_5.7.5.jar                  bundle         apache2   10725
+org.wso2.carbon.identity.user.store.configuration_5.7.5.jar                     bundle         apache2   10724
+org.wso2.carbon.identity.user.store.count.stub_5.7.5.jar                        bundle         apache2   10723
+org.wso2.carbon.identity.user.store.count_5.7.5.jar                             bundle         apache2   10722
+org.wso2.carbon.identity.webfinger_5.3.4.jar                                    bundle         apache2   10932
+org.wso2.carbon.idp.mgt.stub_5.7.5.jar                                          bundle         apache2   10713
+org.wso2.carbon.idp.mgt.ui_5.7.5.jar                                            bundle         apache2   10712
+org.wso2.carbon.idp.mgt_5.7.5.jar                                               bundle         apache2   10711
+org.wso2.carbon.inbound.endpoint.osgi_4.6.9.jar                                 bundle         apache2   10893
+org.wso2.carbon.inbound.endpoint.persistence_4.6.9.jar                          bundle         apache2   10892
+org.wso2.carbon.inbound.endpoint_4.6.9.jar                                      bundle         apache2   10891
+org.wso2.carbon.inbound.stub_4.6.9.jar                                          bundle         apache2   10966
+org.wso2.carbon.inbound_4.6.9.jar                                               bundle         apache2   10890
+org.wso2.carbon.localentry.stub_4.6.9.jar                                       bundle         apache2   10965
+org.wso2.carbon.localentry_4.6.9.jar                                            bundle         apache2   10889
+org.wso2.carbon.logging-4.4.11.jar                                              bundle         apache2   10339
+org.wso2.carbon.logging.admin.stub_4.5.4.jar                                    bundle         apache2   8313
+org.wso2.carbon.logging.admin.ui_4.5.4.jar                                      bundle         apache2   8312
+org.wso2.carbon.logging.service_4.5.4.jar                                       bundle         apache2   8311
+org.wso2.carbon.logging.view.stub_4.5.4.jar                                     bundle         apache2   8310
+org.wso2.carbon.logging.view.ui_4.5.4.jar                                       bundle         apache2   8309
+org.wso2.carbon.logging_4.4.11.jar                                              bundle         apache2   10369
+org.wso2.carbon.mashup.javascript.hostobjects.registry_4.7.0.jar                bundle         apache2   9483
+org.wso2.carbon.mashup.utils_4.2.0.jar                                          bundle         apache2   2216
+org.wso2.carbon.mediation.artifactuploader.stub_4.6.9.jar                       bundle         apache2   10964
+org.wso2.carbon.mediation.artifactuploader_4.6.9.jar                            bundle         apache2   10888
+org.wso2.carbon.mediation.configadmin.stub_4.6.9.jar                            bundle         apache2   10887
+org.wso2.carbon.mediation.configadmin.ui_4.6.9.jar                              bundle         apache2   10886
+org.wso2.carbon.mediation.configadmin_4.6.9.jar                                 bundle         apache2   10885
+org.wso2.carbon.mediation.dependency.mgt_4.6.9.jar                              bundle         apache2   10884
+org.wso2.carbon.mediation.initializer.ui_4.6.9.jar                              bundle         apache2   10883
+org.wso2.carbon.mediation.initializer_4.6.9.jar                                 bundle         apache2   10882
+org.wso2.carbon.mediation.library.stub_4.6.9.jar                                bundle         apache2   10963
+org.wso2.carbon.mediation.library_4.6.9.jar                                     bundle         apache2   10881
+org.wso2.carbon.mediation.message.processor_4.6.9.jar                           bundle         apache2   10880
+org.wso2.carbon.mediation.ntaskadmin_4.6.9.jar                                  bundle         apache2   10878
+org.wso2.carbon.mediation.ntask_4.6.9.jar                                       bundle         apache2   10879
+org.wso2.carbon.mediation.registry_4.6.9.jar                                    bundle         apache2   10877
+org.wso2.carbon.mediation.security.stub_4.6.1.jar                               bundle         apache2   8589
+org.wso2.carbon.mediation.security.stub_4.6.9.jar                               bundle         apache2   10876
+org.wso2.carbon.mediation.security_4.6.9.jar                                    bundle         apache2   10875
+org.wso2.carbon.mediation.startup_4.6.9.jar                                     bundle         apache2   10874
+org.wso2.carbon.mediation.templates.common_4.6.9.jar                            bundle         apache2   10873
+org.wso2.carbon.mediation.templates.service_4.6.9.jar                           bundle         apache2   10872
+org.wso2.carbon.mediation.templates.stub_4.6.9.jar                              bundle         apache2   10962
+org.wso2.carbon.mediation.templates_4.6.9.jar                                   bundle         apache2   10871
+org.wso2.carbon.mediation.transport.handlers_4.6.9.jar                          bundle         apache2   10870
+org.wso2.carbon.mediator.cache.ui_4.6.9.jar                                     bundle         apache2   10961
+org.wso2.carbon.mediator.cache_4.6.9.jar                                        bundle         apache2   10869
+org.wso2.carbon.mediator.clazz.services_4.6.9.jar                               bundle         apache2   10868
+org.wso2.carbon.mediator.command.services_4.6.9.jar                             bundle         apache2   10867
+org.wso2.carbon.mediator.event_4.6.9.jar                                        bundle         apache2   10866
+org.wso2.carbon.mediator.fastXSLT_4.6.9.jar                                     bundle         apache2   10865
+org.wso2.carbon.mediator.router.impl_4.6.9.jar                                  bundle         apache2   10862
+org.wso2.carbon.mediator.service_4.6.9.jar                                      bundle         apache2   10861
+org.wso2.carbon.message.processor.stub_4.6.9.jar                                bundle         apache2   10960
+org.wso2.carbon.message.processor_4.6.9.jar                                     bundle         apache2   10860
+org.wso2.carbon.message.store.stub_4.6.9.jar                                    bundle         apache2   10959
+org.wso2.carbon.message.store_4.6.9.jar                                         bundle         apache2   10859
+org.wso2.carbon.messageflows.stub_4.5.4.jar                                     bundle         apache2   8574
+org.wso2.carbon.messageflows.ui_4.5.4.jar                                       bundle         apache2   8573
+org.wso2.carbon.messageflows_4.5.4.jar                                          bundle         apache2   8572
+org.wso2.carbon.metrics.common_1.2.2.jar                                        bundle         apache2   8818
+org.wso2.carbon.metrics.das.reporter_1.2.2.jar                                  bundle         apache2   8817
+org.wso2.carbon.metrics.data.common_1.2.2.jar                                   bundle         apache2   8816
+org.wso2.carbon.metrics.data.service.stub_1.2.2.jar                             bundle         apache2   8815
+org.wso2.carbon.metrics.data.service_1.2.2.jar                                  bundle         apache2   8814
+org.wso2.carbon.metrics.impl_1.2.2.jar                                          bundle         apache2   8813
+org.wso2.carbon.metrics.jdbc.reporter_1.2.2.jar                                 bundle         apache2   8812
+org.wso2.carbon.metrics.manager_1.2.2.jar                                       bundle         apache2   8811
+org.wso2.carbon.metrics.view.ui_1.2.2.jar                                       bundle         apache2   8810
+org.wso2.carbon.module.mgt.stub_4.7.2.jar                                       bundle         apache2   10282
+org.wso2.carbon.module.mgt.ui_4.7.2.jar                                         bundle         apache2   10281
+org.wso2.carbon.module.mgt_4.7.2.jar                                            bundle         apache2   10280
+org.wso2.carbon.ndatasource.capp.deployer_4.5.4.jar                             bundle         apache2   8772
+org.wso2.carbon.ndatasource.common_4.4.11.jar                                   bundle         apache2   10368
+org.wso2.carbon.ndatasource.core_4.4.11.jar                                     bundle         apache2   10367
+org.wso2.carbon.ndatasource.datasources_4.5.4.jar                               bundle         apache2   8571
+org.wso2.carbon.ndatasource.rdbms_4.4.11.jar                                    bundle         apache2   10366
+org.wso2.carbon.ndatasource.stub_4.5.4.jar                                      bundle         apache2   8570
+org.wso2.carbon.ndatasource.ui_4.5.4.jar                                        bundle         apache2   8569
+org.wso2.carbon.ntask.common_4.5.4.jar                                          bundle         apache2   8568
+org.wso2.carbon.ntask.core_4.5.4.jar                                            bundle         apache2   8567
+org.wso2.carbon.ntask.solutions_4.5.4.jar                                       bundle         apache2   8566
+org.wso2.carbon.operation.mgt_4.7.2.jar                                         bundle         apache2   10279
+org.wso2.carbon.osgi.security_4.4.11.jar                                        bundle         apache2   10365
+org.wso2.carbon.policy.decision.point_2.0.10.jar                                 bundle         apache2   10958
+org.wso2.carbon.policy.information.point_2.0.10.jar                              bundle         apache2   10957
+org.wso2.carbon.policy.mgt.common_2.0.10.jar                                     bundle         apache2   10956
+org.wso2.carbon.policy.mgt.core_2.0.10.jar                                       bundle         apache2   10955
+org.wso2.carbon.priority.executors.stub_4.6.9.jar                               bundle         apache2   10954
+org.wso2.carbon.priority.executors_4.6.9.jar                                    bundle         apache2   10858
+org.wso2.carbon.proxyadmin.common_4.6.9.jar                                     bundle         apache2   10857
+org.wso2.carbon.proxyadmin.stub_4.6.9.jar                                       bundle         apache2   10953
+org.wso2.carbon.proxyadmin_4.6.9.jar                                            bundle         apache2   10856
+org.wso2.carbon.qpid.stub_4.5.4.jar                                             bundle         apache2   8298
+org.wso2.carbon.queuing_4.4.11.jar                                              bundle         apache2   10364
+org.wso2.carbon.registry.admin.api_4.6.0.jar                                    bundle         apache2   8904
+org.wso2.carbon.registry.api_4.4.11.jar                                         bundle         apache2   10363
+org.wso2.carbon.registry.common.ui_4.6.0.jar                                    bundle         apache2   8903
+org.wso2.carbon.registry.common_4.6.0.jar                                       bundle         apache2   8902
+org.wso2.carbon.registry.core_4.4.11.jar                                        bundle         apache2   10362
+org.wso2.carbon.registry.event.core_4.6.0.jar                                   bundle         apache2   8901
+org.wso2.carbon.registry.event.ws_4.6.0.jar                                     bundle         apache2   8900
+org.wso2.carbon.registry.eventing_4.6.0.jar                                     bundle         apache2   8899
+org.wso2.carbon.registry.extensions.stub_4.6.0.jar                              bundle         apache2   8898
+org.wso2.carbon.registry.extensions.ui_4.6.0.jar                                bundle         apache2   8897
+org.wso2.carbon.registry.extensions_4.6.0.jar                                   bundle         apache2   8896
+org.wso2.carbon.registry.indexing_4.6.0.jar                                     bundle         apache2   8895
+org.wso2.carbon.registry.info.stub_4.6.0.jar                                    bundle         apache2   8894
+org.wso2.carbon.registry.info.ui_4.6.0.jar                                      bundle         apache2   8893
+org.wso2.carbon.registry.info_4.6.0.jar                                         bundle         apache2   8892
+org.wso2.carbon.registry.properties.stub_4.6.0.jar                              bundle         apache2   8891
+org.wso2.carbon.registry.properties.ui_4.6.0.jar                                bundle         apache2   8890
+org.wso2.carbon.registry.properties_4.6.0.jar                                   bundle         apache2   8889
+org.wso2.carbon.registry.relations.stub_4.6.0.jar                               bundle         apache2   8888
+org.wso2.carbon.registry.relations.ui_4.6.0.jar                                 bundle         apache2   8887
+org.wso2.carbon.registry.relations_4.6.0.jar                                    bundle         apache2   8886
+org.wso2.carbon.registry.resource.stub_4.6.0.jar                                bundle         apache2   8885
+org.wso2.carbon.registry.resource.ui_4.6.0.jar                                  bundle         apache2   8884
+org.wso2.carbon.registry.resource_4.6.0.jar                                     bundle         apache2   8883
+org.wso2.carbon.registry.search.stub_4.6.0.jar                                  bundle         apache2   8882
+org.wso2.carbon.registry.search.ui_4.6.0.jar                                    bundle         apache2   8881
+org.wso2.carbon.registry.search_4.6.0.jar                                       bundle         apache2   8880
+org.wso2.carbon.registry.server_4.4.11.jar                                      bundle         apache2   10361
+org.wso2.carbon.registry.servlet_4.6.0.jar                                      bundle         apache2   8879
+org.wso2.carbon.registry.task_4.6.0.jar                                         bundle         apache2   8878
+org.wso2.carbon.registry.ws.api_4.6.0.jar                                       bundle         apache2   8877
+org.wso2.carbon.registry.ws.client_4.6.0.jar                                    bundle         apache2   8876
+org.wso2.carbon.registry.ws.stub_4.6.0.jar                                      bundle         apache2   8875
+org.wso2.carbon.relay.mediators.builder_4.6.9.jar                               bundle         apache2   10855
+org.wso2.carbon.relay.module_4.6.9.jar                                          bundle         apache2   10854
+org.wso2.carbon.relay_4.6.9.jar                                                 bundle         apache2   10853
+org.wso2.carbon.remote-tasks.stub_4.5.4.jar                                     bundle         apache2   8529
+org.wso2.carbon.rest.api.stub_4.6.9.jar                                         bundle         apache2   10852
+org.wso2.carbon.rest.api_4.6.9.jar                                              bundle         apache2   10851
+org.wso2.carbon.roles.mgt.stub_4.4.11.jar                                       bundle         apache2   10360
+org.wso2.carbon.roles.mgt.ui_4.4.11.jar                                         bundle         apache2   10359
+org.wso2.carbon.roles.mgt_4.4.11.jar                                            bundle         apache2   10358
+org.wso2.carbon.securevault_4.4.11.jar                                          bundle         apache2   10357
+org.wso2.carbon.security.mgt.stub_5.7.5.jar                                     bundle         apache2   10708
+org.wso2.carbon.security.mgt.ui_5.7.5.jar                                       bundle         apache2   10707
+org.wso2.carbon.security.mgt_5.7.5.jar                                          bundle         apache2   10706
+org.wso2.carbon.sequences.common_4.6.9.jar                                      bundle         apache2   10850
+org.wso2.carbon.sequences.stub_4.6.0.jar                                        bundle         apache2   10102
+org.wso2.carbon.sequences.stub_4.6.9.jar                                        bundle         apache2   10849
+org.wso2.carbon.sequences_4.6.9.jar                                             bundle         apache2   10848
+org.wso2.carbon.server-4.4.11.jar                                               bundle         apache2   10338
+org.wso2.carbon.server.admin.common_4.4.11.jar                                  bundle         apache2   10356
+org.wso2.carbon.server.admin.stub_4.4.11.jar                                    bundle         apache2   10355
+org.wso2.carbon.server.admin.ui_4.4.11.jar                                      bundle         apache2   10354
+org.wso2.carbon.server.admin_4.4.11.jar                                         bundle         apache2   10353
+org.wso2.carbon.service.mgt_4.7.2.jar                                           bundle         apache2   10245
+org.wso2.carbon.social.core_1.4.4.jar                                           bundle         apache2   10098
+org.wso2.carbon.social.db.adapter_1.4.4.jar                                     bundle         apache2   10097
+org.wso2.carbon.social.sql_1.4.4.jar                                            bundle         apache2   10096
+org.wso2.carbon.statistics.stub_4.5.4.jar                                       bundle         apache2   8264
+org.wso2.carbon.statistics.ui_4.5.4.jar                                         bundle         apache2   8263
+org.wso2.carbon.statistics_4.5.4.jar                                            bundle         apache2   8262
+org.wso2.carbon.store.jaggery-scxml-executors_1.4.4.jar                         bundle         apache2   10095
+org.wso2.carbon.task.services_4.6.9.jar                                         bundle         apache2   10847
+org.wso2.carbon.task.stub_4.6.9.jar                                             bundle         apache2   10952
+org.wso2.carbon.task_4.6.9.jar                                                  bundle         apache2   10846
+org.wso2.carbon.tenant.common.stub_4.5.4.jar                                    bundle         apache2   8258
+org.wso2.carbon.tenant.common_4.5.4.jar                                         bundle         apache2   8257
+org.wso2.carbon.tenant.deployment_4.6.1.jar                                     bundle         apache2   10243
+org.wso2.carbon.tenant.dispatcher_4.6.1.jar                                     bundle         apache2   10242
+org.wso2.carbon.tenant.keystore.mgt_4.6.1.jar                                   bundle         apache2   10241
+org.wso2.carbon.tenant.mgt.core_4.6.1.jar                                       bundle         apache2   10240
+org.wso2.carbon.tenant.mgt.stub_4.6.1.jar                                       bundle         apache2   10239
+org.wso2.carbon.tenant.mgt.ui_4.6.1.jar                                         bundle         apache2   10238
+org.wso2.carbon.tenant.mgt_4.6.1.jar                                            bundle         apache2   10237
+org.wso2.carbon.tenant.redirector.servlet.stub_4.6.1.jar                        bundle         apache2   10236
+org.wso2.carbon.tenant.redirector.servlet.ui_4.6.1.jar                          bundle         apache2   10235
+org.wso2.carbon.tenant.redirector.servlet_4.6.1.jar                             bundle         apache2   10234
+org.wso2.carbon.tenant.sso.redirector.ui_4.6.1.jar                              bundle         apache2   10233
+org.wso2.carbon.tenant.theme.mgt_4.6.1.jar                                      bundle         apache2   10232
+org.wso2.carbon.tenant.throttling.agent_4.6.1.jar                               bundle         apache2   10231
+org.wso2.carbon.tenant.usage.agent_4.6.1.jar                                    bundle         apache2   10230
+org.wso2.carbon.throttling.agent.stub_4.5.4.jar                                 bundle         apache2   8505
+org.wso2.carbon.tomcat.ext_4.4.11.jar                                           bundle         apache2   10351
+org.wso2.carbon.tomcat.patch_4.7.2.jar                                          bundle         apache2   10229
+org.wso2.carbon.tomcat_4.4.11.jar                                               bundle         apache2   10350
+org.wso2.carbon.ui.menu.general_4.4.11.jar                                      bundle         apache2   10349
+org.wso2.carbon.ui.menu.governance_4.4.7.jar                                    bundle         apache2   8504
+org.wso2.carbon.ui.menu.registry_4.4.7.jar                                      bundle         apache2   8503
+org.wso2.carbon.ui_4.4.11.jar                                                   bundle         apache2   10348
+org.wso2.carbon.um.ws.api.stub_5.1.4.jar                                        bundle         apache2   10421
+org.wso2.carbon.um.ws.api_5.1.4.jar                                             bundle         apache2   10420
+org.wso2.carbon.um.ws.service_5.1.4.jar                                         bundle         apache2   10419
+org.wso2.carbon.user.api_4.4.11.jar                                             bundle         apache2   10347
+org.wso2.carbon.user.core_4.4.11.jar                                            bundle         apache2   10346
+org.wso2.carbon.user.mgt.common_5.7.5.jar                                       bundle         apache2   10705
+org.wso2.carbon.user.mgt.stub_5.7.5.jar                                         bundle         apache2   10704
+org.wso2.carbon.user.mgt.ui_5.7.5.jar                                           bundle         apache2   10703
+org.wso2.carbon.user.mgt.workflow.stub_5.7.5.jar                                bundle         apache2   10702
+org.wso2.carbon.user.mgt_5.7.5.jar                                              bundle         apache2   10701
+org.wso2.carbon.utils_4.4.11.jar                                                bundle         apache2   10345
+org.wso2.carbon.webapp.authenticator.framework_2.0.10.jar                        bundle         apache2   10951
+org.wso2.carbon.webapp.deployer_4.7.2.jar                                       bundle         apache2   10227
+org.wso2.carbon.webapp.list.ui_4.7.2.jar                                        bundle         apache2   10226
+org.wso2.carbon.webapp.mgt.stub_4.2.0.jar                                       bundle         apache2   2083
+org.wso2.carbon.webapp.mgt.stub_4.7.2.jar                                       bundle         apache2   10225
+org.wso2.carbon.webapp.mgt.ui_4.7.2.jar                                         bundle         apache2   10224
+org.wso2.carbon.webapp.mgt_4.7.2.jar                                            bundle         apache2   10223
+org.wso2.ciphertool-1.0.0-wso2v3.jar                                            bundle         apache2   4038
+org.wso2.iot.core.admin.styles_3.0.0.RC.jar                                     bundle         apache2   10950
+org.wso2.securevault_1.0.0.wso2v2.jar                                           bundle         apache2   768
+org.wso2.store.admin.styles_1.4.4.jar                                           bundle         apache2   10090
+org.wso2.store.sso.common_1.4.4.jar                                             bundle         apache2   10089
+org.yaml.snakeyaml_1.17.0.jar                                                   bundle         apache2   2027
+patch.jar                                                                       jarinbundle    epl1      1137
+pdepublishing-ant.jar                                                           jar            epl1      524
+pdepublishing.jar                                                               jar            epl1      525
+pdfbox_1.8.10.wso2v2.jar                                                        bundle         apache2   6514
+perf4j_0.9.12.wso2v1.jar                                                        bundle         apache2   832
+poi-ooxml_3.14.0.wso2v1.jar                                                     bundle         apache2   8218
+poi-scratchpad_3.14.0.wso2v1.jar                                                bundle         apache2   8217
+poi_3.14.0.wso2v1.jar                                                           bundle         apache2   8216
+quartz_2.1.1.wso2v1.jar                                                         bundle         apache2   975
+rampart-core_1.6.1.wso2v24.jar                                                  bundle         apache2   10409
+rampart-policy_1.6.1.wso2v24.jar                                                bundle         apache2   10408
+rampart-trust_1.6.1.wso2v24.jar                                                 bundle         apache2   10407
+rome_0.9.0.wso2v1.jar                                                           bundle         apache2   930
+saxon.bps_9.0.0.x-wso2v1.jar                                                    bundle         mpl11     985
+saxon_8.9.0.wso2v2.jar                                                          bundle         mpl10     2091
+scannotation_1.0.3.wso2v1.jar                                                   bundle         apache2   7869
+slf4j.api_1.6.1.jar                                                             bundle         mit       354
+slf4j.api_1.7.13.jar                                                            bundle         mit       1606
+slf4j.api_1.7.21.jar                                                            bundle         mit       1852
+slf4j.log4j12_1.6.1.jar                                                         bundle         mit       346
+slf4j.log4j12_1.7.13.jar                                                        bundle         mit       1605
+slf4j.log4j12_1.7.21.jar                                                        bundle         mit       1851
+slf4j_1.5.10.wso2v1.jar                                                         bundle         mit       1429
+smackx_3.0.4.wso2v1.jar                                                         bundle         apache2   1871
+smack_3.0.4.wso2v1.jar                                                          bundle         apache2   1493
+snakeyaml_1.16.0.wso2v1.jar                                                     bundle         apache2   6274
+solr_5.2.1.wso2v1.jar                                                           bundle         apache2   4384
+spatial4j_0.4.1.wso2v1.jar                                                      bundle         apache2   4045
+spring-aop-3.0.7.RELEASE.jar                                                    bundle         apache2   279
+spring-asm-3.0.7.RELEASE.jar                                                    bundle         apache2   261
+spring-beans-3.0.7.RELEASE.jar                                                  bundle         apache2   275
+spring-context-3.0.7.RELEASE.jar                                                bundle         apache2   273
+spring-core-3.0.7.RELEASE.jar                                                   bundle         apache2   270
+spring-expression-3.0.7.RELEASE.jar                                             bundle         apache2   272
+spring-web-3.0.7.RELEASE.jar                                                    bundle         apache2   268
+spring.framework_3.2.9.wso2v1.jar                                               bundle         apache2   4044
+stax2-api-3.1.4.jar                                                             bundle         bsd       1089
+step2-common-1.0.0-wso2v2.jar                                                   bundle         apache2   2909
+step2-consumer-1.0.0-wso2v2.jar                                                 bundle         apache2   2908
+step2_1.0.0.wso2v2.jar                                                          bundle         apache2   2907
+svn-client-adapter_1.10.9.wso2v1.jar                                            bundle         apache2   4043
+swagger-codegen_2.2.0.wso2v2.jar                                                bundle         apache2   10843
+synapse-commons_2.1.7.wso2v9.jar                                                bundle         apache2   10842
+synapse-core_2.1.7.wso2v9.jar                                                   bundle         apache2   10841
+synapse-extensions_2.1.7.wso2v9.jar                                             bundle         apache2   10840
+synapse-nhttp-transport_2.1.7.wso2v9.jar                                        bundle         apache2   10839
+synapse-samples_2.1.7.wso2v9.jar                                                bundle         apache2   10838
+synapse-tasks_2.1.7.wso2v9.jar                                                  bundle         apache2   10837
+tcpmon-1.0.jar                                                                  jar            bsd       255
+tiles-jsp_2.0.5.wso2v1.jar                                                      bundle         apache2   989
+tomcat-annotations-api-7.0.73.jar                                               jar            apache2   2044
+tomcat-catalina-ha_7.0.73.wso2v1.jar                                            bundle         apache2   10344
+tomcat-el-api_7.0.73.wso2v1.jar                                                 bundle         apache2   10343
+tomcat-jsp-api_7.0.73.wso2v1.jar                                                bundle         apache2   10342
+tomcat-juli-7.0.73.jar                                                          jar            apache2   2043
+tomcat-servlet-api_7.0.73.wso2v1.jar                                            bundle         apache2   10341
+tomcat_7.0.73.wso2v1.jar                                                        bundle         apache2   10340
+uddi4j-1.0.1.jar                                                                jarinbundle    ibmpl     406
+velocity-1.7.jar                                                                bundle         apache2   509
+velocity_1.7.0.wso2v1.jar                                                       bundle         apache2   10082
+wadl-core_1.1.6.wso2v1.jar                                                      bundle         apache2   8492
+waffle-jna_1.6.0.wso2v5.jar                                                     bundle         epl1      8207
+woden_1.0.0.M9-wso2v1.jar                                                       bundle         apache2   3755
+woodstox-core-asl-4.4.1.jar                                                     bundle         apache2   1087
+wsdl-validator_1.2.0.wso2v1.jar                                                 bundle         epl1      1175
+wsdl4j-1.6.3.jar                                                                jar            cpl1      276
+wsdl4j_1.6.2.wso2v4.jar                                                         bundle         apache2   745
+wso2-uri-templates_1.6.5.jar                                                    bundle         apache2   1073
+wss4j_1.5.11.wso2v16.jar                                                        bundle         apache2   10406
+xalan-2.7.2.wso2v2.jar                                                          bundle         apache2   8202
+xercesImpl-2.8.1.wso2v2.jar                                                     bundle         apache2   663
+xml-apis-1.4.01.jar                                                             jar            apache2   1793
+xml-resolver-1.2.jar                                                            jar            apache2   278
+xmlbeans-2.3.0.jar                                                              jarinbundle    apache2   344
+xmlschema-core-2.1.0.jar                                                        bundle         apache2   1145
+XmlSchema_1.4.7.wso2v3.jar                                                      bundle         apache2   3585
+xmlsec-1.5.8.jar                                                                bundle         apache2   1144
+
+
+
+The license types used by the above libraries and their information is given below:
+
+apache2        Apache License Version 2.0
+               http://www.apache.org/licenses/LICENSE-2.0.html
+ibmpl          IBM Public License 1.0
+               http://www.ibm.com/developerworks/library/os-ipl.html
+cddl1          Common Development and Distribution License
+               http://www.opensource.org/licenses/cddl1.php
+cddl+gpl       CDDL + GPLv2
+               https://glassfish.dev.java.net/public/CDDL+GPL.html
+bouncy         Bouncy Castle License
+               http://www.bouncycastle.org/licence.html
+bsd            Berkeley License
+               http://www.opensource.org/licenses/bsd-license.php
+mit            MIT License
+               http://www.opensource.org/licenses/mit-license.php
+lgpl2          Lesser GPL v2.1
+               http://www.opensource.org/licenses/lgpl-2.1.php
+icu            ICU License
+               http://source.icu-project.org/repos/icu/icu/trunk/license.html
+mpl10          Mozilla Public License 1.0
+               http://www.mozilla.org/MPL/
+cpl1           Common Public License
+               http://opensource.org/licenses/cpl1.0.php
+epl1+lgpl2     EPL1 + LGPL2
+               http://www.eclipse.org/legal/epl-v10.html + http://www.gnu.org/licenses/licenses.html
+mpl11          Mozilla Public License 1.0
+               http://www.mozilla.org/MPL/MPL-1.1.html
+epl1           Eclipse Public License
+               http://www.eclipse.org/legal/epl-v10.html
--- a/modules/distribution/src/core/README.txt
+++ b/modules/distribution/src/core/README.txt
@ -0,0 +1,167 @@
+WSO2 IoT Server
+----------------------
+Welcome to the WSO2 IoT Server (IoTS) 3.0.0 release.
+=======
+
+Key Features
+------------
+Self-service device enrollment and management with an end-user IoTS console.
+
+
+Installation & Running
+----------------------
+1. Extract the downloaded ZIP file.
+2. Follow the INSTALL.txt file for install instructions.
+3. After the server starts, point your Web browser to https://localhost:9443/devicemgt in order to see the available device types and operations
+4. Navigate to https://localhost:9443/api-store to see the available device APIs. You can subscribe to these APIs with the default application (or by creating a new application).
+   In the API Store, go to my subscriptions and locate the client ID and secret, which can be used to invoke these APIs.
+
+System Requirements
+-------------------
+
+1. Minimum memory - 4GB
+2. The portal app requires full Javascript enablement on the Web browser
+
+
+WSO2 IoT Server (IoTS) Binary Distribution Directory Structure
+-----------------------------------------------------
+  IoT_HOME
+    .
+    ├── core              //core component
+	├── analytics         //Analytics component
+	├── broker            //Message Broker component
+	├── samples           //sample device types e.g., connectedcup
+	├── plugins           //pre-built device types
+
+The IoTS Core, Analytics, and Broker have similar directory structures. For example Core has the following structure:
+  IoT_HOME/core
+        .
+        ├── bin              //executables
+        ├── dbscripts        //DBScripts
+        ├── INSTALL.txt
+        ├── lib
+        ├── LICENSE.txt
+        ├── modules          //Jaggery Modules
+        ├── README.txt
+        ├── release-notes.html
+        ├── repository       // repository
+        ├── tmp
+        ├── webapp-mode
+
+
+    - bin
+      Contains various scripts (i.e., .sh & .bat scripts).
+
+    - dbscripts
+      Contains the database creation & seed data population SQL scripts for
+      various supported databases.
+
+    - lib
+      Contains the basic set of libraries required to startup WSO2 IoT Server
+      in standalone mode
+
+    - repository
+      The repository where Carbon artifacts & Axis2 services and
+      modules deployed in WSO2 Carbon, and other custom deployers such as
+      dataservices and axis1services are stored.
+
+        - carbonapps
+          Carbon Application hot deployment directory.
+
+      - components
+          Contains all OSGi related libraries and configurations.
+
+        - conf
+          Contains server configuration files. e.g., axis2.xml, carbon.xml
+
+        - data
+          Contains internal LDAP related data.
+
+        - database
+          Contains the WSO2 Registry & User Manager database.
+
+        - deployment
+          Contains server side and client side Axis2 repositories.
+          All deployment artifacts should go into this directory.
+
+        - logs
+          Contains all log files created during execution.
+
+        - resources
+          Contains additional resources that may be required.
+
+  - tenants
+    This directory will contain relevant tenant artifacts
+    in the case of a multi-tenant deployment.
+
+    - tmp
+      Used for storing temporary files, and is pointed to by the
+      java.io.tmpdir system property.
+
+    - webapp-mode
+      You have the option of running WSO2 Carbon in the webapp mode (hosted as a web-app in an application server). This directory contains files required to run Carbon in the webapp mode.
+
+    - LICENSE.txt
+      Apache License 2.0 under which WSO2 Carbon is distributed.
+
+    - README.txt
+      This document.
+
+    - INSTALL.txt
+      This document contains information on installing WSO2 IoT Server.
+
+    - release-notes.html
+      Release information for WSO2 IoT Server 3.0.0
+
+Secure sensitive information in Carbon configuration files
+----------------------------------------------------------
+
+There is sensitive information such as passwords in the Carbon configuration.
+You can secure them by using secure vault. Please go through the following steps to
+secure them with the default mode.
+
+1. Configure secure vault with the default configurations by running the ciphertool
+  script from the bin directory.
+
+> ciphertool.sh -Dconfigure   (in UNIX)
+
+This script automates the following configurations that you would normally need to do manually.
+
+(i) Replaces sensitive elements in configuration files that have been defined in
+     cipher-tool.properties, with alias token values.
+(ii) Encrypts the plain text password which is defined in the cipher-text.properties file.
+(iii) Updates the secret-conf.properties file with the default keystore and callback class.
+
+cipher-tool.properties, cipher-text.properties and secret-conf.properties files
+      can be found in the <IoT_HOME>/repository/conf/security directory.
+
+2. Start the server by running the wso2server script, which is in the <IoT_HOME>/bin directory.
+
+> wso2server.sh   (in UNIX)
+
+When running the default mode, it asks you to enter the master password
+(By default, the master password is the password of the Carbon keystore and private key)
+
+3. Change any password by running the ciphertool script, which is in the <IoT_HOME>/bin directory.
+
+> ciphertool -Dchange  (in UNIX)
+
+For more information, see
+https://docs.wso2.com/display/ADMIN44x/Carbon+Secure+Vault+Implementation
+
+Training
+--------
+
+WSO2 Inc. offers a variety of professional Training Programs for WSO2 products.
+For additional support on training information please goto http://wso2.com/training/
+
+
+Support
+-------
+
+We are committed to ensuring that your enterprise middleware deployment is completely supported from evaluation to production. Our unique approach ensures that all support leverages our open development methodology and is provided by the very same engineers who build the technology.
+
+For additional support information please refer to http://wso2.com/support/
+
+---------------------------------------------------------------------------
+(c) Copyright 2017 WSO2 Inc.
--- a/modules/distribution/src/core/api-resources/api_templates/default_api_template.xml
+++ b/modules/distribution/src/core/api-resources/api_templates/default_api_template.xml
@ -0,0 +1,72 @@
+<api xmlns="http://ws.apache.org/ns/synapse"  name="$!apiName" context="$!apiContext" transports="$!transport">
+   <resource methods="POST PATCH GET DELETE HEAD PUT OPTIONS"
+             url-mapping="/*"
+             faultSequence="fault">
+	<inSequence>
+		<property name="isDefault" expression="$trp:WSO2_AM_API_DEFAULT_VERSION"/>
+		<filter source="$ctx:isDefault" regex="true">
+		    <then>
+		        <log level="custom">
+		            <property name="STATUS" value="Faulty invoking through default API.Dropping message to avoid recursion.."/>
+		        </log>
+		        <payloadFactory media-type="xml">
+		            <format>
+		                <am:fault xmlns:am="http://wso2.org/apimanager">
+		                    <am:code>500</am:code>
+		                    <am:type>Status report</am:type>
+		                    <am:message>Internal Server Error</am:message>
+		                    <am:description>Faulty invoking through default API</am:description>
+		                </am:fault>
+		            </format>
+		            <args/>
+		        </payloadFactory>
+		        <property name="HTTP_SC" value="500" scope="axis2"/>
+		        <property name="RESPONSE" value="true"/>
+		        <header name="To" action="remove"/>
+		        <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+		        <property name="ContentType" scope="axis2" action="remove"/>
+		        <property name="Authorization" scope="transport" action="remove"/>
+		        <property name="Host" scope="transport" action="remove"/>
+		        <property name="Accept" scope="transport" action="remove"/>
+		        <send/>
+		    </then>
+		    <else>
+		        <header name="WSO2_AM_API_DEFAULT_VERSION" scope="transport" value="true"/>
+                #if( $transport == "https" )
+            	<property name="uri.var.portnum" expression="get-property('https.nio.port')"/>
+                #else
+            	<property name="uri.var.portnum" expression="get-property('http.nio.port')"/>
+                #end
+
+			<send>
+			    <endpoint>
+                #if( $transport == "https" )
+				<http uri-template="https://localhost:{uri.var.portnum}/$!{fwdApiContext}">
+                #else
+				<http uri-template="http://localhost:{uri.var.portnum}/$!{fwdApiContext}">
+                #end
+			            <timeout>
+			                <duration>60000</duration>
+			                <responseAction>fault</responseAction>
+			            </timeout>
+			            <suspendOnFailure>
+			                 <progressionFactor>1.0</progressionFactor>
+			            </suspendOnFailure>
+			            <markForSuspension>
+			                <retriesBeforeSuspension>0</retriesBeforeSuspension>
+                            <retryDelay>0</retryDelay>
+			            </markForSuspension>
+			        </http>
+			    </endpoint>
+			</send>
+		    </else>
+		</filter>
+	    </inSequence>
+	    <outSequence>
+		<send/>
+	    </outSequence>
+	</resource>
+        <handlers>
+            <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+        </handlers>
+</api>
--- a/modules/distribution/src/core/api-resources/api_templates/prototype_template.xml
+++ b/modules/distribution/src/core/api-resources/api_templates/prototype_template.xml
@ -0,0 +1,262 @@
+<!--
+ ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) 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
+ ~
+ ~    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.
+ -->
+
+        #####################  Define the macros ######################
+
+#macro ( print_if_exist $field $default)
+        #if($field && "$field" !="")
+            $field
+        #else
+            $default
+        #end
+#end
+
+#macro ( print_string_if_exist $field $default)
+        #if($field && "$field" !="")
+            "$field"
+        #else
+            "$default"
+        #end
+#end
+
+#macro ( print_if_exist_only $tagname $field)
+        #if($field && "$field" !="")
+            <$tagname>$field</$tagname>
+        #else
+            ## print nothing.
+        #end
+#end
+
+#macro ( print_list $tagname $list)
+        #if($list && "$list" !="" && $list.size() > 0)
+          <$tagname>
+            #foreach($item in $list)
+             $item #if( $foreach.hasNext ), #end
+            #end
+          </$tagname>
+        #else
+            ## print nothing.
+        #end
+#end
+
+#macro ( timeout $config)
+    #if( $config.get("actionSelect") == "neverTimeout" )
+        ## print nothing.
+    #elseif($config.get("actionDuration")|| $config.get("actionSelect"))
+    <timeout>
+        #print_if_exist_only("duration" $config.get("actionDuration"))
+        #print_if_exist_only("responseAction" $config.get("actionSelect"))
+    </timeout>
+    #end
+    <suspendOnFailure>
+        #print_list( "errorCodes" $config.get("suspendErrorCode"))
+        #print_if_exist_only("initialDuration" $config.get("suspendDuration"))
+        #print_if_exist_only("maximumDuration" $config.get("suspendMaxDuration"))
+        <progressionFactor>#print_if_exist( $config.get("factor") 1.0)</progressionFactor>
+    </suspendOnFailure>
+    <markForSuspension>
+        #print_list("errorCodes" $config.get("retryErroCode"))
+        <retriesBeforeSuspension>#print_if_exist( $config.get("retryTimeOut") 0)</retriesBeforeSuspension>
+        <retryDelay>#print_if_exist( $config.get("retryDelay") 0)</retryDelay>
+    </markForSuspension>
+#end
+
+        #macro ( http_endpoint $name $ep )
+<endpoint name="$name">
+<http uri-template="$util.escapeXml($ep.get("url"))">
+#timeout( $ep.get('config') )
+</http>
+        #if($destinationBasedStatsEnabled)
+<property name="ENDPOINT_ADDRESS" value="$util.escapeXml($ep.get("url"))"/>
+        #end
+        </endpoint>
+        #end
+
+        #macro ( draw_endpoint $type $endpoint_config )
+
+        #set( $endpointClass = $endpoint_config.get("endpoint_type") )
+        #set( $endpoints = $endpoint_config.get("${type}_endpoints"))
+        #set( $ep_name = "${apiName}_API${type}Endpoint_${resourceNo}")
+
+        ## IF endpoint secured
+        #if($isEndpointSecured)
+        #if($isSecureVaultEnabled)
+<property xmlns="http://ws.apache.org/ns/synapse" name="password" expression="wso2:vault-lookup('$securevault_alias')"/>
+<property xmlns="http://ws.apache.org/ns/synapse" name="unpw" expression="fn:concat('$username',':',get-property('password'))"/>
+<property xmlns="http://ws.apache.org/ns/synapse" name="Authorization" expression="fn:concat('Basic ', base64Encode(get-property('unpw')))" scope="transport"/>
+        #else
+<property xmlns="http://ws.apache.org/ns/synapse" name="Authorization"  expression="fn:concat('Basic ', base64Encode('$username:$password'))" scope="transport" />
+        #end
+        #end
+<send>
+#if ($endpointClass == "http")
+#http_endpoint($ep_name $endpoints)
+#elseif ($endpointClass == "address")
+<endpoint xmlns="http://ws.apache.org/ns/synapse" name="$ep_name">
+    #set( $advance_ep = $endpoints.get("config") )
+    <address uri="$util.escapeXml($endpoints.get("url"))"
+    #if($advance_ep.get("format") && $advance_ep.get("format") != "" && $advance_ep.get("format") != 'leave-as-is')
+    format="$advance_ep.get("format")"
+    #end
+    #if($advance_ep.get("optimize") && $advance_ep.get("optimize") != "" && $advance_ep.get("optimize") != 'leave-as-is')
+    optimize="$advance_ep.get("optimize")"
+    #end
+    >
+    #timeout( $endpoints.get('config') )
+</address>
+#if($destinationBasedStatsEnabled)
+<property name="ENDPOINT_ADDRESS" value="$util.escapeXml($endpoints.get("url"))"/>
+#end
+</endpoint>
+        #elseif ($endpointClass == "wsdl")
+<endpoint xmlns="http://ws.apache.org/ns/synapse" name="$ep_name">
+<wsdl uri="$util.escapeXml($endpoints.get("url"))" service="$!endpoint_config.get("wsdlendpointService")" port="$!endpoint_config.get("wsdlendpointPort")">
+#timeout()
+</wsdl>
+        #if($destinationBasedStatsEnabled)
+<property name="ENDPOINT_ADDRESS" value="$util.escapeXml($endpoints.get("url"))"/>
+        #end
+        </endpoint>
+        #elseif ($endpointClass == "failover")
+        #set( $failover_endpoints = $endpoint_config.get("${type}_failovers"))
+<endpoint xmlns="http://ws.apache.org/ns/synapse" name="$ep_name">
+<failover>
+    #http_endpoint("${ep_name}_0" $endpoints)
+    #set( $i = 1)
+    #foreach($endpoint in $failover_endpoints)
+    #http_endpoint("${ep_name}_$i" $endpoint)
+    #set( $i = $i + 1)
+    #end
+</failover>
+</endpoint>
+        #elseif ($endpointClass == "load_balance")
+<endpoint xmlns="http://ws.apache.org/ns/synapse" name="$ep_name">
+#if($endpoint_config.get("sessionManagement") && $endpoint_config.get("sessionManagement") != "" && $endpoint_config.get("sessionManagement") != "none")
+<session type="$endpoint_config.get("sessionManagement")">
+#if($endpoint_config.get("sessionTimeOut") && $endpoint_config.get("sessionTimeOut") != "")
+<sessionTimeout>$endpoint_config.get("sessionTimeOut")</sessionTimeout>
+#end
+</session>
+        #end
+<loadbalance algorithm="$!endpoint_config.get("algoClassName")"
+        #if($endpoint_config.get("failOver") && $endpoint_config.get("failOver") != "" && $endpoint_config.get("failOver") == "False")
+        failover="false"
+        #end>
+        #set( $i = 0)
+        #foreach($endpoint in $endpoints)
+        #http_endpoint("${ep_name}_$i" $endpoint)
+        #set( $i = $i + 1)
+        #end
+        </loadbalance>
+        </endpoint>
+        #end
+        </send>
+        #if($destinationBasedStatsEnabled)
+<bam>
+<serverProfile name="$!profileName">
+    <streamConfig name="$!streamName" version="$!streamVersion"/>
+</serverProfile>
+</bam>
+        #end
+        #end
+
+        ######################## End of Macros ######################################
+
+
+<api xmlns="http://ws.apache.org/ns/synapse"  name="$!apiName" context="$!apiContext" version="$!apiVersion" transports="$!transport" version-type="context">
+#if($apiIsBlocked)
+## if API is blocked send the API Block message
+<resource faultSequence=#print_string_if_exist($faultSequence "fault")>
+    <inSequence>
+        <payloadFactory>
+            <format>
+                <am:fault xmlns:am="http://wso2.org/apimanager">
+                    <am:code>700700</am:code>
+                    <am:message>API blocked</am:message>
+                    <am:description>This API has been blocked temporarily. Please try again later or contact the system administrators.</am:description>
+                </am:fault>
+            </format>
+        </payloadFactory>
+        <property name="HTTP_SC" value="503" scope="axis2"/>
+        <property name="RESPONSE" value="true"/>
+        <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+        <header name="To" action="remove"/>
+        <send/>
+    </inSequence>
+</resource>
+#else
+## api not blocked
+#set ($resourceNo = 0)
+#foreach($resource in $resources)
+<resource xmlns="http://ws.apache.org/ns/synapse"
+#if($resource.getUriTemplate().contains("{") ||
+($resource.getUriTemplate().contains("*") && !$resource.getUriTemplate().endsWith("/*")))
+uri-template="$util.escapeXml($resource.getUriTemplate())"
+#else
+url-mapping="$resource.getUriTemplate()"
+#end
+methods="$resource.getMethodsAsString()" faultSequence=#print_string_if_exist($faultSequence "fault")>
+<inSequence>
+    #if(!$resource.getMediationScript().equalsIgnoreCase("null"))
+    <script language="js">
+        <![CDATA[
+                        $resource.getMediationScript()
+                ]]>
+    </script>
+    <filter source="boolean(get-property('CONTENT_TYPE'))" regex="false">
+        <then>
+            <property name="messageType" value="application/xml" scope="axis2"/>
+        </then>
+        <else>
+            <property name="messageType" expression="get-property('CONTENT_TYPE')" scope="axis2"/>
+        </else>
+    </filter>
+    #else
+    <property name="HTTP_SC" value="501" scope="axis2"/>
+    #end
+    #if($resource.getMethodsAsString().contains("GET")||$resource.getMethodsAsString().contains("DELETE"))
+    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+    #end
+    <respond/>
+</inSequence>
+<outSequence>
+    <send/>
+</outSequence>
+</resource>
+        #set ($resourceNo = $resourceNo + 1)
+        #end  ## end of resource iterator
+        ## print the handlers
+        #if($handlers.size() > 0)
+<handlers xmlns="http://ws.apache.org/ns/synapse">
+#foreach($handler in $handlers)
+<handler xmlns="http://ws.apache.org/ns/synapse" class="$handler.className">
+    #if($handler.hasProperties())
+    #set ($map = $handler.getProperties() )
+    #foreach($property in $map.entrySet())
+    <property name="$!property.key" value="$!property.value"/>
+    #end
+    #end
+</handler>
+#end
+</handlers>
+#end
+#if($apiStatus == 'PROTOTYPED')
+#end
+#end
+## end of apiIsBlocked check
+</api>
--- a/modules/distribution/src/core/api-resources/api_templates/velocity_template.xml
+++ b/modules/distribution/src/core/api-resources/api_templates/velocity_template.xml
@ -0,0 +1,375 @@
+<!--
+ ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) 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
+ ~
+ ~    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.
+ -->
+
+        #####################  Define the macros ######################
+
+        #macro ( print_if_exist $field $default)
+        #if($field && "$field" !="")
+        $field
+        #else
+        $default
+        #end
+        #end
+
+        #macro ( print_string_if_exist $field $default)
+        #if($field && "$field" !="")
+        "$field"
+        #else
+        "$default"
+        #end
+        #end
+
+        #macro ( print_if_exist_only $tagname $field)
+        #if($field && "$field" !="")
+<$tagname>$field</$tagname>
+        #else
+        ## print nothing.
+        #end
+        #end
+
+        #macro ( print_list $tagname $list)
+        #if($list && "$list" !="" && $list.size() > 0)
+<$tagname>
+        #foreach($item in $list)
+        $item #if( $foreach.hasNext ), #end
+        #end
+        </$tagname>
+        #else
+        ## print nothing.
+        #end
+        #end
+
+        #macro ( timeout $config)
+        #if( $config.get("actionSelect") == "neverTimeout" )
+        ## print nothing.
+        #elseif($config.get("actionDuration")|| $config.get("actionSelect"))
+<timeout>
+#print_if_exist_only("duration" $config.get("actionDuration"))
+#print_if_exist_only("responseAction" $config.get("actionSelect"))
+</timeout>
+        #end
+<suspendOnFailure>
+#print_list( "errorCodes" $config.get("suspendErrorCode"))
+#print_if_exist_only("initialDuration" $config.get("suspendDuration"))
+#print_if_exist_only("maximumDuration" $config.get("suspendMaxDuration"))
+<progressionFactor>#print_if_exist( $config.get("factor") 1.0)</progressionFactor>
+</suspendOnFailure>
+<markForSuspension>
+#print_list("errorCodes" $config.get("retryErroCode"))
+<retriesBeforeSuspension>#print_if_exist( $config.get("retryTimeOut") 0)</retriesBeforeSuspension>
+<retryDelay>#print_if_exist( $config.get("retryDelay") 0)</retryDelay>
+</markForSuspension>
+        #end
+
+#macro ( http_endpoint $name $ep )
+<endpoint name="$name">
+    <http uri-template="$util.escapeXml($ep.get("url"))">
+    #timeout( $ep.get('config') )
+    </http>
+    <property name="ENDPOINT_ADDRESS" value="$util.escapeXml($ep.get("url"))"/>
+</endpoint>
+#end
+
+#macro ( address_endpoint $name $ep )
+<endpoint xmlns="http://ws.apache.org/ns/synapse" name="$name">
+    #set( $advance_ep = $ep.get("config") )
+    <address uri="$util.escapeXml($ep.get("url"))"
+    #if($advance_ep.get("format") && $advance_ep.get("format") != "" && $advance_ep.get("format") != 'leave-as-is')
+    format="$advance_ep.get("format")"
+    #end
+    #if($advance_ep.get("optimize") && $advance_ep.get("optimize") != "" && $advance_ep.get("optimize") != 'leave-as-is')
+    optimize="$advance_ep.get("optimize")"
+    #end
+    >
+        #timeout( $ep.get('config') )
+    </address>
+    <property name="ENDPOINT_ADDRESS" value="$util.escapeXml($ep.get("url"))"/>
+</endpoint>
+#end
+
+
+        #macro ( draw_endpoint $type $endpoint_config )
+
+        #set( $endpointClass = $endpoint_config.get("endpoint_type") )
+        #set( $endpoints = $endpoint_config.get("${type}_endpoints"))
+        #set( $ep_name = "${apiName}_API${type}Endpoint_${resourceNo}")
+
+        ## IF endpoint secured
+        #if($isEndpointSecured)
+        #if($isSecureVaultEnabled)
+<property xmlns="http://ws.apache.org/ns/synapse" name="password" expression="wso2:vault-lookup('$securevault_alias')"/>
+<property xmlns="http://ws.apache.org/ns/synapse" name="unpw" expression="fn:concat('$username',':',get-property('password'))"/>
+<property xmlns="http://ws.apache.org/ns/synapse" name="Authorization" expression="fn:concat('Basic ', base64Encode(get-property('unpw')))" scope="transport"/>
+        #else
+        #if($isEndpointAuthDigest)
+
+<property xmlns="http://ws.apache.org/ns/synapse" name="UNAMEPASSWORD" value="$util.escapeXml($base64unpw)" type="STRING"/>
+<property name="BACKEND_URL" value="$util.escapeXml($endpoints.get("url"))"/>
+<property name="POSTFIX" expression="get-property('axis2', 'REST_URL_POSTFIX')"/>
+<property name="HTTP_METHOD" expression="get-property('axis2', 'HTTP_METHOD')"/>
+<property name="POST_TO_URI" value="true" scope="axis2"/>
+<property name="MessageType" expression="get-property('axis2', 'messageType')"/>
+
+<enrich>
+    <source type="body" clone="true"/>
+    <target type="property" property="MessageBody"/>
+</enrich>
+
+<call>
+    <endpoint name="$ep_name">
+        <http uri-template="$util.escapeXml($endpoints.get("url"))">
+        </http>
+    </endpoint>
+</call>
+
+<class name="org.wso2.carbon.apimgt.gateway.mediators.DigestAuthMediator"/>
+
+<property name="Authorization" expression="get-property('AuthHeader')" scope="transport"/>
+<property name="messageType" expression="get-property('MessageType')" scope="axis2"/>
+<property name="HTTP_METHOD" expression="get-property('HTTP_METHOD')" scope="axis2"/>
+<property name="REST_URL_POSTFIX" expression="$ctx:POSTFIX" scope="axis2"/>
+<property name="POST_TO_URI" value="true" scope="axis2"/>
+
+<enrich>
+    <source type="property" property="MessageBody" clone="true"/>
+    <target type="body"/>
+</enrich>
+
+        #else
+<property xmlns="http://ws.apache.org/ns/synapse" name="Authorization" expression="fn:concat('Basic ', '$base64unpw')" scope="transport"/>
+        #end
+        #end
+        #end
+<send>
+
+## If endpoint is http
+#if ($endpointClass == "http")
+#http_endpoint($ep_name $endpoints)
+#elseif ($endpointClass == "address")
+<endpoint xmlns="http://ws.apache.org/ns/synapse" name="$ep_name">
+    #set( $advance_ep = $endpoints.get("config") )
+    <address uri="$util.escapeXml($endpoints.get("url"))"
+    #if($advance_ep.get("format") && $advance_ep.get("format") != "" && $advance_ep.get("format") != 'leave-as-is')
+    format="$advance_ep.get("format")"
+    #end
+    #if($advance_ep.get("optimize") && $advance_ep.get("optimize") != "" && $advance_ep.get("optimize") != 'leave-as-is')
+    optimize="$advance_ep.get("optimize")"
+    #end
+    >
+    #timeout( $endpoints.get('config') )
+</address>
+<property name="ENDPOINT_ADDRESS" value="$util.escapeXml($endpoints.get("url"))"/>
+</endpoint>
+        #elseif ($endpointClass == "wsdl")
+<endpoint xmlns="http://ws.apache.org/ns/synapse" name="$ep_name">
+#if (${type} == "production")
+<wsdl uri="$util.escapeXml($endpoints.get("url"))" service="$!endpoint_config.get("wsdlendpointService")" port="$!endpoint_config.get("wsdlendpointPort")">
+#timeout()
+</wsdl>
+        #else
+<wsdl uri="$util.escapeXml($endpoints.get("url"))" service="$!endpoint_config.get("wsdlendpointServiceSandbox")" port="$!endpoint_config.get("wsdlendpointPortSandbox")">
+        #timeout()
+        </wsdl>
+        #end
+<property name="ENDPOINT_ADDRESS" value="$util.escapeXml($endpoints.get("url"))"/>
+        </endpoint>
+        #elseif ($endpointClass == "failover")
+        #set( $failover_endpoints = $endpoint_config.get("${type}_failovers"))
+<endpoint xmlns="http://ws.apache.org/ns/synapse" name="$ep_name">
+<failover>
+    #if($endpoints.get("endpoint_type") == "address")
+        #address_endpoint("${ep_name}_0" $endpoints)
+    #else
+        #http_endpoint("${ep_name}_0" $endpoints)
+    #end
+    #set( $i = 1)
+    #foreach($endpoint in $failover_endpoints)
+        #if($endpoint.get("endpoint_type") == "address")
+            #address_endpoint("${ep_name}_$i" $endpoint)
+        #else
+            #http_endpoint("${ep_name}_$i" $endpoint)
+        #end
+        #set( $i = $i + 1)
+    #end
+</failover>
+</endpoint>
+        #elseif ($endpointClass == "load_balance")
+<endpoint xmlns="http://ws.apache.org/ns/synapse" name="$ep_name">
+#if($endpoint_config.get("sessionManagement") && $endpoint_config.get("sessionManagement") != "" && $endpoint_config.get("sessionManagement") != "none")
+<session type="$endpoint_config.get("sessionManagement")">
+#if($endpoint_config.get("sessionTimeOut") && $endpoint_config.get("sessionTimeOut") != "")
+<sessionTimeout>$endpoint_config.get("sessionTimeOut")</sessionTimeout>
+#end
+</session>
+        #end
+<loadbalance algorithm="$!endpoint_config.get("algoClassName")"
+        #if($endpoint_config.get("failOver") && $endpoint_config.get("failOver") != "" && $endpoint_config.get("failOver") == "False")
+        failover="false"
+        #end>
+        #set( $i = 0)
+        #foreach($endpoint in $endpoints)
+            #if($endpoint.get("endpoint_type") == "address")
+                #address_endpoint("${ep_name}_$i" $endpoint)
+            #else
+                #http_endpoint("${ep_name}_$i" $endpoint)
+            #end            
+            #set( $i = $i + 1)
+        #end
+        </loadbalance>
+        </endpoint>
+#elseif ($endpointClass == "default")
+<endpoint name="$ep_name">
+    <default>
+    </default>
+</endpoint>
+        #end
+        </send>
+        #end
+
+        ######################## End of Macros ######################################
+
+
+<api xmlns="http://ws.apache.org/ns/synapse"  name="$!apiName" context="$!apiContext" version="$!apiVersion" transports="$!transport" version-type="context">
+#if($apiIsBlocked)
+## if API is blocked send the API Block message
+<resource methods="GET POST PUT DELETE PATCH" url-mapping="/*" faultSequence=#print_string_if_exist($faultSequence "fault")>
+<inSequence>
+    <payloadFactory>
+        <format>
+            <am:fault xmlns:am="http://wso2.org/apimanager">
+                <am:code>700700</am:code>
+                <am:message>API blocked</am:message>
+                <am:description>This API has been blocked temporarily. Please try again later or contact the system administrators.</am:description>
+            </am:fault>
+        </format>
+    </payloadFactory>
+    <property name="HTTP_SC" value="503" scope="axis2"/>
+    <property name="RESPONSE" value="true"/>
+    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+    <header name="To" action="remove"/>
+    <send/>
+</inSequence>
+</resource>
+        #else
+        ## api not blocked
+        #set ($resourceNo = 0)
+        #foreach($resource in $resources)
+
+<resource xmlns="http://ws.apache.org/ns/synapse"
+        #if($resource.getUriTemplate().contains("{") ||
+        ($resource.getUriTemplate().contains("*") && !$resource.getUriTemplate().endsWith("/*")))
+        uri-template="$util.escapeXml($resource.getUriTemplate())"
+        #else
+        url-mapping="$resource.getUriTemplate()"
+        #end
+        methods="$resource.getMethodsAsString()" faultSequence=#print_string_if_exist($faultSequence "fault")>
+<inSequence>
+
+## check and set response caching
+#if($responseCacheEnabled)
+<cache scope="per-host" collector="false" hashGenerator="org.wso2.caching.digest.REQUESTHASHGenerator" timeout="$!responseCacheTimeOut">
+    <implementation type="memory" maxSize="500"/>
+</cache>
+#end
+<property name="api.ut.backendRequestTime" expression="get-property('SYSTEM_TIME')"/>
+##############  define the filter based on environment type production only, sandbox only , hybrid ############
+
+#if(($environmentType == 'sandbox') || ($environmentType =='hybrid' && !$endpoint_config.get("production_endpoints") ))
+#set( $filterRegex = "SANDBOX" )
+#else
+#set( $filterRegex = "PRODUCTION" )
+#end
+#if($apiStatus != 'PROTOTYPED')
+<filter source="$ctx:AM_KEY_TYPE" regex="$filterRegex">
+    <then>
+        #end
+        #if(($environmentType == 'sandbox') || ($environmentType =='hybrid' && ! $endpoint_config.get("production_endpoints") ))
+        #draw_endpoint( "sandbox" $endpoint_config )
+        #else
+        #draw_endpoint( "production" $endpoint_config )
+        #end
+        #if($apiStatus != 'PROTOTYPED')
+    </then>
+    <else>
+        #if($environmentType !='hybrid')
+        <payloadFactory>
+            <format>
+                <error xmlns="">
+                    #if($environmentType == 'production')
+                    <message>Sandbox Key Provided for Production Gateway</message>
+                    #elseif($environmentType == 'sandbox')
+                    <message>Production Key Provided for Sandbox Gateway</message>
+                    #end
+                </error>
+            </format>
+        </payloadFactory>
+        <property name="ContentType" value="application/xml" scope="axis2"/>
+        <property name="RESPONSE" value="true"/>
+        <header name="To" action="remove"/>
+        <property name="HTTP_SC" value="401" scope="axis2"/>
+        <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+        <send/>
+        #else
+        #if($endpoint_config.get("production_endpoints") && $endpoint_config.get("sandbox_endpoints"))
+        #draw_endpoint( "sandbox" $endpoint_config )
+        #elseif($endpoint_config.get("production_endpoints"))
+        <sequence key="_sandbox_key_error_"/>
+        #elseif($endpoint_config.get("sandbox_endpoints"))
+        <sequence key="_production_key_error_"/>
+        #end
+        #end
+    </else>
+</filter>
+#end
+</inSequence>
+<outSequence>
+<class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtResponseHandler"/>
+## check and set response caching
+#if($responseCacheEnabled)
+<cache scope="per-host" collector="true"/>
+#end
+<send/>
+</outSequence>
+        </resource>
+        #set ($resourceNo = $resourceNo + 1)
+        #end  ## end of resource iterator
+        ## print the handlers
+        #if($handlers.size() > 0)
+<handlers xmlns="http://ws.apache.org/ns/synapse">
+#foreach($handler in $handlers)
+<handler xmlns="http://ws.apache.org/ns/synapse" class="$handler.className">
+    #if($handler.hasProperties())
+    #set ($map = $handler.getProperties() )
+    #foreach($property in $map.entrySet())
+    <property name="$!property.key" value="$!property.value"/>
+    #end
+    #end
+</handler>
+#end
+</handlers>
+        #end
+        #end
+        #if($apiStatus == 'PROTOTYPED')
+        #end
+        ## end of apiIsBlocked check
+         <handlers>
+      <handler class="org.wso2.carbon.apimgt.gateway.handlers.security.CORSRequestHandler">
+         <property name="inline" value="INLINE"/>
+      </handler>
+       </handlers>
+        </api>
--- a/modules/distribution/src/core/api-resources/customsequences/fault/json_fault.xml
+++ b/modules/distribution/src/core/api-resources/customsequences/fault/json_fault.xml
@ -0,0 +1,41 @@
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="json_fault">
+    <log level="custom">
+        <property name="STATUS" value="Executing custom 'fault' sequence"/>
+        <property name="ERROR_CODE" expression="get-property('ERROR_CODE')"/>
+        <property name="ERROR_MESSAGE" expression="get-property('ERROR_MESSAGE')"/>
+    </log>
+    <payloadFactory>
+        <format>
+            <am:fault xmlns:am="http://wso2.org/apimanager">
+                <am:code>$1</am:code>
+                <am:type>Status report</am:type>
+                <am:message>Runtime Error</am:message>
+                <am:description>$2</am:description>
+            </am:fault>
+        </format>
+        <args>
+            <arg expression="$ctx:ERROR_CODE"/>
+            <arg expression="$ctx:ERROR_MESSAGE"/>
+        </args>
+    </payloadFactory>
+    <filter xpath="$ctx:CUSTOM_HTTP_SC">
+        <then>
+            <property name="HTTP_SC" expression="$ctx:CUSTOM_HTTP_SC" scope="axis2"/>
+        </then>
+        <else>
+            <property name="HTTP_SC" value="500" scope="axis2"/>
+        </else>
+    </filter>
+    <class name="org.wso2.carbon.apimgt.usage.publisher.APIMgtFaultHandler"/>
+    <property name="RESPONSE" value="true"/>
+    <header name="To" action="remove"/>
+    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+    <property name="ContentType" scope="axis2" action="remove"/>
+    <property name="Authorization" scope="transport" action="remove"/>
+    <property name="Host" scope="transport" action="remove"/>
+    <property name="Accept" scope="transport" action="remove"/>
+    <property name="X-JWT-Assertion" scope="transport" action="remove"/>
+    <property name="messageType" value="application/json" scope="axis2"/>
+    <send/>
+    <drop/>
+</sequence>
--- a/modules/distribution/src/core/api-resources/customsequences/in/json_to_xml_in_message.xml
+++ b/modules/distribution/src/core/api-resources/customsequences/in/json_to_xml_in_message.xml
@ -0,0 +1,3 @@
+<sequence xmlns="http://ws.apache.org/ns/synapse"  name="json_to_xml_in_message">      
+    <property name="messageType" value="application/xml" scope="axis2"/>
+</sequence>
--- a/modules/distribution/src/core/api-resources/customsequences/in/log_in_message.xml
+++ b/modules/distribution/src/core/api-resources/customsequences/in/log_in_message.xml
@ -0,0 +1,5 @@
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="log_in_message">
+    <log level="full">
+        <property name="IN_MESSAGE" value="IN_MESSAGE"/>
+    </log>
+</sequence>
--- a/modules/distribution/src/core/api-resources/customsequences/in/preserve_accept_header.xml
+++ b/modules/distribution/src/core/api-resources/customsequences/in/preserve_accept_header.xml
@ -0,0 +1,4 @@
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="preserve_accept_header">
+    <property name="WSO2_AM_API_ACCEPT_MESSAGE_TYPE" expression="get-property('transport', 'Accept')" scope="default"/>
+    <property name="Accept" scope="transport" action="remove"/>
+</sequence>
--- a/modules/distribution/src/core/api-resources/customsequences/in/xml_to_json_in_message.xml
+++ b/modules/distribution/src/core/api-resources/customsequences/in/xml_to_json_in_message.xml
@ -0,0 +1,3 @@
+<sequence xmlns="http://ws.apache.org/ns/synapse"  name="xml_to_json_in_message">      
+    <property name="messageType" value="application/json" scope="axis2"/>
+</sequence>
--- a/modules/distribution/src/core/api-resources/customsequences/out/apply_accept_header.xml
+++ b/modules/distribution/src/core/api-resources/customsequences/out/apply_accept_header.xml
@ -0,0 +1,5 @@
+<sequence xmlns="http://ws.apache.org/ns/synapse"  name="apply_accept_header">
+      <property name="messageType"
+                expression="get-property('default', 'WSO2_AM_API_ACCEPT_MESSAGE_TYPE')"
+                scope="axis2"/>
+</sequence>
--- a/modules/distribution/src/core/api-resources/customsequences/out/json_to_xml_out_message.xml
+++ b/modules/distribution/src/core/api-resources/customsequences/out/json_to_xml_out_message.xml
@ -0,0 +1,3 @@
+<sequence xmlns="http://ws.apache.org/ns/synapse"  name="json_to_xml_out_message">      
+    <property name="messageType" value="application/xml" scope="axis2"/>
+</sequence>
--- a/modules/distribution/src/core/api-resources/customsequences/out/log_out_message.xml
+++ b/modules/distribution/src/core/api-resources/customsequences/out/log_out_message.xml
@ -0,0 +1,5 @@
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="log_out_message">
+    <log level="full">
+        <property name="OUT_MESSAGE" value="OUT_MESSAGE"/>
+    </log>
+</sequence>
--- a/modules/distribution/src/core/api-resources/customsequences/out/xml_to_json_out_message.xml
+++ b/modules/distribution/src/core/api-resources/customsequences/out/xml_to_json_out_message.xml
@ -0,0 +1,3 @@
+<sequence xmlns="http://ws.apache.org/ns/synapse"  name="xml_to_json_out_message">      
+    <property name="messageType" value="application/json" scope="axis2"/>
+</sequence>
--- a/modules/distribution/src/core/api-resources/default-tiers/default-app-tiers.xml
+++ b/modules/distribution/src/core/api-resources/default-tiers/default-app-tiers.xml
@ -0,0 +1,119 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+            xmlns:throttle="http://www.wso2.org/products/wso2commons/throttle">
+    <throttle:MediatorThrottleAssertion>
+        <wsp:Policy>
+            <!--It's possible to define a display name for a tier to show in UIs by adding the attribute of throttle:displayName="xxxx" for <throttle:ID>
+             element.
+             For ex:  <throttle:ID throttle:type="ROLE" throttle:displayName="xxxx">Gold</throttle:ID>
+                      ......
+             -->
+            <throttle:ID throttle:type="ROLE">Large</throttle:ID>
+            <wsp:Policy>
+                <throttle:Control>
+                    <wsp:Policy>
+                        <throttle:MaximumCount>20</throttle:MaximumCount>
+                        <throttle:UnitTime>60000</throttle:UnitTime>
+                        <!--It's possible to define tier level attributes as below for each tier level.For eg:Payment Plan for a tier
+                        <wsp:Policy>
+                        <throttle:Attributes>
+                            <throttle:Attribute1>xxxx</throttle:Attribute1>
+                            <throttle:Attribute2>xxxx</throttle:Attribute2>
+                        </throttle:Attributes>
+                        </wsp:Policy>
+                        -->
+                        <wsp:Policy>
+                            <throttle:Attributes>
+                                <throttle:x-wso2-BillingPlan>FREE</throttle:x-wso2-BillingPlan>
+                                <throttle:x-wso2-StopOnQuotaReach>true</throttle:x-wso2-StopOnQuotaReach>
+                            </throttle:Attributes>
+                        </wsp:Policy>
+                    </wsp:Policy>
+                </throttle:Control>
+            </wsp:Policy>
+        </wsp:Policy>
+        <wsp:Policy>
+            <!--It's possible to define a display name for a tier to show in UIs by adding the attribute of throttle:displayName="xxxx" for <throttle:ID>
+            element.
+            For ex:  <throttle:ID throttle:type="ROLE" throttle:displayName="xxxx">Gold</throttle:ID>
+                     ......
+            -->
+            <throttle:ID throttle:type="ROLE">Medium</throttle:ID>
+            <wsp:Policy>
+                <throttle:Control>
+                    <wsp:Policy>
+                        <throttle:MaximumCount>5</throttle:MaximumCount>
+                        <throttle:UnitTime>60000</throttle:UnitTime>
+                        <!--It's possible to define tier level attributes as below for each tier level.For eg:Payment Plan for a tier
+                        <wsp:Policy>
+                        <throttle:Attributes>
+                            <throttle:Attribute1>xxxx</throttle:Attribute1>
+                            <throttle:Attribute2>xxxx</throttle:Attribute2>
+                        </throttle:Attributes>
+                        </wsp:Policy>
+                        -->
+                        <wsp:Policy>
+                            <throttle:Attributes>
+                                <throttle:x-wso2-BillingPlan>FREE</throttle:x-wso2-BillingPlan>
+                                <throttle:x-wso2-StopOnQuotaReach>true</throttle:x-wso2-StopOnQuotaReach>
+                            </throttle:Attributes>
+                        </wsp:Policy>
+                    </wsp:Policy>
+                </throttle:Control>
+            </wsp:Policy>
+        </wsp:Policy>
+        <wsp:Policy>
+            <!--It's possible to define a display name for a tier to show in UIs by adding the attribute of throttle:displayName="xxxx" for <throttle:ID>
+            element.
+            For ex:  <throttle:ID throttle:type="ROLE" throttle:displayName="xxxx">Gold</throttle:ID>
+                     ......
+            -->
+            <throttle:ID throttle:type="ROLE">Small</throttle:ID>
+            <wsp:Policy>
+                <throttle:Control>
+                    <wsp:Policy>
+                        <throttle:MaximumCount>1</throttle:MaximumCount>
+                        <throttle:UnitTime>60000</throttle:UnitTime>
+                        <!--It's possible to define tier level attributes as below for each tier level.For eg:Payment Plan for a tier
+                        <wsp:Policy>
+                        <throttle:Attributes>
+                            <throttle:Attribute1>xxxx</throttle:Attribute1>
+                            <throttle:Attribute2>xxxx</throttle:Attribute2>
+                        </throttle:Attributes>
+                        </wsp:Policy>
+                        -->
+                        <wsp:Policy>
+                            <throttle:Attributes>
+                                <throttle:x-wso2-BillingPlan>FREE</throttle:x-wso2-BillingPlan>
+                                <throttle:x-wso2-StopOnQuotaReach>true</throttle:x-wso2-StopOnQuotaReach>
+                            </throttle:Attributes>
+                        </wsp:Policy>
+                    </wsp:Policy>
+                </throttle:Control>
+            </wsp:Policy>
+        </wsp:Policy>
+        <wsp:Policy>
+            <!--It's possible to define a display name for a tier to show in UIs by adding the attribute of throttle:displayName="xxxx" for <throttle:ID>
+            element.
+            For ex:  <throttle:ID throttle:type="ROLE" throttle:displayName="xxxx">Gold</throttle:ID>
+                     ......
+            -->
+            <throttle:ID throttle:type="ROLE">Unauthenticated</throttle:ID>
+            <wsp:Policy>
+                <throttle:Control>
+                    <wsp:Policy>
+                        <throttle:MaximumCount>60</throttle:MaximumCount>
+                        <throttle:UnitTime>60000</throttle:UnitTime>
+                        <!--It's possible to define tier level attributes as below for each tier level.For eg:Payment Plan for a tier
+                        <wsp:Policy>
+                        <throttle:Attributes>
+                            <throttle:Attribute1>xxxx</throttle:Attribute1>
+                            <throttle:Attribute2>xxxx</throttle:Attribute2>
+                        </throttle:Attributes>
+                        </wsp:Policy>
+                        -->
+                    </wsp:Policy>
+                </throttle:Control>
+            </wsp:Policy>
+        </wsp:Policy>
+    </throttle:MediatorThrottleAssertion>
+</wsp:Policy>
--- a/modules/distribution/src/core/api-resources/default-tiers/default-res-tiers.xml
+++ b/modules/distribution/src/core/api-resources/default-tiers/default-res-tiers.xml
@ -0,0 +1,119 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+            xmlns:throttle="http://www.wso2.org/products/wso2commons/throttle">
+    <throttle:MediatorThrottleAssertion>
+        <wsp:Policy>
+            <!--It's possible to define a display name for a tier to show in UIs by adding the attribute of throttle:displayName="xxxx" for <throttle:ID>
+             element.
+             For ex:  <throttle:ID throttle:type="ROLE" throttle:displayName="xxxx">Gold</throttle:ID>
+                      ......
+             -->
+            <throttle:ID throttle:type="ROLE">Ultimate</throttle:ID>
+            <wsp:Policy>
+                <throttle:Control>
+                    <wsp:Policy>
+                        <throttle:MaximumCount>20</throttle:MaximumCount>
+                        <throttle:UnitTime>60000</throttle:UnitTime>
+                        <!--It's possible to define tier level attributes as below for each tier level.For eg:Payment Plan for a tier
+                        <wsp:Policy>
+                        <throttle:Attributes>
+                            <throttle:Attribute1>xxxx</throttle:Attribute1>
+                            <throttle:Attribute2>xxxx</throttle:Attribute2>
+                        </throttle:Attributes>
+                        </wsp:Policy>
+                        -->
+                        <wsp:Policy>
+                            <throttle:Attributes>
+                                <throttle:x-wso2-BillingPlan>FREE</throttle:x-wso2-BillingPlan>
+                                <throttle:x-wso2-StopOnQuotaReach>true</throttle:x-wso2-StopOnQuotaReach>
+                            </throttle:Attributes>
+                        </wsp:Policy>
+                    </wsp:Policy>
+                </throttle:Control>
+            </wsp:Policy>
+        </wsp:Policy>
+        <wsp:Policy>
+            <!--It's possible to define a display name for a tier to show in UIs by adding the attribute of throttle:displayName="xxxx" for <throttle:ID>
+            element.
+            For ex:  <throttle:ID throttle:type="ROLE" throttle:displayName="xxxx">Gold</throttle:ID>
+                     ......
+            -->
+            <throttle:ID throttle:type="ROLE">Plus</throttle:ID>
+            <wsp:Policy>
+                <throttle:Control>
+                    <wsp:Policy>
+                        <throttle:MaximumCount>5</throttle:MaximumCount>
+                        <throttle:UnitTime>60000</throttle:UnitTime>
+                        <!--It's possible to define tier level attributes as below for each tier level.For eg:Payment Plan for a tier
+                        <wsp:Policy>
+                        <throttle:Attributes>
+                            <throttle:Attribute1>xxxx</throttle:Attribute1>
+                            <throttle:Attribute2>xxxx</throttle:Attribute2>
+                        </throttle:Attributes>
+                        </wsp:Policy>
+                        -->
+                        <wsp:Policy>
+                            <throttle:Attributes>
+                                <throttle:x-wso2-BillingPlan>FREE</throttle:x-wso2-BillingPlan>
+                                <throttle:x-wso2-StopOnQuotaReach>true</throttle:x-wso2-StopOnQuotaReach>
+                            </throttle:Attributes>
+                        </wsp:Policy>
+                    </wsp:Policy>
+                </throttle:Control>
+            </wsp:Policy>
+        </wsp:Policy>
+        <wsp:Policy>
+            <!--It's possible to define a display name for a tier to show in UIs by adding the attribute of throttle:displayName="xxxx" for <throttle:ID>
+            element.
+            For ex:  <throttle:ID throttle:type="ROLE" throttle:displayName="xxxx">Gold</throttle:ID>
+                     ......
+            -->
+            <throttle:ID throttle:type="ROLE">Basic</throttle:ID>
+            <wsp:Policy>
+                <throttle:Control>
+                    <wsp:Policy>
+                        <throttle:MaximumCount>1</throttle:MaximumCount>
+                        <throttle:UnitTime>60000</throttle:UnitTime>
+                        <!--It's possible to define tier level attributes as below for each tier level.For eg:Payment Plan for a tier
+                        <wsp:Policy>
+                        <throttle:Attributes>
+                            <throttle:Attribute1>xxxx</throttle:Attribute1>
+                            <throttle:Attribute2>xxxx</throttle:Attribute2>
+                        </throttle:Attributes>
+                        </wsp:Policy>
+                        -->
+                        <wsp:Policy>
+                            <throttle:Attributes>
+                                <throttle:x-wso2-BillingPlan>FREE</throttle:x-wso2-BillingPlan>
+                                <throttle:x-wso2-StopOnQuotaReach>true</throttle:x-wso2-StopOnQuotaReach>
+                            </throttle:Attributes>
+                        </wsp:Policy>
+                    </wsp:Policy>
+                </throttle:Control>
+            </wsp:Policy>
+        </wsp:Policy>
+        <wsp:Policy>
+            <!--It's possible to define a display name for a tier to show in UIs by adding the attribute of throttle:displayName="xxxx" for <throttle:ID>
+            element.
+            For ex:  <throttle:ID throttle:type="ROLE" throttle:displayName="xxxx">Gold</throttle:ID>
+                     ......
+            -->
+            <throttle:ID throttle:type="ROLE">Unauthenticated</throttle:ID>
+            <wsp:Policy>
+                <throttle:Control>
+                    <wsp:Policy>
+                        <throttle:MaximumCount>60</throttle:MaximumCount>
+                        <throttle:UnitTime>60000</throttle:UnitTime>
+                        <!--It's possible to define tier level attributes as below for each tier level.For eg:Payment Plan for a tier
+                        <wsp:Policy>
+                        <throttle:Attributes>
+                            <throttle:Attribute1>xxxx</throttle:Attribute1>
+                            <throttle:Attribute2>xxxx</throttle:Attribute2>
+                        </throttle:Attributes>
+                        </wsp:Policy>
+                        -->
+                    </wsp:Policy>
+                </throttle:Control>
+            </wsp:Policy>
+        </wsp:Policy>
+    </throttle:MediatorThrottleAssertion>
+</wsp:Policy>
--- a/modules/distribution/src/core/api-resources/default-tiers/default-tiers.xml
+++ b/modules/distribution/src/core/api-resources/default-tiers/default-tiers.xml
@ -0,0 +1,122 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+            xmlns:throttle="http://www.wso2.org/products/wso2commons/throttle">
+    <throttle:MediatorThrottleAssertion>
+        <wsp:Policy>
+            <!--It's possible to define a display name for a tier to show in UIs by adding the attribute of throttle:displayName="xxxx" for <throttle:ID>
+             element.
+             For ex:  <throttle:ID throttle:type="ROLE" throttle:displayName="xxxx">Gold</throttle:ID>
+                      ......
+             -->
+            <throttle:ID throttle:type="ROLE">Gold</throttle:ID>
+            <wsp:Policy>
+                <throttle:Control>
+                    <wsp:Policy>
+                        <throttle:MaximumCount>20</throttle:MaximumCount>
+                        <throttle:UnitTime>60000</throttle:UnitTime>
+                        <!--It's possible to define tier level attributes as below for each tier level.For eg:Payment Plan for a tier
+                        <wsp:Policy>
+                        <throttle:Attributes>
+                            <throttle:Attribute1>xxxx</throttle:Attribute1>
+                            <throttle:Attribute2>xxxx</throttle:Attribute2>
+                        </throttle:Attributes>
+                        </wsp:Policy>
+                        -->
+                        <wsp:Policy>
+                            <throttle:Attributes>
+                                <throttle:x-wso2-BillingPlan>FREE</throttle:x-wso2-BillingPlan>
+                                <throttle:x-wso2-StopOnQuotaReach>true</throttle:x-wso2-StopOnQuotaReach>
+                            </throttle:Attributes>
+                        </wsp:Policy>
+
+                    </wsp:Policy>
+                </throttle:Control>
+            </wsp:Policy>
+        </wsp:Policy>
+        <wsp:Policy>
+            <!--It's possible to define a display name for a tier to show in UIs by adding the attribute of throttle:displayName="xxxx" for <throttle:ID>
+            element.
+            For ex:  <throttle:ID throttle:type="ROLE" throttle:displayName="xxxx">Gold</throttle:ID>
+                     ......
+            -->
+            <throttle:ID throttle:type="ROLE">Silver</throttle:ID>
+            <wsp:Policy>
+                <throttle:Control>
+                    <wsp:Policy>
+                        <throttle:MaximumCount>5</throttle:MaximumCount>
+                        <throttle:UnitTime>60000</throttle:UnitTime>
+                        <!--It's possible to define tier level attributes as below for each tier level.For eg:Payment Plan for a tier
+                        <wsp:Policy>
+                        <throttle:Attributes>
+                            <throttle:Attribute1>xxxx</throttle:Attribute1>
+                            <throttle:Attribute2>xxxx</throttle:Attribute2>
+                        </throttle:Attributes>
+                        </wsp:Policy>
+                        -->
+                        <wsp:Policy>
+                            <throttle:Attributes>
+                                <throttle:x-wso2-BillingPlan>FREE</throttle:x-wso2-BillingPlan>
+                                <throttle:x-wso2-StopOnQuotaReach>true</throttle:x-wso2-StopOnQuotaReach>
+                            </throttle:Attributes>
+                        </wsp:Policy>
+
+                    </wsp:Policy>
+                </throttle:Control>
+            </wsp:Policy>
+        </wsp:Policy>
+        <wsp:Policy>
+            <!--It's possible to define a display name for a tier to show in UIs by adding the attribute of throttle:displayName="xxxx" for <throttle:ID>
+            element.
+            For ex:  <throttle:ID throttle:type="ROLE" throttle:displayName="xxxx">Gold</throttle:ID>
+                     ......
+            -->
+            <throttle:ID throttle:type="ROLE">Bronze</throttle:ID>
+            <wsp:Policy>
+                <throttle:Control>
+                    <wsp:Policy>
+                        <throttle:MaximumCount>1</throttle:MaximumCount>
+                        <throttle:UnitTime>60000</throttle:UnitTime>
+                        <!--It's possible to define tier level attributes as below for each tier level.For eg:Payment Plan for a tier
+                        <wsp:Policy>
+                        <throttle:Attributes>
+                            <throttle:Attribute1>xxxx</throttle:Attribute1>
+                            <throttle:Attribute2>xxxx</throttle:Attribute2>
+                        </throttle:Attributes>
+                        </wsp:Policy>
+                        -->
+                        <wsp:Policy>
+                            <throttle:Attributes>
+                                <throttle:x-wso2-BillingPlan>FREE</throttle:x-wso2-BillingPlan>
+                                <throttle:x-wso2-StopOnQuotaReach>true</throttle:x-wso2-StopOnQuotaReach>
+                            </throttle:Attributes>
+                        </wsp:Policy>
+
+                    </wsp:Policy>
+                </throttle:Control>
+            </wsp:Policy>
+        </wsp:Policy>
+        <wsp:Policy>
+            <!--It's possible to define a display name for a tier to show in UIs by adding the attribute of throttle:displayName="xxxx" for <throttle:ID>
+            element.
+            For ex:  <throttle:ID throttle:type="ROLE" throttle:displayName="xxxx">Gold</throttle:ID>
+                     ......
+            -->
+            <throttle:ID throttle:type="ROLE">Unauthenticated</throttle:ID>
+            <wsp:Policy>
+                <throttle:Control>
+                    <wsp:Policy>
+                        <throttle:MaximumCount>60</throttle:MaximumCount>
+                        <throttle:UnitTime>60000</throttle:UnitTime>
+                        <!--It's possible to define tier level attributes as below for each tier level.For eg:Payment Plan for a tier
+                        <wsp:Policy>
+                        <throttle:Attributes>
+                            <throttle:Attribute1>xxxx</throttle:Attribute1>
+                            <throttle:Attribute2>xxxx</throttle:Attribute2>
+                        </throttle:Attributes>
+                        </wsp:Policy>
+                        -->
+                    </wsp:Policy>
+                </throttle:Control>
+            </wsp:Policy>
+        </wsp:Policy>
+    </throttle:MediatorThrottleAssertion>
+</wsp:Policy>
--- a/modules/distribution/src/core/api-resources/synapse-configs/default/api/_API_Application_Registration_.xml
+++ b/modules/distribution/src/core/api-resources/synapse-configs/default/api/_API_Application_Registration_.xml
@ -0,0 +1,63 @@
+<api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2APIRegistrationApplication_" context="/api-application-registration">
+    <resource methods="POST" url-mapping="/register/tenants" faultSequence="_api_registration_fault_">
+        <inSequence>
+            <property name="uri.var.portnum" expression="get-property('system','iot.core.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.core.host')"/>
+            <send>
+                <endpoint>
+                    <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/api-application-registration">
+                        <timeout>
+                            <duration>60000</duration>
+                            <responseAction>fault</responseAction>
+                        </timeout>
+                    </http>
+                </endpoint>
+            </send>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <resource methods="POST" url-mapping="/register" faultSequence="_api_registration_fault_">
+        <inSequence>
+            <property name="uri.var.portnum" expression="get-property('system','iot.core.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.core.host')"/>
+            <send>
+                <endpoint>
+                    <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/api-application-registration">
+                        <timeout>
+                            <duration>60000</duration>
+                            <responseAction>fault</responseAction>
+                        </timeout>
+                    </http>
+                </endpoint>
+            </send>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <resource methods="DELETE" url-mapping="/unregister" faultSequence="_api_registration_fault_">
+        <inSequence>
+            <property name="uri.var.portnum" expression="get-property('system','iot.core.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.core.host')"/>
+            <send>
+                <endpoint>
+                    <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/api-application-registration">
+                        <timeout>
+                            <duration>60000</duration>
+                            <responseAction>fault</responseAction>
+                        </timeout>
+                    </http>
+                </endpoint>
+            </send>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerCacheExtensionHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
--- a/modules/distribution/src/core/api-resources/synapse-configs/default/api/_AuthorizeAPI_.xml
+++ b/modules/distribution/src/core/api-resources/synapse-configs/default/api/_AuthorizeAPI_.xml
@ -0,0 +1,24 @@
+<api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMAuthorizeAPI_" context="/authorize">
+    <resource methods="GET" url-mapping="/*" faultSequence="_token_fault_">
+        <inSequence>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>/>
+            <send>
+                <endpoint>
+                    <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/authorize">
+                        <timeout>
+                            <duration>60000</duration>
+                            <responseAction>fault</responseAction>
+                        </timeout>
+                    </http>
+                </endpoint>
+            </send>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
--- a/modules/distribution/src/core/api-resources/synapse-configs/default/api/_RevokeAPI_.xml
+++ b/modules/distribution/src/core/api-resources/synapse-configs/default/api/_RevokeAPI_.xml
@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMRevokeAPI_" context="/revoke">
+    <resource methods="POST" url-mapping="/*" faultSequence="_token_fault_">
+        <inSequence>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
+            <send>
+                <endpoint>
+                    <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/revoke">
+                        <timeout>
+                            <duration>60000</duration>
+                            <responseAction>fault</responseAction>
+                        </timeout>
+                    </http>
+                </endpoint>
+            </send>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerCacheExtensionHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
--- a/modules/distribution/src/core/api-resources/synapse-configs/default/api/_TokenAPI_.xml
+++ b/modules/distribution/src/core/api-resources/synapse-configs/default/api/_TokenAPI_.xml
@ -0,0 +1,25 @@
+<api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMTokenAPI_" context="/token">
+    <resource methods="POST" url-mapping="/*" faultSequence="_token_fault_">
+        <inSequence>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+	    <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
+            <send>
+                <endpoint>
+                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/token">
+                        <timeout>
+                            <duration>60000</duration>
+                            <responseAction>fault</responseAction>
+                        </timeout>
+                    </http>
+                </endpoint>
+            </send>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.ext.APIManagerCacheExtensionHandler"/>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
--- a/modules/distribution/src/core/api-resources/synapse-configs/default/api/_UserInfoAPI_.xml
+++ b/modules/distribution/src/core/api-resources/synapse-configs/default/api/_UserInfoAPI_.xml
@ -0,0 +1,24 @@
+<api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMUserInfoAPI_" context="/userinfo">
+    <resource methods="GET" url-mapping="/*" faultSequence="_token_fault_">
+        <inSequence>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
+            <send>
+                <endpoint>
+                    <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/userinfo">
+                        <timeout>
+                            <duration>60000</duration>
+                            <responseAction>fault</responseAction>
+                        </timeout>
+                    </http>
+                </endpoint>
+            </send>
+        </inSequence>
+        <outSequence>
+            <send/>
+        </outSequence>
+    </resource>
+    <handlers>
+        <handler class="org.wso2.carbon.apimgt.gateway.handlers.common.SynapsePropertiesHandler"/>
+    </handlers>
+</api>
--- a/modules/distribution/src/core/api-resources/synapse-configs/default/proxy-services/WorkflowCallbackService.xml
+++ b/modules/distribution/src/core/api-resources/synapse-configs/default/proxy-services/WorkflowCallbackService.xml
@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<proxy xmlns="http://ws.apache.org/ns/synapse"
+       name="WorkflowCallbackService"
+       transports="https http"
+       startOnLoad="true"
+       trace="disable">
+   <description/>
+   <target>
+      <inSequence>
+         <property name="messageType"
+                   value="application/x-www-form-urlencoded"
+                   scope="axis2"
+                   type="STRING"/>
+         <send>
+            <endpoint>
+               <address uri="https://localhost:9443/store/site/blocks/workflow/workflow-listener/ajax/workflow-listener.jag"
+                        format="rest"/>
+            </endpoint>
+         </send>
+      </inSequence>
+      <outSequence>
+         <property name="messageType" value="text/xml" scope="axis2" type="STRING"/>
+         <send/>
+      </outSequence>
+   </target>
+   <publishWSDL>
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+                        xmlns:ns1="http://org.apache.axis2/xsd"
+                        xmlns:ns="http://callback.workflow.apimgt.carbon.wso2.org"
+                        xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
+                        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+                        xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                        xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
+                        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+                        xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
+                        targetNamespace="http://callback.workflow.apimgt.carbon.wso2.org">
+         <wsdl:documentation>WorkflowCallbackService</wsdl:documentation>
+         <wsdl:types>
+            <xs:schema attributeFormDefault="qualified"
+                       elementFormDefault="qualified"
+                       targetNamespace="http://callback.workflow.apimgt.carbon.wso2.org">
+               <xs:element name="resumeEvent">
+                  <xs:complexType>
+                     <xs:sequence>
+                        <xs:element minOccurs="0"
+                                    name="workflowReference"
+                                    nillable="true"
+                                    type="xs:string"/>
+                        <xs:element minOccurs="0" name="status" nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0"
+                                    name="description"
+                                    nillable="true"
+                                    type="xs:string"/>
+                     </xs:sequence>
+                  </xs:complexType>
+               </xs:element>
+               <xs:element name="resumeEventResponse">
+                  <xs:complexType>
+                     <xs:sequence>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
+                     </xs:sequence>
+                  </xs:complexType>
+               </xs:element>
+            </xs:schema>
+         </wsdl:types>
+         <wsdl:message name="resumeEventRequest">
+            <wsdl:part name="parameters" element="ns:resumeEvent"/>
+         </wsdl:message>
+         <wsdl:message name="resumeEventResponse">
+            <wsdl:part name="parameters" element="ns:resumeEventResponse"/>
+         </wsdl:message>
+         <wsdl:portType name="WorkflowCallbackServicePortType">
+            <wsdl:operation name="resumeEvent">
+               <wsdl:input message="ns:resumeEventRequest" wsaw:Action="urn:resumeEvent"/>
+               <wsdl:output message="ns:resumeEventResponse" wsaw:Action="urn:resumeEventResponse"/>
+            </wsdl:operation>
+         </wsdl:portType>
+         <wsdl:binding name="WorkflowCallbackServiceSoap11Binding"
+                       type="ns:WorkflowCallbackServicePortType">
+            <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+            <wsdl:operation name="resumeEvent">
+               <soap:operation soapAction="urn:resumeEvent" style="document"/>
+               <wsdl:input>
+                  <soap:body use="literal"/>
+               </wsdl:input>
+               <wsdl:output>
+                  <soap:body use="literal"/>
+               </wsdl:output>
+            </wsdl:operation>
+         </wsdl:binding>
+         <wsdl:binding name="WorkflowCallbackServiceSoap12Binding"
+                       type="ns:WorkflowCallbackServicePortType">
+            <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+            <wsdl:operation name="resumeEvent">
+               <soap12:operation soapAction="urn:resumeEvent" style="document"/>
+               <wsdl:input>
+                  <soap12:body use="literal"/>
+               </wsdl:input>
+               <wsdl:output>
+                  <soap12:body use="literal"/>
+               </wsdl:output>
+            </wsdl:operation>
+         </wsdl:binding>
+         <wsdl:binding name="WorkflowCallbackServiceHttpBinding"
+                       type="ns:WorkflowCallbackServicePortType">
+            <http:binding verb="POST"/>
+            <wsdl:operation name="resumeEvent">
+               <http:operation location="resumeEvent"/>
+               <wsdl:input>
+                  <mime:content type="text/xml" part="parameters"/>
+               </wsdl:input>
+               <wsdl:output>
+                  <mime:content type="text/xml" part="parameters"/>
+               </wsdl:output>
+            </wsdl:operation>
+         </wsdl:binding>
+         <wsdl:service name="WorkflowCallbackService">
+            <wsdl:port name="WorkflowCallbackServiceHttpsSoap11Endpoint"
+                       binding="ns:WorkflowCallbackServiceSoap11Binding">
+               <soap:address location="https://localhost:8243/services/WorkflowCallbackService.WorkflowCallbackServiceHttpsSoap11Endpoint/"/>
+            </wsdl:port>
+            <wsdl:port name="WorkflowCallbackServiceHttpSoap11Endpoint"
+                       binding="ns:WorkflowCallbackServiceSoap11Binding">
+               <soap:address location="http://localhost:8280/services/WorkflowCallbackService.WorkflowCallbackServiceHttpSoap11Endpoint/"/>
+            </wsdl:port>
+            <wsdl:port name="WorkflowCallbackServiceHttpsSoap12Endpoint"
+                       binding="ns:WorkflowCallbackServiceSoap12Binding">
+               <soap12:address location="https://localhost:8243/services/WorkflowCallbackService.WorkflowCallbackServiceHttpsSoap12Endpoint/"/>
+            </wsdl:port>
+            <wsdl:port name="WorkflowCallbackServiceHttpSoap12Endpoint"
+                       binding="ns:WorkflowCallbackServiceSoap12Binding">
+               <soap12:address location="http://localhost:8280/services/WorkflowCallbackService.WorkflowCallbackServiceHttpSoap12Endpoint/"/>
+            </wsdl:port>
+            <wsdl:port name="WorkflowCallbackServiceHttpsEndpoint"
+                       binding="ns:WorkflowCallbackServiceHttpBinding">
+               <http:address location="https://localhost:8243/services/WorkflowCallbackService.WorkflowCallbackServiceHttpsEndpoint/"/>
+            </wsdl:port>
+            <wsdl:port name="WorkflowCallbackServiceHttpEndpoint"
+                       binding="ns:WorkflowCallbackServiceHttpBinding">
+               <http:address location="http://localhost:8280/services/WorkflowCallbackService.WorkflowCallbackServiceHttpEndpoint/"/>
+            </wsdl:port>
+         </wsdl:service>
+      </wsdl:definitions>
+   </publishWSDL>
+</proxy>
--- a/modules/distribution/src/core/api-resources/synapse-configs/default/registry.xml
+++ b/modules/distribution/src/core/api-resources/synapse-configs/default/registry.xml
@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  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
+  ~
+  ~    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.
+  -->
+
+<!-- Registry declaration of the WSO2 ESB -->
+<registry xmlns="http://ws.apache.org/ns/synapse" provider="org.wso2.carbon.mediation.registry.WSO2Registry">
+    <!--all resources loaded from the URL registry would be
+    cached for this number of milliseconds -->
+    <parameter name="cachableDuration">15000</parameter>
+</registry>
--- a/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/_api_registration_fault_.xml
+++ b/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/_api_registration_fault_.xml
@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  Copyright (c) 2016, 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
+  ~
+  ~    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.
+  -->
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="_api_registration_fault_">
+    <property name="ERROR_MESSAGE" value="Error occurred while invoking api application registration endpoint"/>
+    <sequence key="fault"/>
+</sequence>
--- a/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/_auth_failure_handler_.xml
+++ b/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/_auth_failure_handler_.xml
@ -0,0 +1,4 @@
+<sequence name="_auth_failure_handler_" xmlns="http://ws.apache.org/ns/synapse">
+    <property name="error_message_type" value="application/xml"/>
+    <sequence key="_cors_request_handler_"/>
+</sequence>
--- a/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/_build_.xml
+++ b/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/_build_.xml
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  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
+  ~
+  ~    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.
+  -->
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="_build_">
+    <builder>
+        <messageBuilder contentType="application/json" class="org.apache.axis2.json.JSONBuilder"
+                        formatterClass="org.apache.axis2.json.JSONMessageFormatter"/>
+        <messageBuilder contentType="application/xml" class="org.apache.axis2.builder.ApplicationXMLBuilder"
+                        formatterClass="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+    </builder>
+</sequence>
--- a/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/_cors_request_handler_.xml
+++ b/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/_cors_request_handler_.xml
@ -0,0 +1,30 @@
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="_cors_request_handler_">
+   <filter source="$ctx:CORSConfiguration.Enabled" regex="true">
+      <then>
+         <filter source="boolean($trp:Access-Control-Allow-Origin)" regex="false">
+            <then>
+               <property name="Access-Control-Allow-Origin" expression="$ctx:Access-Control-Allow-Origin"  scope="transport" type="STRING"/>
+            </then>
+         </filter>
+         <filter source="boolean($trp:Access-Control-Allow-Methods)" regex="false">
+            <then>
+               <property name="Access-Control-Allow-Methods" expression="$ctx:Access-Control-Allow-Methods" scope="transport" type="STRING"/>
+            </then>
+         </filter>
+         <filter source="boolean($trp:Access-Control-Allow-Headers)" regex="false">
+            <then>
+               <property name="Access-Control-Allow-Headers" expression="$ctx:Access-Control-Allow-Headers" scope="transport" type="STRING"/>
+            </then>
+         </filter>
+         <filter source="boolean($trp:Access-Control-Allow-Credentials)" regex="false">
+            <then>
+               <filter source="boolean($ctx:Access-Control-Allow-Credentials)" regex="true">
+                  <then>
+                     <property name="Access-Control-Allow-Credentials" expression="$ctx:Access-Control-Allow-Credentials" scope="transport" type="STRING"/>
+                  </then>
+               </filter>
+            </then>
+         </filter>
+      </then>
+   </filter>
+</sequence>
--- a/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/_dcr_fault_.xml
+++ b/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/_dcr_fault_.xml
@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  Copyright (c) 2016, 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
+  ~
+  ~    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.
+  -->
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="_dcr_fault_">
+    <property name="ERROR_MESSAGE" value="Error occurred while invoking dynamic client registration endpoint"/>
+    <sequence key="fault"/>
+</sequence>
--- a/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/_production_key_error_.xml
+++ b/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/_production_key_error_.xml
@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  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
+  ~
+  ~    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.
+  -->
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="_production_key_error_">
+    <property name="ERROR_CODE" value="900901"/>
+    <property name="ERROR_MESSAGE" value="Production key offered to the API with no production endpoint"/>
+    <property name="CUSTOM_HTTP_SC" value="403"/>
+    <sequence key="fault"/>
+</sequence>
--- a/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/_resource_mismatch_handler_.xml
+++ b/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/_resource_mismatch_handler_.xml
@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  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
+  ~
+  ~    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.
+  -->
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="_resource_mismatch_handler_">
+    <sequence key="fault"/>
+</sequence>
--- a/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/_sandbox_key_error_.xml
+++ b/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/_sandbox_key_error_.xml
@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  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
+  ~
+  ~    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.
+  -->
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="_sandbox_key_error_">
+    <property name="ERROR_CODE" value="900901"/>
+    <property name="ERROR_MESSAGE" value="Sandbox key offered to the API with no sandbox endpoint"/>
+    <property name="CUSTOM_HTTP_SC" value="403"/>
+    <sequence key="fault"/>
+</sequence>
--- a/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/_throttle_out_handler_.xml
+++ b/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/_throttle_out_handler_.xml
@ -0,0 +1,5 @@
+<sequence name="_throttle_out_handler_" xmlns="http://ws.apache.org/ns/synapse">    
+    <property name="X-JWT-Assertion" scope="transport" action="remove"/>
+    <class name="org.wso2.carbon.apimgt.gateway.handlers.analytics.APIMgtThrottleUsageHandler"/>
+    <sequence key="_cors_request_handler_"/>
+</sequence>
--- a/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/_token_fault_.xml
+++ b/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/_token_fault_.xml
@ -0,0 +1,40 @@
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="_token_fault_">
+    <log level="custom">
+        <property name="STATUS" value="Executing token 'fault' sequence"/>
+        <property name="ERROR_CODE" expression="get-property('ERROR_CODE')"/>
+        <property name="ERROR_MESSAGE" expression="get-property('ERROR_MESSAGE')"/>
+    </log>
+    <payloadFactory>
+        <format>
+            <am:fault xmlns:am="http://wso2.org/apimanager">
+                <am:code>$1</am:code>
+                <am:type>Status report</am:type>
+                <am:message>Runtime Error</am:message>
+                <am:description>$2</am:description>
+            </am:fault>
+        </format>
+        <args>
+            <arg expression="$ctx:ERROR_CODE"/>
+            <arg expression="$ctx:ERROR_MESSAGE"/>
+        </args>
+    </payloadFactory>
+    <filter xpath="$ctx:CUSTOM_HTTP_SC">
+        <then>
+            <property name="HTTP_SC" expression="$ctx:CUSTOM_HTTP_SC" scope="axis2"/>
+        </then>
+        <else>
+            <property name="HTTP_SC" value="500" scope="axis2"/>
+        </else>
+    </filter>
+    <property name="RESPONSE" value="true"/>
+    <header name="To" action="remove"/>
+    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+    <property name="ContentType" scope="axis2" action="remove"/>
+    <property name="Authorization" scope="transport" action="remove"/>
+    <property name="Host" scope="transport" action="remove"/>
+    <property name="Accept" scope="transport" action="remove"/>
+    <property name="messageType" value="application/xml" scope="axis2"/>
+    <sequence key="_cors_request_handler_"/>
+    <send/>
+    <drop/>
+</sequence>
--- a/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/fault.xml
+++ b/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/fault.xml
@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  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
+  ~
+  ~    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.
+  -->
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="fault">
+    <log level="custom">
+        <property name="STATUS" value="Executing default 'fault' sequence"/>
+        <property name="ERROR_CODE" expression="get-property('ERROR_CODE')"/>
+        <property name="ERROR_MESSAGE" expression="get-property('ERROR_MESSAGE')"/>
+    </log>
+    <filter source="get-property('MESSAGE_FORMAT')" regex="soap1[1-2]">
+        <then>
+            <property name="SOAP_FAULT_CODE" value="Server"/>
+            <makefault>
+                <code expression="$ctx:SOAP_FAULT_CODE"/>
+                <reason expression="$ctx:ERROR_MESSAGE"/>
+            </makefault>
+        </then>
+        <else>
+            <payloadFactory>
+                <format>
+                    <am:fault xmlns:am="http://wso2.org/apimanager">
+                        <am:code>$1</am:code>
+                        <am:type>Status report</am:type>
+                        <am:message>Runtime Error</am:message>
+                        <am:description>$2</am:description>
+                    </am:fault>
+                </format>
+                <args>
+                    <arg expression="$ctx:ERROR_CODE"/>
+                    <arg expression="$ctx:ERROR_MESSAGE"/>
+                </args>
+            </payloadFactory>
+            <filter source="$axis2:HTTP_METHOD" regex="^(?!.*(POST|PUT|PATCH)).*$">
+                <property name="messageType" value="application/xml" scope="axis2"/>
+            </filter>
+        </else>
+    </filter>
+    <filter xpath="$ctx:CUSTOM_HTTP_SC">
+        <then>
+            <property name="HTTP_SC" expression="$ctx:CUSTOM_HTTP_SC" scope="axis2"/>
+        </then>
+        <else>
+            <property name="HTTP_SC" value="500" scope="axis2"/>
+        </else>
+    </filter>
+    <property name="RESPONSE" value="true"/>
+    <header name="To" action="remove"/>
+    <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+    <property name="ContentType" scope="axis2" action="remove"/>
+    <property name="Authorization" scope="transport" action="remove"/>
+    <property name="Host" scope="transport" action="remove"/>
+    <property name="Accept" scope="transport" action="remove"/>
+    <property name="X-JWT-Assertion" scope="transport" action="remove"/>
+    <sequence key="_cors_request_handler_"/>
+    <send/>
+</sequence>
--- a/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/main.xml
+++ b/modules/distribution/src/core/api-resources/synapse-configs/default/sequences/main.xml
@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  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
+  ~
+  ~    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.
+  -->
+
+<!-- Default main sequence shipped with the WSO2 ESB -->
+<sequence xmlns="http://ws.apache.org/ns/synapse" name="main">
+    <description>The default main sequence for API manager - Returns 404 Not Found</description>
+    <in>
+        <log level="custom">
+            <property name="STATUS" value="Message dispatched to the main sequence. Invalid URL."/>
+            <property name="RESOURCE" expression="fn:concat('/', $axis2:REST_URL_POSTFIX)"/>
+        </log>        
+        <filter source="$ctx:TRANSPORT_DENIED" regex="true">
+            <payloadFactory>
+                <format>
+                    <am:fault xmlns:am="http://wso2.org/apimanager">
+                        <am:code>403</am:code>
+                        <am:type>Status report</am:type>
+                        <am:message>Forbidden</am:message>
+                        <am:description>Unsupported Transport [ $2 ]. The requested resource (/$1) is not available.</am:description>
+                    </am:fault>
+                </format>
+                <args>
+                    <arg expression="$axis2:REST_URL_POSTFIX"/>
+                    <arg expression="$ctx:IN_TRANSPORT"/>
+                </args>
+            </payloadFactory>
+            <property name="HTTP_SC" value="403" scope="axis2"/>
+            <property name="RESPONSE" value="true"/>
+            <header name="To" action="remove"/>
+            <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+            <property name="ContentType" scope="axis2" action="remove"/>
+            <property name="Authorization" scope="transport" action="remove"/>
+            <property name="Host" scope="transport" action="remove"/>
+            <property name="Accept" scope="transport" action="remove"/>
+            <send/>
+            <drop/>
+        </filter>
+        <filter source="get-property('MESSAGE_FORMAT')" regex="soap1[1-2]">
+            <then>
+                <property name="SOAP_FAULT_CODE" value="Server"/>
+                <makefault>
+                    <code expression="$ctx:SOAP_FAULT_CODE"/>
+                    <reason value="The requested endpoint is not available."/>
+                </makefault>
+            </then>
+            <else>
+                <payloadFactory>
+                    <format>
+                        <am:fault xmlns:am="http://wso2.org/apimanager">
+                            <am:code>404</am:code>
+                            <am:type>Status report</am:type>
+                            <am:message>Not Found</am:message>
+                            <am:description>The requested resource (/$1) is not available.</am:description>
+                        </am:fault>
+                    </format>
+                    <args>
+                        <arg expression="$axis2:REST_URL_POSTFIX"/>
+                    </args>
+                </payloadFactory>
+            </else>
+        </filter>
+        <filter source="$axis2:HTTP_METHOD" regex="^(?!.*(POST|PUT|PATCH)).*$">
+            <property name="messageType" value="application/xml" scope="axis2"/>
+        </filter>
+        <property name="HTTP_SC" value="404" scope="axis2"/>
+        <property name="RESPONSE" value="true"/>
+        <header name="To" action="remove"/>
+        <property name="NO_ENTITY_BODY" scope="axis2" action="remove"/>
+        <property name="ContentType" scope="axis2" action="remove"/>
+        <property name="Authorization" scope="transport" action="remove"/>
+        <property name="Host" scope="transport" action="remove"/>
+        <property name="Accept" scope="transport" action="remove"/>
+        <property name="X-JWT-Assertion" scope="transport" action="remove"/>
+        <send/>
+        <drop/>
+    </in>
+    <out>
+        <log level="full">
+            <property name="STATUS" value="Unexpected response message in out flow"/>
+        </log>
+        <drop/>
+    </out>
+</sequence>
--- a/modules/distribution/src/core/api-resources/synapse-configs/default/synapse.xml
+++ b/modules/distribution/src/core/api-resources/synapse-configs/default/synapse.xml
@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  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
+  ~
+  ~    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.
+  -->
+
+<!-- An empty flat synapse configuration shipped with the WSO2 ESB -->
+<definitions xmlns="http://ws.apache.org/ns/synapse">
+
+    <!-- You can add any flat sequences, endpoints, etc.. to this synapse.xml file if you do
+    *not* want to keep the artifacts in several files -->
+</definitions>
--- a/modules/distribution/src/core/bin/wso2server.bat
+++ b/modules/distribution/src/core/bin/wso2server.bat
@ -0,0 +1,177 @@
+@echo off
+
+REM ---------------------------------------------------------------------------
+REM        Copyright 2005-2009 WSO2, Inc. http://www.wso2.org
+REM
+REM  Licensed under the Apache License, Version 2.0 (the "License");
+REM  you may not use this file except in compliance with the License.
+REM  You may obtain a copy of the License at
+REM
+REM      http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM  Unless required by applicable law or agreed to in writing, software
+REM  distributed under the License is distributed on an "AS IS" BASIS,
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM  See the License for the specific language governing permissions and
+REM  limitations under the License.
+
+rem ---------------------------------------------------------------------------
+rem Main Script for WSO2 Carbon
+rem
+rem Environment Variable Prequisites
+rem
+rem   CARBON_HOME   Home of CARBON installation. If not set I will  try
+rem                   to figure it out.
+rem
+rem   JAVA_HOME       Must point at your Java Development Kit installation.
+rem
+rem   JAVA_OPTS       (Optional) Java runtime options used when the commands
+rem                   is executed.
+rem ---------------------------------------------------------------------------
+
+rem ----- if JAVA_HOME is not set we're not happy ------------------------------
+:checkJava
+
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+goto checkServer
+
+:noJavaHome
+echo "You must set the JAVA_HOME variable before running CARBON."
+goto end
+
+rem ----- Only set CARBON_HOME if not already set ----------------------------
+:checkServer
+rem %~sdp0 is expanded pathname of the current script under NT with spaces in the path removed
+if "%CARBON_HOME%"=="" set CARBON_HOME=%~sdp0..
+SET curDrive=%cd:~0,1%
+SET wsasDrive=%CARBON_HOME:~0,1%
+if not "%curDrive%" == "%wsasDrive%" %wsasDrive%:
+
+rem find CARBON_HOME if it does not exist due to either an invalid value passed
+rem by the user or the %0 problem on Windows 9x
+if not exist "%CARBON_HOME%\bin\version.txt" goto noServerHome
+
+set AXIS2_HOME=%CARBON_HOME%
+goto updateClasspath
+
+:noServerHome
+echo CARBON_HOME is set incorrectly or CARBON could not be located. Please set CARBON_HOME.
+goto end
+
+rem ----- update classpath -----------------------------------------------------
+:updateClasspath
+
+setlocal EnableDelayedExpansion
+cd %CARBON_HOME%
+set CARBON_CLASSPATH=
+FOR %%C in ("%CARBON_HOME%\bin\*.jar") DO set CARBON_CLASSPATH=!CARBON_CLASSPATH!;".\bin\%%~nC%%~xC"
+
+set CARBON_CLASSPATH="%JAVA_HOME%\lib\tools.jar";%CARBON_CLASSPATH%;
+
+FOR %%D in ("%CARBON_HOME%\lib\commons-lang*.jar") DO set CARBON_CLASSPATH=!CARBON_CLASSPATH!;".\lib\%%~nD%%~xD"
+
+rem ----- Process the input command -------------------------------------------
+
+rem Slurp the command line arguments. This loop allows for an unlimited number
+rem of arguments (up to the command line limit, anyway).
+
+
+:setupArgs
+if ""%1""=="""" goto doneStart
+
+if ""%1""==""-run""     goto commandLifecycle
+if ""%1""==""--run""    goto commandLifecycle
+if ""%1""==""run""      goto commandLifecycle
+
+if ""%1""==""-restart""  goto commandLifecycle
+if ""%1""==""--restart"" goto commandLifecycle
+if ""%1""==""restart""   goto commandLifecycle
+
+if ""%1""==""debug""    goto commandDebug
+if ""%1""==""-debug""   goto commandDebug
+if ""%1""==""--debug""  goto commandDebug
+
+if ""%1""==""version""   goto commandVersion
+if ""%1""==""-version""  goto commandVersion
+if ""%1""==""--version"" goto commandVersion
+
+shift
+goto setupArgs
+
+rem ----- commandVersion -------------------------------------------------------
+:commandVersion
+shift
+type "%CARBON_HOME%\bin\version.txt"
+type "%CARBON_HOME%\bin\wso2carbon-version.txt"
+goto end
+
+rem ----- commandDebug ---------------------------------------------------------
+:commandDebug
+shift
+set DEBUG_PORT=%1
+if "%DEBUG_PORT%"=="" goto noDebugPort
+if not "%JAVA_OPTS%"=="" echo Warning !!!. User specified JAVA_OPTS will be ignored, once you give the --debug option.
+set JAVA_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=%DEBUG_PORT%
+echo Please start the remote debugging client to continue...
+goto findJdk
+
+:noDebugPort
+echo Please specify the debug port after the --debug option
+goto end
+
+rem ----- commandLifecycle -----------------------------------------------------
+:commandLifecycle
+goto findJdk
+
+:doneStart
+if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
+
+rem ---------- Handle the SSL Issue with proper JDK version --------------------
+rem find the version of the jdk
+:findJdk
+
+set CMD=RUN %*
+
+:checkJdk17
+"%JAVA_HOME%\bin\java" -version 2>&1 | findstr /r "1.[7|8]" >NUL
+IF ERRORLEVEL 1 goto unknownJdk
+goto jdk17
+
+:unknownJdk
+echo Starting WSO2 Carbon (in unsupported JDK)
+echo [ERROR] CARBON is supported only on JDK 1.7 and 1.8
+goto jdk17
+
+:jdk17
+goto runServer
+
+rem ----------------- Execute The Requested Command ----------------------------
+
+:runServer
+cd %CARBON_HOME%
+
+rem ------------------ Remove tmp folder on startup -----------------------------
+set TMP_DIR=%CARBON_HOME%\tmp
+rmdir "%TMP_DIR%" /s /q
+
+rem ---------- Add jars to classpath ----------------
+
+set CARBON_CLASSPATH=.\lib;%CARBON_CLASSPATH%
+
+set JAVA_ENDORSED=".\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
+
+set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof"  -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dlogger.server.name="IoT-Core" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dcatalina.base="%CARBON_HOME%\lib\tomcat" -Dwso2.carbon.xml=%CARBON_HOME%\repository\conf\carbon.xml -Dwso2.registry.xml="%CARBON_HOME%\repository\conf\registry.xml" -Dwso2.user.mgt.xml="%CARBON_HOME%\repository\conf\user-mgt.xml" -Dwso2.transports.xml="%CARBON_HOME%\repository\conf\mgt-transports.xml" -Djava.util.logging.config.file="%CARBON_HOME%\repository\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcarbon.config.dir.path="%CARBON_HOME%\repository\conf"  -Dcomponents.repo="%CARBON_HOME%\repository\components" -Dconf.location="%CARBON_HOME%\repository\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path="true" -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Diot.analytics.host="localhost" -Diot.analytics.https.port="9445" -Diot.manager.host="localhost" -Diot.manager.https.port="9445" -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1886" -Diot.core.host="localhost" -Diot.core.https.port="9443" -Diot.keymanager.host="localhost" -Diot.keymanager.https.port="9443" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8243" -Diot.gateway.http.port="8280" -Diot.apimpublisher.host="localhost" -Diot.apimpublisher.https.port="9443" -Diot.apimstore.host="localhost" -Diot.apimstore.https.port="8243"
+
+:runJava
+echo JAVA_HOME environment variable is set to %JAVA_HOME%
+echo CARBON_HOME environment variable is set to %CARBON_HOME%
+"%JAVA_HOME%\bin\java" %CMD_LINE_ARGS% org.wso2.carbon.bootstrap.Bootstrap %CMD%
+if "%ERRORLEVEL%"=="121" goto runJava
+:end
+goto endlocal
+
+:endlocal
+
+:END
--- a/modules/distribution/src/core/bin/wso2server.sh
+++ b/modules/distribution/src/core/bin/wso2server.sh
@ -0,0 +1,329 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+#  Copyright 2005-2012 WSO2, Inc. http://www.wso2.org
+#
+#  Licensed 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.
+
+# ----------------------------------------------------------------------------
+# Main Script for the WSO2 Carbon Server
+#
+# Environment Variable Prequisites
+#
+#   CARBON_HOME   Home of WSO2 Carbon installation. If not set I will  try
+#                   to figure it out.
+#
+#   JAVA_HOME       Must point at your Java Development Kit installation.
+#
+#   JAVA_OPTS       (Optional) Java runtime options used when the commands
+#                   is executed.
+#
+# NOTE: Borrowed generously from Apache Tomcat startup scripts.
+# -----------------------------------------------------------------------------
+
+# OS specific support.  $var _must_ be set to either true or false.
+#ulimit -n 100000
+
+cygwin=false;
+darwin=false;
+os400=false;
+mingw=false;
+case "`uname`" in
+CYGWIN*) cygwin=true;;
+MINGW*) mingw=true;;
+OS400*) os400=true;;
+Darwin*) darwin=true
+        if [ -z "$JAVA_VERSION" ] ; then
+             JAVA_VERSION="CurrentJDK"
+           else
+             echo "Using Java version: $JAVA_VERSION"
+           fi
+           if [ -z "$JAVA_HOME" ] ; then
+             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+           fi
+           ;;
+esac
+
+# resolve links - $0 may be a softlink
+PRG="$0"
+
+while [ -h "$PRG" ]; do
+  ls=`ls -ld "$PRG"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '.*/.*' > /dev/null; then
+    PRG="$link"
+  else
+    PRG=`dirname "$PRG"`/"$link"
+  fi
+done
+
+# Get standard environment variables
+PRGDIR=`dirname "$PRG"`
+
+# Only set CARBON_HOME if not already set
+[ -z "$CARBON_HOME" ] && CARBON_HOME=`cd "$PRGDIR/.." ; pwd`
+
+# Set AXIS2_HOME. Needed for One Click JAR Download
+AXIS2_HOME=$CARBON_HOME
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin; then
+  [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CARBON_HOME" ] && CARBON_HOME=`cygpath --unix "$CARBON_HOME"`
+  [ -n "$AXIS2_HOME" ] && CARBON_HOME=`cygpath --unix "$CARBON_HOME"`
+fi
+
+# For OS400
+if $os400; then
+  # Set job priority to standard for interactive (interactive - 6) by using
+  # the interactive priority - 6, the helper threads that respond to requests
+  # will be running at the same priority as interactive jobs.
+  COMMAND='chgjob job('$JOBNAME') runpty(6)'
+  system $COMMAND
+
+  # Enable multi threading
+  QIBM_MULTI_THREADED=Y
+  export QIBM_MULTI_THREADED
+fi
+
+# For Migwn, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$CARBON_HOME" ] &&
+    CARBON_HOME="`(cd "$CARBON_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+  [ -n "$AXIS2_HOME" ] &&
+    CARBON_HOME="`(cd "$CARBON_HOME"; pwd)`"
+  # TODO classpath?
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD=java
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly."
+  echo " CARBON cannot execute $JAVACMD"
+  exit 1
+fi
+
+# if JAVA_HOME is not set we're not happy
+if [ -z "$JAVA_HOME" ]; then
+  echo "You must set the JAVA_HOME variable before running CARBON."
+  exit 1
+fi
+
+if [ -e "$CARBON_HOME/wso2carbon.pid" ]; then
+  PID=`cat "$CARBON_HOME"/wso2carbon.pid`
+fi
+
+# ----- Process the input command ----------------------------------------------
+args=""
+for c in $*
+do
+    if [ "$c" = "--debug" ] || [ "$c" = "-debug" ] || [ "$c" = "debug" ]; then
+          CMD="--debug"
+          continue
+    elif [ "$CMD" = "--debug" ]; then
+          if [ -z "$PORT" ]; then
+                PORT=$c
+          fi
+    elif [ "$c" = "--stop" ] || [ "$c" = "-stop" ] || [ "$c" = "stop" ]; then
+          CMD="stop"
+    elif [ "$c" = "--start" ] || [ "$c" = "-start" ] || [ "$c" = "start" ]; then
+          CMD="start"
+    elif [ "$c" = "--version" ] || [ "$c" = "-version" ] || [ "$c" = "version" ]; then
+          CMD="version"
+    elif [ "$c" = "--restart" ] || [ "$c" = "-restart" ] || [ "$c" = "restart" ]; then
+          CMD="restart"
+    elif [ "$c" = "--test" ] || [ "$c" = "-test" ] || [ "$c" = "test" ]; then
+          CMD="test"
+    else
+        args="$args $c"
+    fi
+done
+
+if [ "$CMD" = "--debug" ]; then
+  if [ "$PORT" = "" ]; then
+    echo " Please specify the debug port after the --debug option"
+    exit 1
+  fi
+  if [ -n "$JAVA_OPTS" ]; then
+    echo "Warning !!!. User specified JAVA_OPTS will be ignored, once you give the --debug option."
+  fi
+  CMD="RUN"
+  JAVA_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=$PORT"
+  echo "Please start the remote debugging client to continue..."
+elif [ "$CMD" = "start" ]; then
+  if [ -e "$CARBON_HOME/wso2carbon.pid" ]; then
+    if  ps -p $PID > /dev/null ; then
+      echo "Process is already running"
+      exit 0
+    fi
+  fi
+  export CARBON_HOME=$CARBON_HOME
+# using nohup sh to avoid erros in solaris OS.TODO
+  nohup sh $CARBON_HOME/bin/wso2server.sh $args > /dev/null 2>&1 &
+  exit 0
+elif [ "$CMD" = "stop" ]; then
+  export CARBON_HOME=$CARBON_HOME
+  kill -term `cat $CARBON_HOME/wso2carbon.pid`
+  exit 0
+elif [ "$CMD" = "restart" ]; then
+  export CARBON_HOME=$CARBON_HOME
+  kill -term `cat $CARBON_HOME/wso2carbon.pid`
+  process_status=0
+  pid=`cat $CARBON_HOME/wso2carbon.pid`
+  while [ "$process_status" -eq "0" ]
+  do
+        sleep 1;
+        ps -p$pid 2>&1 > /dev/null
+        process_status=$?
+  done
+
+# using nohup sh to avoid erros in solaris OS.TODO
+  nohup sh $CARBON_HOME/bin/wso2server.sh $args > /dev/null 2>&1 &
+  exit 0
+elif [ "$CMD" = "test" ]; then
+    JAVACMD="exec "$JAVACMD""
+elif [ "$CMD" = "version" ]; then
+  cat $CARBON_HOME/bin/version.txt
+  cat $CARBON_HOME/bin/wso2carbon-version.txt
+  exit 0
+fi
+
+# ---------- Handle the SSL Issue with proper JDK version --------------------
+jdk_17=`$JAVA_HOME/bin/java -version 2>&1 | grep "1.[7|8]"`
+if [ "$jdk_17" = "" ]; then
+   echo " Starting WSO2 Carbon (in unsupported JDK)"
+   echo " [ERROR] CARBON is supported only on JDK 1.7 and 1.8"
+fi
+
+CARBON_XBOOTCLASSPATH=""
+for f in "$CARBON_HOME"/lib/xboot/*.jar
+do
+    if [ "$f" != "$CARBON_HOME/lib/xboot/*.jar" ];then
+        CARBON_XBOOTCLASSPATH="$CARBON_XBOOTCLASSPATH":$f
+    fi
+done
+
+JAVA_ENDORSED_DIRS="$CARBON_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
+
+CARBON_CLASSPATH=""
+if [ -e "$JAVA_HOME/lib/tools.jar" ]; then
+    CARBON_CLASSPATH="$JAVA_HOME/lib/tools.jar"
+fi
+for f in "$CARBON_HOME"/bin/*.jar
+do
+    if [ "$f" != "$CARBON_HOME/bin/*.jar" ];then
+        CARBON_CLASSPATH="$CARBON_CLASSPATH":$f
+    fi
+done
+for t in "$CARBON_HOME"/lib/commons-lang*.jar
+do
+    CARBON_CLASSPATH="$CARBON_CLASSPATH":$t
+done
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
+  CARBON_HOME=`cygpath --absolute --windows "$CARBON_HOME"`
+  AXIS2_HOME=`cygpath --absolute --windows "$CARBON_HOME"`
+  CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
+  CARBON_CLASSPATH=`cygpath --path --windows "$CARBON_CLASSPATH"`
+  CARBON_XBOOTCLASSPATH=`cygpath --path --windows "$CARBON_XBOOTCLASSPATH"`
+fi
+
+# ----- Execute The Requested Command -----------------------------------------
+
+echo JAVA_HOME environment variable is set to $JAVA_HOME
+echo CARBON_HOME environment variable is set to $CARBON_HOME
+
+cd "$CARBON_HOME"
+
+TMP_DIR=$CARBON_HOME/tmp
+if [ -d "$TMP_DIR" ]; then
+rm -rf "$TMP_DIR"
+fi
+
+START_EXIT_STATUS=121
+status=$START_EXIT_STATUS
+
+#To monitor a Carbon server in remote JMX mode on linux host machines, set the below system property.
+#   -Djava.rmi.server.hostname="your.IP.goes.here"
+
+while [ "$status" = "$START_EXIT_STATUS" ]
+do
+    $JAVACMD \
+    -Xbootclasspath/a:"$CARBON_XBOOTCLASSPATH" \
+    -Xms256m -Xmx1024m -XX:MaxPermSize=512m \
+    -XX:+HeapDumpOnOutOfMemoryError \
+    -XX:HeapDumpPath="$CARBON_HOME/repository/logs/heap-dump.hprof" \
+    $JAVA_OPTS \
+    -Dcom.sun.management.jmxremote \
+    -classpath "$CARBON_CLASSPATH" \
+    -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \
+    -Djava.io.tmpdir="$CARBON_HOME/tmp" \
+    -Dcatalina.base="$CARBON_HOME/lib/tomcat" \
+    -Dwso2.server.standalone=true \
+    -Dcarbon.registry.root=/ \
+    -Djava.command="$JAVACMD" \
+    -Dcarbon.home="$CARBON_HOME" \
+    -Dlogger.server.name="IoT-Core" \
+    -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
+    -Dcarbon.config.dir.path="$CARBON_HOME/repository/conf" \
+    -Djava.util.logging.config.file="$CARBON_HOME/repository/conf/etc/logging-bridge.properties" \
+    -Dcomponents.repo="$CARBON_HOME/repository/components/plugins" \
+    -Dconf.location="$CARBON_HOME/repository/conf"\
+    -Dcom.atomikos.icatch.file="$CARBON_HOME/lib/transactions.properties" \
+    -Dcom.atomikos.icatch.hide_init_file_path=true \
+    -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false \
+    -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true \
+    -Dcom.sun.jndi.ldap.connect.pool.authentication=simple  \
+    -Dcom.sun.jndi.ldap.connect.pool.timeout=3000  \
+    -Dorg.terracotta.quartz.skipUpdateCheck=true \
+    -Djava.security.egd=file:/dev/./urandom \
+    -Dfile.encoding=UTF8 \
+    -Djava.net.preferIPv4Stack=true \
+    -Dcom.ibm.cacheLocalHost=true \
+    -DworkerNode=false \
+    -Dorg.wso2.ignoreHostnameVerification=true \
+    -Dorg.opensaml.httpclient.https.disableHostnameVerification=true \
+    -Diot.analytics.host="localhost" \
+    -Diot.analytics.https.port="9445" \
+    -Diot.manager.host="localhost" \
+    -Diot.manager.https.port="9443" \
+    -Dmqtt.broker.host="localhost" \
+    -Dmqtt.broker.port="1886" \
+    -Diot.core.host="localhost" \
+    -Diot.core.https.port="9443" \
+    -Diot.keymanager.host="localhost" \
+    -Diot.keymanager.https.port="9443" \
+    -Diot.gateway.host="localhost" \
+    -Diot.gateway.https.port="8243" \
+    -Diot.gateway.http.port="8280" \
+    -Diot.apimpublisher.host="localhost" \
+    -Diot.apimpublisher.https.port="9443" \
+    -Diot.apimstore.host="localhost" \
+    -Diot.apimstore.https.port="9443" \
+    org.wso2.carbon.bootstrap.Bootstrap $*
+    status=$?
+done
--- a/modules/distribution/src/core/cloud/portal/common.css
+++ b/modules/distribution/src/core/cloud/portal/common.css
@ -0,0 +1,245 @@
+/*
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+.truncate {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+/**
+ * Validation messages
+ */
+.required {
+    color: #e74c3c;
+}
+
+.required-error {
+    background: #a94442;
+    border: 1px solid #a94442;
+    padding: 6px 12px;
+    color: #fff;
+}
+
+/**
+ * Theme overrides
+ */
+.breadcrumb li .fw-home {
+    float: left;
+    padding-top: 2px;
+    margin-right: 5px;
+}
+
+/**
+ * Auth menu
+ */
+.auth .hidden-xs {
+    line-height: 38px;
+}
+
+.auth-xs {
+    color: #fff;
+}
+
+.auth-xs ul {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    line-height: 28px;
+    background-color: #2a80b9;
+}
+
+.auth-xs li {
+    color: #ccc;
+}
+
+.auth-xs li a {
+    display: block;
+    color: #fff;
+}
+
+.auth-xs li a:hover {
+    background-color: #499dd5;
+}
+
+ul.dropdown-menu.more-actions-button {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+    width: 40px;
+    background: #F9F9F9;
+    border-bottom: 1px solid #EFEFEF;
+    min-width: 45px;
+
+}
+
+ul.dropdown-menu.more-actions-button > li {
+    height: 40px;
+    width: 40px;
+    border: 1px;
+}
+
+ul.dropdown-menu.more-actions-button > li > button {
+    border-bottom: 1px solid #e4e4e4;
+    border-top: 1px solid darkred;
+}
+
+.btn-group.open .dropdown-toggle {
+    -webkit-box-shadow: none;
+    box-shadow: none;
+    border: 0px;
+}
+
+.btn-custom {
+    border-width: 1px;
+}
+
+
+.cloud-menu .popover {
+    border-radius: 0px;
+    width: 24em;
+    left: -21.1em !important;
+    max-width: 32em;
+    background-color: #006690
+}
+.cloud-menu .popover-title,.navbar-header .popover-title {
+    background-color: #006690;
+    font-size: 16px;
+    border-bottom: none;
+    font-weight: 400;
+}
+.cloud-menu .popover.bottom>.arrow{
+    margin-left:-2px;
+}
+.cloud-menu .popover.bottom>.arrow:after,.navbar-header .popover.bottom>.arrow:after{
+    border-bottom-color: #006690;
+}
+.cloud-block {
+    float: left;
+    width: 8.2em;
+    height: 8.2em;
+    background-color: #fff;
+    margin: 0.5em 0em 0.5em 0.5em;
+    text-align: center;
+    vertical-align: middle;
+}
+.cloud-name {
+    font-size:14px;
+    margin-top: .5em;
+    font-weight: 400;
+}
+.cloud-menu-popover {
+    position: relative;
+    float: right;
+    padding: 0px 8px;
+    background-color: transparent;
+    background-image: none;
+    border: 1px solid transparent;
+    border-radius: 4px;
+    color: #fff;
+    cursor: pointer;
+}
+#cloud-menu-popover-xs {
+    color: #fff;
+    line-height:24px;
+    border: none;
+    margin-right: 15px!important;
+}
+.navbar-toggle{
+    border:none;
+    border-radius: 0px;
+}
+.navbar-header .popover {
+    border-radius: 0px;
+    width: 21em;
+    max-width:32em;
+    background-color: #006690;
+}
+.navbar-header .popover .popover-content{
+    padding:0px;
+}
+.cloud-menu .popover-content {
+    padding: 0px;
+}
+.cloud-actions {
+    background-color: #005578;
+    float: left;
+    position: absolute;
+    width: 100%;
+    left: 0px;
+    overflow:hidden;
+}
+.cloud-actions h3 {
+    font-size: 16px;
+    font-weight: 400;
+    padding-left: 14px;
+    margin-top: 10px;
+}
+.cloud-block-invert {
+    color: #fff;
+    float: left;
+    width: 8.2em;
+    height: 8.2em;
+    background-color: #1f1f1f;
+    margin: 0.5em 0em 0.5em 0.5em;
+    text-align: center;
+    cursor: pointer;
+}
+
+.cloud-block-default {
+    color: #006690;
+    background-color: #fff;
+    cursor: pointer;
+}
+.cloud-actions a:hover {
+    color: #d7d5d5;
+    background-color: #3d3d3d;
+    text-decoration: none
+}
+.cloud-apps a {
+    text-decoration: none;
+    color: #006690 !important;
+    cursor: pointer
+}
+.cloud-apps a:hover {
+    text-decoration: none;
+    color: #006690;
+    background-color: #c5c5c5;
+}
+.cloud-apps .cloud-actions a {
+    color: #fff
+}
+
+.add-padding-top-3x {
+    padding-top: 15px !important;
+}
+
+.nav li a{
+    color: #fff;
+}
+
+.cloud-menu-content li a{
+    color:inherit;
+}
+
+html{
+    height: 100%;
+}
+
+body{
+    height: calc(100% - 50px);
+}
--- a/modules/distribution/src/core/cloud/portal/global-navigation.jag
+++ b/modules/distribution/src/core/cloud/portal/global-navigation.jag
@ -0,0 +1,289 @@
+<%
+/*
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+%>
+<%
+var query = request.getQueryString();
+var dest = encodeURIComponent(originalURI + (query ? '?' + query : ''));
+%>
+<header class="header header-default">
+    <div class="container-fluid">
+        <div class="pull-left brand float-remove-xs text-center-xs">
+            <a href="<%=tenantedUrlPrefix%>./dashboards">
+                <img src="<%=urlPrefix%>libs/theme-wso2_1.0/images/logo-inverse.svg" alt="WSO2" title="WSO2" class="logo">
+                <h1>Cloud</h1>
+            </a>
+        </div>
+        <div class="pull-right auth float-remove-xs text-center-xs">
+            <% if (user) { %>
+
+                <ul class="nav navbar-right float-remove-xs text-center-xs">
+
+                    <li class="visible-inline-block">
+                        <a href="#" target="_self" title="
+                        <%=user.domain%>
+                        ">
+                                        <span class="icon fw-stack fw-lg">
+                                            <i class="fw fw-organization fw-stack-1x" title=" {{@user.domain}}"></i>
+                                        </span>
+                            <span class="hidden-xs">
+                                <%=user.domain%>
+                            </span>
+
+                        </a>
+                    </li>
+
+                    <li class="visible-inline-block">
+
+                        <a href="#" target="_blank" class="dropdown" data-toggle="dropdown" title="Account">
+
+                                    <span class="icon fw-stack fw-lg" style="color: red">
+                                        <i class="fw fw-resource fw-stack-1x" title="Account"></i>
+                                    </span>
+                            <span class="hidden-xs" style="color: red">
+                                        Trial – 14 days to upgrade
+                                    </span>
+
+                            <span class="caret"></span>
+                        </a>
+
+                        <ul class="dropdown-menu dropdown-menu-right float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown"
+                            role="menu">
+
+                            <li>
+                                <a title="Upgrade Now"
+                                   href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/payment-plans.jag?cloud-type=device_cloud"
+                                   target="_self">
+                                    <i class="fw fw-export" title="Upgrade Now"></i> Upgrade Now
+                                </a>
+                            </li>
+
+                            <li>
+                                <a title="Monetization"
+                                   href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/monetization-dashboard.jag"
+                                   target="_self">
+                                    <i class="fa fa-money fa-lg" title="Monetization"></i> Monetization
+                                </a>
+                            </li>
+
+                            <li>
+                                <a title="Request Extension"
+                                   href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/contact-us.jag?cloud-type=device_cloud&amp;request-extension=true"
+                                   target="_blank">
+                                    <i class="fw fw-mail" title="Request Extension"></i> Request Extension
+                                </a>
+                            </li>
+
+                        </ul>
+                    </li>
+
+                    <li class="visible-inline-block">
+
+                        <a href="#" target="null" class="dropdown" data-toggle="dropdown" title="App Management">
+                                    <span class="icon fw-stack fw-lg">
+                                        <i class="fw fw-settings fw-stack-1x" title="App Management"></i>
+                                    </span>
+                            <span class="hidden-xs">
+                                        App Management
+                            </span>
+                            <span class="caret"></span>
+                        </a>
+
+                        <ul class="dropdown-menu dropdown-menu-right float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown"
+                            role="menu">
+                            <li class="visible-inline-block">
+                                <a title="Mobile App Publisher" href="https://devicemgt.clouddev.wso2.com/publisher"
+                                   target="_self">
+                                    <i class="fw fw-user" title="Mobilr App Publisher"></i> App Publisher
+                                </a>
+                            </li>
+
+                            <li class="visible-inline-block">
+                                <a title="App Store " href="https://devicemgt.clouddev.wso2.com/store"
+                                   target="_self">
+                                    <i class="fw fw-store" title="App Store"></i> App Store
+                                </a>
+                            </li>
+
+                        </ul>
+                    </li>
+
+                    <li class="visible-inline-block">
+                        <a href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/contact-us.jag" target="_self"
+                           title="Support">
+
+
+                                    <span class="icon fw-stack fw-lg" style="color: #ff8c27;">
+                                        <i class="fw fw-mail fw-stack-1x" title="Support"></i>
+                                    </span>
+                            <span class="hidden-xs" style="color: #ff8c27;">
+                                        Support
+                                    </span>
+
+                        </a>
+                    </li>
+
+                    <li class="visible-inline-block">
+
+                        <a href="#" target="null" class="dropdown" data-toggle="dropdown" title="Documentation">
+                                    <span class="icon fw-stack fw-lg">
+                                        <i class="fw fw-document fw-stack-1x" title="Documentation"></i>
+                                    </span>
+                            <span class="hidden-xs">
+                                        Documentation
+                                    </span>
+                            <span class="caret"></span>
+                        </a>
+
+                        <ul class="dropdown-menu dropdown-menu-right float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown"
+                            role="menu">
+
+                            <li>
+                                <a title="API Cloud"
+                                   href="https://docs.wso2.com/display/APICloud/WSO2+API+Cloud+Documentation"
+                                   target="_blank">
+                                    <i class="fw fw-api" title="API Cloud"></i> API Cloud
+                                </a>
+                            </li>
+
+                            <li>
+                                <a title="App Cloud"
+                                   href="https://docs.wso2.com/display/AppCloud/WSO2+App+Cloud+Documentation"
+                                   target="_blank">
+                                    <i class="fw fw-application" title="App Cloud"></i> App Cloud
+                                </a>
+                            </li>
+
+                            <li>
+                                <a title="App Cloud"
+                                   href="https://docs.wso2.com/display/AppCloud/WSO2+Device+Cloud+Documentation"
+                                   target="_blank">
+                                    <i class="fw fw-application" title="App Cloud"></i> Device Cloud
+                                </a>
+                            </li>
+
+                            <li>
+                                <a title="API Cloud Walkthrough"
+                                   href="https://api.clouddev.wso2.com/publisher?interactiveTutorial=true"
+                                   target="_self">
+                                    <i class="fw fw-document" title="API Cloud Walkthrough"></i> API Cloud Walkthrough
+                                </a>
+                            </li>
+
+                        </ul>
+                    </li>
+
+                    <li class="visible-inline-block">
+                        <a href="#" class="dropdown" data-toggle="dropdown" title="user">
+                                    <span class="icon fw-stack fw-lg">
+                                        <i class="fw fw-circle-outline fw-stack-2x" title="User"></i>
+                                        <i class="fw fw-user fw-stack-1x" title="User"></i>
+                                    </span>
+                        <span class="hidden-xs">
+                               <%=user.username%></span><span class="caret"></span>
+                        </a>
+                        <ul class="dropdown-menu dropdown-menu-right float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown"
+                            role="menu">
+
+                            <li>
+                                <a title="Profile"
+                                   href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/user-profile.jag"
+                                   target="_self">
+                                    <i class="fw fw-user" title="Profile"></i> Profile
+                                </a>
+                            </li>
+
+                            <li>
+                                <a title="Change Password"
+                                   href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/change-password.jag"
+                                   target="_self">
+                                    <i class="fw fw-lock" title="Change Password"></i> Change Password
+                                </a>
+                            </li>
+
+                            <li>
+                                <a title="Logout" href="https://api.clouddev.wso2.com/publisher/site/pages/logout.jag"
+                                   target="_self">
+                                    <i class="fw fw-sign-out" title="Logout"></i> Logout
+                                </a>
+                            </li>
+
+                        </ul>
+                    </li>
+                    <li class="visible-inline-block cloud-menu">
+                        <a href="#" id="cloud-menu-popover">
+                                    <span class="icon fw-stack fw-lg">
+                                        <i class="fw fw-tiles fw-stack-1x" data-toggle="popover" data-placement="bottom"
+                                           data-original-title="" title=""></i>
+                                    </span>
+                            <span class="hidden-xs">
+
+                                    </span>
+                        </a>
+                    </li>
+                </ul>
+            </div>
+            <% } else { %>
+            <a href="<%=urlPrefix%>login?destination=<%=dest%>" class="dropdown" data-toggle="dropdown">
+                <%= i18n.localize("login.label")%>
+            </a>
+            <% } %>
+        </div>
+
+
+<div class="cloud-menu-content hide">
+    <div id="popover-head" class="hide">Navigate to Cloud</div>
+    <div id="popover-content" class="hide">
+        <div class="cloud-apps">
+
+            <a href="https://api.cloud.wso2.com/publisher" target="_self" class="cloud-block add-padding-top-3x">
+                <i class="fw fw-api  fw-3x"></i>
+                <div class="cloud-name">API Cloud</div>
+            </a>
+
+            <a href="https://apps.cloud.wso2.com/appmgt" target="_self" class="cloud-block add-padding-top-3x">
+                <i class="fw fw-application fw-3x"></i>
+                <div class="cloud-name">App Cloud</div>
+            </a>
+
+            <a href="https://devicemgt.cloud.wso2.com/devicemgt" target="_self" class="cloud-block add-padding-top-3x">
+                <i class="fw fw-mobile fw-3x"></i>
+                <div class="cloud-name">Device Cloud</div>
+            </a>
+
+            <div class="clearfix"></div><!-- to make seperate -->
+        </div>
+        <div class="cloud-actions">
+            <h3>Manage your cloud</h3>
+
+            <a href="https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/organization.jag" target="_self" class="cloud-block-invert add-padding-top-3x">
+                <i class="fw fw-organization  fw-3x"></i>
+                <div class="cloud-name">Organization</div>
+            </a>
+
+            <a href="https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/user.jag" target="_self" class="cloud-block-invert add-padding-top-3x">
+                <i class="fa fa-users  fa-3x"></i>
+                <div class="cloud-name">Members</div>
+            </a>
+
+        </div>
+    </div>
+</div>
+
+
+
+    </div>
+</header>
--- a/modules/distribution/src/core/cloud/portal/portal.js
+++ b/modules/distribution/src/core/cloud/portal/portal.js
@ -0,0 +1,204 @@
+/*
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+$(function () {
+
+    var dashboardsApi = ues.utils.tenantPrefix() + 'apis/dashboards';
+    var dashboards = [];
+    var isStillLoading = false;
+    var nextStart = 0;
+    var hasMore = true;
+
+    /**
+     * Page count.
+     * @const
+     */
+    var PAGE_COUNT = 10;
+
+    // Pre-compiling handlebar templates
+    var dashboardsListHbs = Handlebars.compile($("#ues-dashboards-list-hbs").html());
+    var dashboardThumbnailHbs = Handlebars.compile($("#ues-dashboard-thumbnail-hbs").html());
+    var dashboardConfirmHbs = Handlebars.compile($("#ues-dashboard-confirm-hbs").html());
+    var dashboardsEmptyHbs = Handlebars.compile($("#ues-dashboards-empty-hbs").html());
+    Handlebars.registerPartial('ues-dashboard-thumbnail-hbs', dashboardThumbnailHbs);
+
+    /**
+     * Find the dashboard using dashboard id.
+     * @param id
+     * @return {object}
+     * @private
+     * */
+    var findDashboard = function (id) {
+        var i;
+        var dashboard;
+        var length = dashboards.length;
+        for (i = 0; i < length; i++) {
+            dashboard = dashboards[i];
+            if (dashboard.id === id) {
+                return dashboard;
+            }
+        }
+    };
+
+    /**
+     * Delete the selected dashboard
+     * @param el:-selected dashboard element
+     * @private
+     * */
+    var deleteDashboard = function (el) {
+        var button = Ladda.create(el[0]);
+        button.start();
+        var id = el.closest('.ues-dashboard').data('id');
+        $.ajax({
+            url: dashboardsApi + '/' + id,
+            method: 'DELETE',
+            async : false,
+            success: function () {
+                button.stop();
+                location.reload();
+            },
+            error: function () {
+                button.stop();
+            }
+        });
+    };
+
+    /**
+     * Load the list of dashboards available.
+     * @private
+     * */
+    var loadDashboards = function () {
+        isStillLoading = true;
+
+        if (!hasMore) {
+            isStillLoading = false;
+            $('.ues-dashboard').each(function (i, obj) {
+                if ($(this).find('.ues-dashboard-share').length) {
+                    $(this).addClass("shared");
+                }
+            });
+            return;
+        }
+        ues.store.assets('dashboard', {
+            start: nextStart,
+            count: PAGE_COUNT
+        }, function (err, data) {
+            var dashboardsEl = $('#ues-portal').find('.ues-dashboards');
+            hasMore = data.length;
+            if (!hasMore && nextStart === 0) {
+                dashboardsEl.append(dashboardsEmptyHbs());
+                return;
+            }
+
+            nextStart += PAGE_COUNT;
+            dashboards = dashboards.concat(data);
+            dashboardsEl.append(dashboardsListHbs(data));
+
+            var win = $(window);
+            var doc = $(document);
+            isStillLoading = false;
+            if (doc.height() > win.height()) {
+                return;
+            }
+
+            loadDashboards();
+
+            $(".disable").on('click', function (event) {
+                event.preventDefault();
+            });
+        });
+    };
+
+    /**
+     * Initialize the UI functionality such as binding events.
+     * @private
+     * */
+    var initUI = function () {
+        var portal = $('#ues-portal');
+        portal.on('click', '.ues-dashboards .ues-dashboard-trash-handle', function (e) {
+            e.preventDefault();
+            var thiz = $(this);
+            var dashboardEl = thiz.closest('.ues-dashboard');
+            var id = dashboardEl.data('id');
+            var dashboard = findDashboard(id);
+            dashboardEl.html(dashboardConfirmHbs(dashboard));
+        });
+
+        portal.on('click', '.ues-dashboards .ues-dashboard-trash-confirm', function (e) {
+            e.preventDefault();
+            deleteDashboard($(this));
+        });
+
+        portal.on('click', '.ues-dashboards .ues-dashboard-trash-cancel', function (e) {
+            e.preventDefault();
+            var thiz = $(this);
+            var dashboardEl = thiz.closest('.ues-dashboard');
+            var id = dashboardEl.data('id');
+            var dashboard = findDashboard(id);
+            dashboardEl.html(dashboardThumbnailHbs(dashboard));
+        });
+        
+        portal.on('click', '.ues-view:not(.disable)', function(e) {
+            e.preventDefault();
+            window.open($(this).attr('href'), '_blank');
+        });
+
+        $('#filter-dashboards a').on('click', function () {
+            $('#filter').html($(this).text());
+            var filter = $(this).data('filter');
+
+            $('.ues-dashboard-container').each(function (i, obj) {
+                if (filter === "All") {
+                    $(this).show();
+                } else {
+                    if ($(this).find('.ues-dashboard-share').length) {
+                        filter === "Shared" ? $(this).show() : $(this).hide();
+                    } else {
+                        filter === "Shared" ? $(this).hide() : $(this).show();
+                    }
+                }
+            });
+        });
+
+        $(window).scroll(function () {
+            var win = $(window);
+            var doc = $(document);
+            if (win.scrollTop() + win.height() < doc.height() - 100) {
+                return;
+            }
+
+            if (!isStillLoading) {
+                loadDashboards();
+            }
+        });
+    };
+
+
+    $(document).ready(function () {
+        $('#cloud-menu-popover i.fw-tiles').popover({
+            html: true,
+            trigger:'click',
+            title: function() {
+                return $("#popover-head").html();
+            },
+            content: function() {
+                return $("#popover-content").html();
+            }
+        });
+    });
+
+    initUI();
+    loadDashboards();
+});
--- a/modules/distribution/src/core/conf/analytics/analytics-data-config.xml
+++ b/modules/distribution/src/core/conf/analytics/analytics-data-config.xml
@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) 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
+~
+~    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.
+-->
+
+<AnalyticsDataConfiguration>
+
+    <!--Mode can be either as LOCAL, REMOTE or AUTO. If LOCAL mode is configured the analytics api will lookup -->
+    <!--necessary services within the the same node, and will invoke then directly without going through network.-->
+    <!--But If the current node is a light weight node, and doesn't have analytics data services, -->
+    <!--then the mode should be configured as REMOTE. If AUTO mode is configured, based on the data service availability
+    it will automatically switch the mode with LOCAL and REMOTE -->
+
+    <Mode>AUTO</Mode>
+
+    <!--Note: The following parameters will be used only when the mode is configured to REMOTE.-->
+
+    <!--The URL of the analytics data service is being hosted-->
+
+    <URL>http://localhost:9765</URL>
+
+    <!-- A valid user name which have necessary permissions to use the remote services -->
+
+    <Username>admin</Username>
+
+    <!--A valid password of the user provided above. You also can use secure vault, if you don't want to configure -->
+    <!--the plain text password here.-->
+
+    <Password>admin</Password>
+
+    <!--The maximum number of connections made from this node to the remote instances to perform the operations.-->
+
+    <MaxConnections>200</MaxConnections>
+
+    <!--The maximum number of connections per given route from this node to the remote instances to perform the operations.-->
+
+    <MaxConnectionsPerRoute>200</MaxConnectionsPerRoute>
+
+    <!--The socket connection timeout when trying to connect the remote service-->
+
+    <SocketConnectionTimeout>60000</SocketConnectionTimeout>
+
+    <!--The connection timeout when trying to connect the remote service-->
+
+    <ConnectionTimeout>60000</ConnectionTimeout>
+
+    <!--The path of the trust store location, it will be used if the connection URL is in HTTPS protocol.
+    If it is not configured, and the client is running from wso2 carbon environment, then by default the trust
+    store configured from carbon.xml will be picked.-->
+
+    <!--<TrustStoreLocation>repository/resources/security/client-truststore.jks</TrustStoreLocation>-->
+
+    <!-- The password of the above mentioned trust store, it will be used if the connection URL is in HTTPS protocol.
+    If it is not configured,and the client is running from wso2 carbon environment, then by default the trust store
+    configured from carbon.xml will be picked.-->
+
+    <!--<TrustStorePassword>wso2carbon</TrustStorePassword>-->
+
+</AnalyticsDataConfiguration>
--- a/modules/distribution/src/core/conf/api-manager.xml
+++ b/modules/distribution/src/core/conf/api-manager.xml
@ -0,0 +1,543 @@
+<APIManager>
+    <!-- JNDI name of the data source to be used by the API publisher, API store and API
+         key manager. This data source should be defined in the master-datasources.xml file
+         in conf/datasources directory. -->
+    <DataSourceName>jdbc/WSO2AM_DB</DataSourceName>
+
+    <!-- This parameter is used when adding api management capability to other products like GReg, AS, DSS etc.-->
+    <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.-->
+    <EnableSecureVault>false</EnableSecureVault>
+
+    <!-- Authentication manager configuration for API publisher and API store. This is
+         a required configuration for both web applications as their user authentication
+         logic relies on this. -->
+    <AuthManager>
+        <!-- Server URL of the Authentication service -->
+        <ServerURL>https://localhost:${mgt.transport.https.port}${carbon.context}services/</ServerURL>
+        <!-- Admin username for the Authentication manager. -->
+        <Username>${admin.username}</Username>
+        <!-- Admin password for the Authentication manager. -->
+        <Password>${admin.password}</Password>
+        <!-- Indicates whether the permissions checking of the user (on the Publisher and Store) should be done
+           via a remote service. The check will be done on the local server when false. -->
+        <CheckPermissionsRemotely>false</CheckPermissionsRemotely>
+    </AuthManager>
+
+    <JWTConfiguration>
+        <!-- Enable/Disable JWT generation. Default is false. -->
+        <EnableJWTGeneration>true</EnableJWTGeneration>
+
+        <!-- Name of the security context header to be added to the validated requests. -->
+        <JWTHeader>X-JWT-Assertion</JWTHeader>
+
+        <!-- Fully qualified name of the class that will retrieve additional user claims
+             to be appended to the JWT. If not specified no claims will be appended.If user wants to add all user claims in the
+             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-->
+
+        <!-- The dialectURI under which the claimURIs that need to be appended to the
+             JWT are defined. Not used with custom ClaimsRetriever implementations. The
+             same value is used in the keys for appending the default properties to the
+             JWT. -->
+        <ConsumerDialectURI>http://wso2.org/claims</ConsumerDialectURI>
+
+        <!-- Signature algorithm. Accepts "SHA256withRSA" or "NONE". To disable signing explicitly specify "NONE". -->
+        <SignatureAlgorithm>SHA256withRSA</SignatureAlgorithm>
+
+        <!-- This parameter specifies which implementation should be used for generating the Token. JWTGenerator is the
+	     default implementation provided. -->
+        <!--JWTGeneratorImpl>org.wso2.carbon.apimgt.keymgt.token.JWTGenerator</JWTGeneratorImpl-->
+
+        <!-- This parameter specifies which implementation should be used for generating the Token. For URL safe JWT
+             Token generation the implementation is provided in URLSafeJWTGenerator -->
+        <!--<JWTGeneratorImpl>org.wso2.carbon.apimgt.keymgt.token.URLSafeJWTGenerator</JWTGeneratorImpl>-->
+
+        <!-- Remove UserName from JWT Token -->
+        <!-- <RemoveUserNameFromJWTForApplicationToken>true</RemoveUserNameFromJWTForApplicationToken>-->
+    </JWTConfiguration>
+
+    <!-- Primary/secondary login configuration for APIstore. If user likes to keep two login attributes in a distributed setup, to login the APIstore,
+		he should configure this section. Primary login doesn't have a claimUri associated with it. But secondary login, which is a claim attribute,
+		is associated with a claimuri.-->
+    <!--LoginConfig>
+            <UserIdLogin  primary="true">
+        <ClaimUri></ClaimUri>
+        </UserIdLogin>
+        <EmailLogin  primary="false">
+            <ClaimUri>http://wso2.org/claims/emailaddress</ClaimUri>
+        </EmailLogin>
+    </LoginConfig-->
+
+    <!-- Credentials for the API gateway admin server. This configuration
+         is mainly used by the API publisher and store to connect to the API gateway and
+         create/update published API configurations. -->
+    <APIGateway>
+        <!-- The environments to which an API will be published -->
+        <Environments>
+            <!-- Environments can be of different types. Allowed values are 'hybrid', 'production' and 'sandbox'.
+                 An API deployed on a 'production' type gateway will only support production keys
+                 An API deployed on a 'sandbox' type gateway will only support sandbox keys
+                 An API deployed on a 'hybrid' type gateway will support both production and sandbox keys. -->
+            <!-- api-console element specifies whether the environment should be listed in API Console or not -->
+            <Environment type="hybrid" api-console="true">
+                <Name>Production and Sandbox</Name>
+                <Description>This is a hybrid gateway that handles both production and sandbox token traffic.</Description>
+                <!-- Server URL of the API gateway -->
+                <ServerURL>https://localhost:${mgt.transport.https.port}${carbon.context}services/</ServerURL>
+                <!-- Admin username for the API gateway. -->
+                <Username>${admin.username}</Username>
+                <!-- Admin password for the API gateway.-->
+                <Password>${admin.password}</Password>
+                <!-- Endpoint URLs for the APIs hosted in this API gateway.-->
+                <GatewayEndpoint>http://${carbon.local.ip}:${http.nio.port},https://${carbon.local.ip}:${https.nio.port}</GatewayEndpoint>
+            </Environment>
+        </Environments>
+    </APIGateway>
+
+    <CacheConfigurations>
+        <!-- Enable/Disable token caching at the Gateway-->
+        <EnableGatewayTokenCache>true</EnableGatewayTokenCache>
+        <!-- Enable/Disable API resource caching at the Gateway-->
+        <EnableGatewayResourceCache>true</EnableGatewayResourceCache>
+        <!-- Enable/Disable API key validation information caching at key-management server -->
+        <EnableKeyManagerTokenCache>false</EnableKeyManagerTokenCache>
+        <!-- This parameter specifies whether Recently Added APIs will be loaded from the cache or not.
+             If there are multiple API modification during a short time period, better to disable cache. -->
+        <EnableRecentlyAddedAPICache>false</EnableRecentlyAddedAPICache>
+        <!-- JWT claims Cache expiry in seconds -->
+        <!--JWTClaimCacheExpiry>900</JWTClaimCacheExpiry-->
+        <!-- Expiry time for the apim key mgt validation info cache -->
+        <!--TokenCacheExpiry>900</TokenCacheExpiry-->
+        <!-- This parameter specifies the expiration time of the TagCache. TagCache will
+             only be created when this element is uncommented. When the specified
+             time duration gets elapsed ,tag cache will get re-generated. -->
+        <!--TagCacheDuration>120000</TagCacheDuration-->
+    </CacheConfigurations>
+
+    <!--
+        API usage tracker configuration used by the DAS data publisher and
+        Google Analytics publisher in API gateway.
+    -->
+    <Analytics>
+        <!-- Enable Analytics for API Manager -->
+        <Enabled>false</Enabled>
+
+        <!-- Server URL of the remote DAS/CEP server used to collect statistics. Must
+             be specified in protocol://hostname:port/ format.
+
+             An event can also be published to multiple Receiver Groups each having 1 or more receivers. Receiver
+             Groups are delimited by curly braces whereas receivers are delimited by commas.
+             Ex - Multiple Receivers within a single group
+             tcp://localhost:7612/,tcp://localhost:7613/,tcp://localhost:7614/
+
+             Ex - Multiple Receiver Groups with two receivers each
+             {tcp://localhost:7612/,tcp://localhost:7613},{tcp://localhost:7712/,tcp://localhost:7713/} -->
+        <DASServerURL>{tcp://localhost:7612}</DASServerURL>
+        <!--DASAuthServerURL>{ssl://localhost:7712}</DASAuthServerURL-->
+        <!-- Administrator username to login to the remote DAS server. -->
+        <DASUsername>${admin.username}</DASUsername>
+        <!-- Administrator password to login to the remote DAS server. -->
+        <DASPassword>${admin.password}</DASPassword>
+
+        <!-- For APIM implemented Statistic client for RDBMS -->
+        <StatsProviderImpl>org.wso2.carbon.apimgt.usage.client.impl.APIUsageStatisticsRdbmsClientImpl</StatsProviderImpl>
+
+        <!-- DAS REST API configuration -->
+        <DASRestApiURL>https://localhost:9444</DASRestApiURL>
+        <DASRestApiUsername>${admin.username}</DASRestApiUsername>
+        <DASRestApiPassword>${admin.password}</DASRestApiPassword>
+
+        <!-- Below property is used to skip trying to connect to event receiver nodes when publishing events even if
+            the stats enabled flag is set to true. -->
+        <SkipEventReceiverConnection>false</SkipEventReceiverConnection>
+
+        <!-- API Usage Data Publisher. -->
+        <PublisherClass>org.wso2.carbon.apimgt.usage.publisher.APIMgtUsageDataBridgeDataPublisher</PublisherClass>
+
+        <!-- If below property set to true,then the response message size will be calculated and publish
+             with each successful API invocation event. -->
+        <PublishResponseMessageSize>false</PublishResponseMessageSize>
+        <!-- Data publishing stream names and versions of API requests, responses and faults. If the default values
+            are changed, the toolbox also needs to be changed accordingly. -->
+        <Streams>
+            <Request>
+                <Name>org.wso2.apimgt.statistics.request</Name>
+                <Version>1.1.0</Version>
+            </Request>
+            <Response>
+                <Name>org.wso2.apimgt.statistics.response</Name>
+                <Version>1.1.0</Version>
+            </Response>
+            <Fault>
+                <Name>org.wso2.apimgt.statistics.fault</Name>
+                <Version>1.0.0</Version>
+            </Fault>
+            <Throttle>
+                <Name>org.wso2.apimgt.statistics.throttle</Name>
+                <Version>1.0.0</Version>
+            </Throttle>
+            <Workflow>
+                <Name>org.wso2.apimgt.statistics.workflow</Name>
+                <Version>1.0.0</Version>
+            </Workflow>
+            <ExecutionTime>
+                <Name>org.wso2.apimgt.statistics.execution.time</Name>
+                <Version>1.0.0</Version>
+            </ExecutionTime>
+            <AlertTypes>
+                <Name>org.wso2.analytics.apim.alertStakeholderInfo</Name>
+                <Version>1.0.0</Version>
+            </AlertTypes>
+        </Streams>
+
+    </Analytics>
+
+    <!--
+        API key validator configuration used by API key manager (IS), API store and API gateway.
+        API gateway uses it to validate and authenticate users against the provided API keys.
+    -->
+    <APIKeyValidator>
+        <!-- Server URL of the API key manager -->
+        <ServerURL>https://${carbon.local.ip}:${mgt.transport.https.port}${carbon.context}services/</ServerURL>
+
+        <!-- Admin username for API key manager. -->
+        <Username>${admin.username}</Username>
+        <!-- Admin password for API key manager. -->
+        <Password>${admin.password}</Password>
+
+        <!-- Configurations related to enable thrift support for key-management related communication.
+             If you want to switch back to Web Service Client, change the value of "KeyValidatorClientType" to "WSClient".
+             In a distributed environment;
+             -If you are at the Gateway node, you need to point "ThriftClientPort" value to the "ThriftServerPort" value given at KeyManager node.
+             -If you need to start two API Manager instances in the same machine, you need to give different ports to "ThriftServerPort" value in two nodes.
+             -ThriftServerHost - Allows to configure a hostname for the thrift server. It uses the carbon hostname by default.
+	         -The Gateway uses this parameter to connect to the key validation thrift service. -->
+        <KeyValidatorClientType>WSClient</KeyValidatorClientType>
+        <ThriftClientConnectionTimeOut>10000</ThriftClientConnectionTimeOut>
+        <!--ThriftClientPort>10397</ThriftClientPort-->
+
+        <EnableThriftServer>false</EnableThriftServer>
+        <ThriftServerHost>localhost</ThriftServerHost>
+        <!--ThriftServerPort>10397</ThriftServerPort-->
+
+        <!--ConnectionPool>
+            <MaxIdle>100</MaxIdle>
+            <InitIdleCapacity>50</InitIdleCapacity>
+        </ConnectionPool-->
+        <!-- Specifies the implementation to be used for KeyValidationHandler. Steps for validating a token can be controlled by plugging in a 
+             custom KeyValidation Handler -->
+        <KeyValidationHandlerClassName>org.wso2.carbon.apimgt.keymgt.handlers.DefaultKeyValidationHandler</KeyValidationHandlerClassName>
+    </APIKeyValidator>
+
+    <!-- Uncomment this section only if you are going to have an instance other than KeyValidator as your KeyManager.
+         Unless a ThirdParty KeyManager is used, you don't need to configure this section. -->
+    <!--APIKeyManager>
+        <KeyManagerClientImpl>org.wso2.carbon.apimgt.keymgt.AMDefaultKeyManagerImpl</KeyManagerClientImpl>
+        <Configuration>
+            <ServerURL>https://localhost:${mgt.transport.https.port}${carbon.context}services/</ServerURL>
+            <Username>${admin.username}</Username>
+            <Password>${admin.password}</Password>
+            <TokenURL>https://${carbon.local.ip}:${https.nio.port}/token</TokenURL>
+            <RevokeURL>https://${carbon.local.ip}:${https.nio.port}/revoke</RevokeURL>
+        </Configuration>
+    </APIKeyManager-->
+
+    <OAuthConfigurations>
+        <!-- Remove OAuth headers from outgoing message. -->
+        <!--RemoveOAuthHeadersFromOutMessage>true</RemoveOAuthHeadersFromOutMessage-->
+        <!-- Scope used for marking Application Tokens. If a token is generated with this scope, they will be treated as Application Access Tokens -->
+        <ApplicationTokenScope>am_application_scope</ApplicationTokenScope>
+        <!-- All  scopes under the ScopeWhitelist element are not validating against roles that has assigned to it.
+             By default ^device_.* and openid scopes have been white listed internally. -->
+        <ScopeWhitelist>
+            <Scope>^device_.*</Scope>
+            <!--<Scope>openid</Scope>-->
+        </ScopeWhitelist>
+        <!-- Name of the token API -->
+        <TokenEndPointName>/oauth2/token</TokenEndPointName>
+        <!-- This the API URL for revoke API. When we revoke tokens revoke requests should go through this
+             API deployed in API gateway. Then it will do cache invalidations related to revoked tokens.
+             In distributed deployment we should configure this property in key manager node by pointing
+             gateway https( /http, we recommend users to use 'https' endpoints for security purpose) url.
+             Also please note that we should point gateway revoke service to key manager -->
+        <RevokeAPIURL>https://localhost:${https.nio.port}/revoke</RevokeAPIURL>
+        <!-- Whether to encrypt tokens when storing in the Database
+        Note: If changing this value to true, change the value of <TokenPersistenceProcessor> to
+        org.wso2.carbon.identity.oauth.tokenprocessor.EncryptionDecryptionPersistenceProcessor in the identity.xml -->
+        <EncryptPersistedTokens>false</EncryptPersistedTokens>
+    </OAuthConfigurations>
+
+    <!-- Settings related to managing API access tiers. -->
+    <TierManagement>
+        <!-- Enable the providers to expose their APIs over the special 'Unlimited' tier which
+             basically disables tier based throttling for the specified APIs. -->
+        <EnableUnlimitedTier>true</EnableUnlimitedTier>
+    </TierManagement>
+
+    <!-- API Store Related Configurations -->
+    <APIStore>
+        <!--GroupingExtractor>org.wso2.carbon.apimgt.impl.DefaultGroupIDExtractorImpl</GroupingExtractor-->
+        <!--This property is used to indicate how we do user name comparision for token generation https://wso2.org/jira/browse/APIMANAGER-2225-->
+        <CompareCaseInsensitively>true</CompareCaseInsensitively>
+        <DisplayURL>false</DisplayURL>
+        <URL>https://localhost:${mgt.transport.https.port}/store</URL>
+
+        <!-- Server URL of the API Store. -->
+        <ServerURL>https://localhost:${mgt.transport.https.port}${carbon.context}services/</ServerURL>
+        <!-- Admin username for API Store. -->
+        <Username>${admin.username}</Username>
+
+        <!-- Admin password for API Store. -->
+        <Password>${admin.password}</Password>
+        <!-- This parameter specifies whether to display multiple versions of same
+             API or only showing the latest version of an API. -->
+        <DisplayMultipleVersions>false</DisplayMultipleVersions>
+        <!-- This parameter specifies whether to display all the APIs
+             [which are having DEPRECATED/PUBLISHED status] or only display the APIs
+             with having their status is as 'PUBLISHED' -->
+        <DisplayAllAPIs>false</DisplayAllAPIs>
+        <!-- Uncomment this to limit the number of APIs in api the API Store -->
+        <!--APIsPerPage>5</APIsPerPage-->
+
+        <!-- This parameter specifies whether to display the comment editing facility or not.
+             Default is "true". If user wants to disable, he must set this param as "false" -->
+        <DisplayComments>true</DisplayComments>
+
+        <!-- This parameter specifies whether to display the ratings  or not.
+             Default is "true". If user wants to disable, he must set this param as "false" -->
+        <DisplayRatings>true</DisplayRatings>
+
+        <!--set isStoreForumEnabled to false for disable forum in store-->
+        <!--isStoreForumEnabled>false</isStoreForumEnabled-->
+    </APIStore>
+
+    <APIPublisher>
+        <DisplayURL>false</DisplayURL>
+        <URL>https://localhost:${mgt.transport.https.port}/publisher</URL>
+        <!-- This parameter specifies enabling the capability of setting API documentation level granular visibility levels.
+             By default any document associate with an API will have the same permissions set as the API.With enabling below
+             property,it will show two additional permission levels as visible only to all registered users in a particular
+             domain or only visible to API doc creator -->
+        <!--EnableAPIDocVisibilityLevels>true</EnableAPIDocVisibilityLevels-->
+        <!-- Uncomment this to limit the number of APIs in api the API Publisher -->
+        <!--APIsPerPage>30</APIsPerPage-->
+    </APIPublisher>
+
+    <!-- Status observers can be registered against the API Publisher to listen for
+         API status update events. Each observer must implement the APIStatusObserver
+         interface. Multiple observers can be engaged if necessary and in such situations
+         they will be notified in the order they are defined here. 
+         This configuration is unused from API Manager version 1.10.0 -->
+    <!--StatusObservers>
+        <Observer>org.wso2.carbon.apimgt.impl.observers.SimpleLoggingObserver</Observer>
+    </StatusObservers-->
+
+    <!-- Use this configuration Create APIs at the Server startup -->
+    <StartupAPIPublisher>
+        <!-- Enable/Disable the API Startup Publisher -->
+        <Enabled>false</Enabled>
+
+        <!-- Configuration to create APIs for local endpoints.
+             Endpoint will be computed as http://${carbon.local.ip}:${mgt.transport.http.port}/Context.
+             Define many LocalAPI elements as below to create many APIs
+             for local Endpoints.
+             IconPath should be relative to CARBON_HOME. -->
+        <LocalAPIs>
+            <LocalAPI>
+                <Context>/resource</Context>
+                <Provider>admin</Provider>
+                <Version>1.0.0</Version>
+                <IconPath>none</IconPath>
+                <DocumentURL>none</DocumentURL>
+                <AuthType>Any</AuthType>
+            </LocalAPI>
+        </LocalAPIs>
+
+        <!-- Configuration to create APIs for remote endpoints.
+             When Endpoint need to be defined use this configuration.
+             Define many API elements as below to create many APIs
+             for external Endpoints.
+             If you do not need to add Icon or Documentation set
+             'none' as the value for IconPath & DocumentURL. -->
+        <!--APIs>
+            <API>
+                <Context>/resource</Context>
+                <Endpoint>http://localhost:9764/resource</Endpoint>
+                <Provider>admin</Provider>
+                <Version>1.0.0</Version>
+                <IconPath>none</IconPath>
+                <DocumentURL>none</DocumentURL>
+                <AuthType>Any</AuthType>
+            </API>
+        </APIs-->
+    </StartupAPIPublisher>
+
+    <!-- Configuration to enable/disable sending CORS headers in the Gateway response
+         and define the Access-Control-Allow-Origin header value.-->
+    <CORSConfiguration>
+        <!-- Configuration to enable/disable sending CORS headers from the Gateway-->
+        <Enabled>true</Enabled>
+
+        <!-- The value of the Access-Control-Allow-Origin header. Default values are
+             API Store addresses, which is needed for swagger to function. -->
+        <Access-Control-Allow-Origin>*</Access-Control-Allow-Origin>
+
+        <!-- Configure Access-Control-Allow-Methods -->
+        <Access-Control-Allow-Methods>GET,PUT,POST,DELETE,PATCH,OPTIONS</Access-Control-Allow-Methods>
+
+        <!-- Configure Access-Control-Allow-Headers -->
+        <Access-Control-Allow-Headers>authorization,Access-Control-Allow-Origin,Content-Type,SOAPAction</Access-Control-Allow-Headers>
+
+        <!-- Configure Access-Control-Allow-Credentials -->
+        <!-- Specifying this header to true means that the server allows cookies (or other user credentials) to be included on cross-origin requests.
+             It is false by default and if you set it to true then make sure that the Access-Control-Allow-Origin header does not contain the wildcard (*) -->
+        <Access-Control-Allow-Credentials>false</Access-Control-Allow-Credentials>
+    </CORSConfiguration>
+
+    <!-- This property is there to configure velocity log output into existing Log4j carbon Logger.
+         You can enable this and set preferable Logger name. -->
+    <!-- VelocityLogger>VELOCITY</VelocityLogger -->
+
+    <RESTAPI>
+        <!--Configure white-listed URIs of REST API. Accessing white-listed URIs does not require credentials (does not require Authorization header). -->
+        <WhiteListedURIs>
+            <WhiteListedURI>
+                <URI>/api/am/publisher/{version}/swagger.json</URI>
+                <HTTPMethods>GET,HEAD</HTTPMethods>
+            </WhiteListedURI>
+            <WhiteListedURI>
+                <URI>/api/am/store/{version}/swagger.json</URI>
+                <HTTPMethods>GET,HEAD</HTTPMethods>
+            </WhiteListedURI>
+            <WhiteListedURI>
+                <URI>/api/am/admin/{version}/swagger.json</URI>
+                <HTTPMethods>GET,HEAD</HTTPMethods>
+            </WhiteListedURI>
+            <WhiteListedURI>
+                <URI>/api/am/store/{version}/apis</URI>
+                <HTTPMethods>GET,HEAD</HTTPMethods>
+            </WhiteListedURI>
+            <WhiteListedURI>
+                <URI>/api/am/store/{version}/apis/{apiId}</URI>
+                <HTTPMethods>GET,HEAD</HTTPMethods>
+            </WhiteListedURI>
+            <WhiteListedURI>
+                <URI>/api/am/store/{version}/apis/{apiId}/swagger</URI>
+                <HTTPMethods>GET,HEAD</HTTPMethods>
+            </WhiteListedURI>
+            <WhiteListedURI>
+                <URI>/api/am/store/{version}/apis/{apiId}/documents</URI>
+                <HTTPMethods>GET,HEAD</HTTPMethods>
+            </WhiteListedURI>
+            <WhiteListedURI>
+                <URI>/api/am/store/{version}/apis/{apiId}/documents/{documentId}</URI>
+                <HTTPMethods>GET,HEAD</HTTPMethods>
+            </WhiteListedURI>
+            <WhiteListedURI>
+                <URI>/api/am/store/{version}/apis/{apiId}/documents/{documentId}/content</URI>
+                <HTTPMethods>GET,HEAD</HTTPMethods>
+            </WhiteListedURI>
+            <WhiteListedURI>
+                <URI>/api/am/store/{version}/apis/{apiId}/thumbnail</URI>
+                <HTTPMethods>GET,HEAD</HTTPMethods>
+            </WhiteListedURI>
+            <WhiteListedURI>
+                <URI>/api/am/store/{version}/tags</URI>
+                <HTTPMethods>GET,HEAD</HTTPMethods>
+            </WhiteListedURI>
+            <WhiteListedURI>
+                <URI>/api/am/store/{version}/tiers/{tierLevel}</URI>
+                <HTTPMethods>GET,HEAD</HTTPMethods>
+            </WhiteListedURI>
+            <WhiteListedURI>
+                <URI>/api/am/store/{version}/tiers/{tierLevel}/{tierName}</URI>
+                <HTTPMethods>GET,HEAD</HTTPMethods>
+            </WhiteListedURI>
+        </WhiteListedURIs>
+    </RESTAPI>
+    <ThrottlingConfigurations>
+        <EnableAdvanceThrottling>false</EnableAdvanceThrottling>
+        <DataPublisher>
+            <Enabled>false</Enabled>
+            <Type>Binary</Type>
+            <ReceiverUrlGroup>tcp://${carbon.local.ip}:${receiver.url.port}</ReceiverUrlGroup>
+            <AuthUrlGroup>ssl://${carbon.local.ip}:${auth.url.port}</AuthUrlGroup>
+            <Username>${admin.username}</Username>
+            <Password>${admin.password}</Password>
+            <DataPublisherPool>
+                <MaxIdle>1000</MaxIdle>
+                <InitIdleCapacity>200</InitIdleCapacity>
+            </DataPublisherPool>
+            <DataPublisherThreadPool>
+                <CorePoolSize>200</CorePoolSize>
+                <MaxmimumPoolSize>1000</MaxmimumPoolSize>
+                <KeepAliveTime>200</KeepAliveTime>
+            </DataPublisherThreadPool>
+        </DataPublisher>
+        <PolicyDeployer>
+            <ServiceURL>https://localhost:${mgt.transport.https.port}${carbon.context}services/</ServiceURL>
+            <Username>${admin.username}</Username>
+            <Password>${admin.password}</Password>
+        </PolicyDeployer>
+        <BlockCondition>
+            <Enabled>false</Enabled>
+            <!--InitDelay>300000</InitDelay>
+            <Period>3600000</Period-->
+        </BlockCondition>
+        <JMSConnectionDetails>
+            <Enabled>false</Enabled>
+            <ServiceURL>tcp://${carbon.local.ip}:${jms.port}</ServiceURL>
+            <Username>${admin.username}</Username>
+            <Password>${admin.password}</Password>
+            <Destination>throttleData</Destination>
+            <!--InitDelay>300000</InitDelay-->
+            <JMSConnectionParameters>
+                <transport.jms.ConnectionFactoryJNDIName>TopicConnectionFactory</transport.jms.ConnectionFactoryJNDIName>
+                <transport.jms.DestinationType>topic</transport.jms.DestinationType>
+                <java.naming.factory.initial>org.wso2.andes.jndi.PropertiesFileInitialContextFactory</java.naming.factory.initial>
+                <connectionfactory.TopicConnectionFactory>amqp://${jms.username}:${jms.password}@clientid/carbon?brokerlist='${jms.url}'</connectionfactory.TopicConnectionFactory>
+            </JMSConnectionParameters>
+            <JMSTaskManager>
+                <MinThreadPoolSize>20</MinThreadPoolSize>
+                <MaxThreadPoolSize>100</MaxThreadPoolSize>
+                <KeepAliveTimeInMillis>1000</KeepAliveTimeInMillis>
+                <JobQueueSize>10</JobQueueSize>
+            </JMSTaskManager>
+        </JMSConnectionDetails>
+        <JMSEventPublisherParameters>
+            <java.naming.factory.initial>org.wso2.andes.jndi.PropertiesFileInitialContextFactory</java.naming.factory.initial>
+            <java.naming.provider.url>repository/conf/jndi.properties</java.naming.provider.url>
+            <transport.jms.DestinationType>topic</transport.jms.DestinationType>
+            <transport.jms.Destination>throttleData</transport.jms.Destination>
+            <transport.jms.ConcurrentPublishers>allow</transport.jms.ConcurrentPublishers>
+            <transport.jms.ConnectionFactoryJNDIName>TopicConnectionFactory</transport.jms.ConnectionFactoryJNDIName>
+        </JMSEventPublisherParameters>
+        <!--DefaultLimits>
+            <SubscriptionTierLimits>
+                <Gold>5000</Gold>
+                <Silver>2000</Silver>
+                <Bronze>1000</Bronze>
+                <Unauthenticated>60</Unauthenticated>
+            </SubscriptionTierLimits>
+            <ApplicationTierLimits>
+                <50PerMin>50</50PerMin>
+                <20PerMin>20</20PerMin>
+                <10PerMin>10</10PerMin>
+            </ApplicationTierLimits>
+            <ResourceLevelTierLimits>
+                <50KPerMin>50000</50KPerMin>
+                <20KPerMin>20000</20KPerMin>
+                <10KPerMin>10000</10KPerMin>
+            </ResourceLevelTierLimits>
+        </DefaultLimits-->
+        <EnableUnlimitedTier>true</EnableUnlimitedTier>
+        <EnableHeaderConditions>false</EnableHeaderConditions>
+        <EnableJWTClaimConditions>false</EnableJWTClaimConditions>
+        <EnableQueryParamConditions>false</EnableQueryParamConditions>
+    </ThrottlingConfigurations>
+
+</APIManager>
--- a/modules/distribution/src/core/conf/app-manager.xml
+++ b/modules/distribution/src/core/conf/app-manager.xml
@ -0,0 +1,494 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<AppManager>
+
+    <!--
+    JNDI name of the data source to be used by the app management components such as store, publisher, gateway
+    This data source should be defined in the master-datasources.xml file in conf/datasources directory.
+    -->
+    <DataSourceName>jdbc/WSO2APPM_DB</DataSourceName>
+    <DataSources>
+        <Storage>jdbc/ES_Storage</Storage>
+    </DataSources>
+
+    <APPStoreConfiguration>
+        <!--
+    This parameter specifies whether to display multiple versions of same
+    APP or only showing the latest version of an APP.
+        -->
+        <DisplayMultipleVersions>true</DisplayMultipleVersions>
+    </APPStoreConfiguration>
+
+    <!--subscription configuration is used by gateway,store,publisher-->
+    <SubscriptionConfiguration>
+        <EnableSelfSubscription>false</EnableSelfSubscription>
+        <EnableEnterpriseSubscription>false</EnableEnterpriseSubscription>
+    </SubscriptionConfiguration>
+
+    <!-- The authorization manager configuration to be used by store / publisher components -->
+    <AuthManager>
+
+        <!--
+        Server URL of the Authentication service
+        -->
+        <ServerURL>https://localhost:${mgt.transport.https.port}/services/</ServerURL>
+
+        <!--
+        Admin username for the Authentication manager.
+        -->
+        <Username>admin</Username>
+
+        <!--
+        Admin password for the Authentication manager.
+        -->
+        <Password>admin</Password>
+
+    </AuthManager>
+
+    <!-- The configuration for app discovery service -->
+    <DiscoveryConfiguration>
+
+        <!--
+        Configures the discovery handlers.
+        Discovery handlers are the ones connecting remote servers and discover the applications
+        -->
+        <DiscoveryHandlers>
+            <!-- List of discovery handlers. name is the key being used. Class is the handler class -->
+            <Handler name="WSO2-AS" class="org.wso2.carbon.appmgt.impl.discovery.Wso2AppServerDiscoveryHandler" />
+        </DiscoveryHandlers>
+
+    </DiscoveryConfiguration>
+
+    <!--
+    Configuration parameters for security handlers of the relevant proxy web apps.
+    -->
+    <AppConsumerAuthConfiguration>
+
+        <!-- Timeout (in seconds) for the gateway session cache. -->
+        <SessionTimeout>1800</SessionTimeout>
+
+        <!--
+        Enable/Disable JWT generation. Default is false.
+        -->
+        <EnableTokenGeneration>true</EnableTokenGeneration>
+
+        <!--
+        This parameter specifies which implementation should be used for generating the Token.
+        JWTGenerator is the default implementation provided.
+        -->
+        <TokenGeneratorImpl>org.wso2.carbon.appmgt.impl.token.JWTGenerator</TokenGeneratorImpl>
+
+        <!--
+        Name of the HTTP header which contains the JWT to be sent to the web app, from the gateway.
+        -->
+        <SecurityContextHeader>X-JWT-Assertion</SecurityContextHeader>
+
+        <!--
+        Fully qualified name of the class that will retrieve additional user claims to be appended to the JWT.
+        If not specified no claims will be appended.
+        The DefaultClaimsRetriever class adds user claims from the default carbon user store.
+        -->
+        <ClaimsRetrieverImplClass>org.wso2.carbon.appmgt.impl.token.DefaultClaimsRetriever</ClaimsRetrieverImplClass>
+
+        <!--
+        The dialectURI under which the claimURIs that need to be appended to the JWT are defined.
+        Not used with custom ClaimsRetriever implementations.
+        The same value is used in the keys for appending the default properties to the JWT.
+        -->
+        <ConsumerDialectURI>http://wso2.org/claims</ConsumerDialectURI>
+
+        <!--
+        Signature algorithm for signing the JWT. Accepts "SHA256withRSA" or "NONE".
+        To disable signing explicitly specify "NONE".
+        -->
+        <SignatureAlgorithm>SHA256withRSA</SignatureAlgorithm>
+
+        <!--
+        By default all claim values of default claim dialect uri which mapped to the user profile get added to the JWT token.
+        By setting "AddClaimsSelectively" attribute to true, publisher can select only required claim attributes to each App and include into JWT token.
+        -->
+        <AddClaimsSelectively>false</AddClaimsSelectively>
+
+        <!--
+        Add SAML response as transport header in outgoing message.
+        -->
+        <AddSAMLResponseHeaderToOutMessage>false</AddSAMLResponseHeaderToOutMessage>
+
+    </AppConsumerAuthConfiguration>
+
+    <APIGateway>
+
+        <!-- The environments to which an API will be published -->
+        <Environments>
+
+            <!-- TODO : Get rid of gateway type -->
+            <Environment type="hybrid">
+
+                <Name>Gateway Endpoint</Name>
+
+                <!--
+                Server URL of the API gateway.
+                -->
+                <ServerURL>https://${carbon.local.ip}:${mgt.transport.https.port}/services/</ServerURL>
+
+                <!--
+                Admin username for the API gateway.
+                -->
+                <Username>admin</Username>
+
+                <!--
+                Admin password for the API gateway.
+                -->
+                <Password>admin</Password>
+
+                <!--
+                Endpoint URLs for the APIs hosted in this API gateway.
+                -->
+                <GatewayEndpoint>http://${carbon.local.ip}:${http.nio.port},https://${carbon.local.ip}:${https.nio.port}</GatewayEndpoint>
+
+            </Environment>
+
+        </Environments>
+
+    </APIGateway>
+
+    <!--
+    API usage tracker configuration used by the DAS data publisher and
+    Google Analytics publisher in API gateway.
+    -->
+    <Analytics>
+
+
+        <!--
+        This data source is used to write/read UI Activity changes (eg: App Hit count)
+        to seperate database. When using DAS to analyze the changes it needs to configure this data source appropriately.
+        -->
+        <UIActivityPublishDataSourceName>jdbc/WSO2APPM_DB</UIActivityPublishDataSourceName>
+
+        <!--
+        Enable UI Activity Data publish to DAS
+        -->
+        <UIActivityDASPublishEnabled>false</UIActivityDASPublishEnabled>
+
+        <!--
+        Enable/Disable the API usage tracker.
+        -->
+        <Enabled>false</Enabled>
+
+        <!--
+        API Usage Data Publisher.
+        -->
+        <PublisherClass>org.wso2.carbon.appmgt.usage.publisher.APIMgtUsageDataBridgeDataPublisher</PublisherClass>
+
+        <!--
+        App usage data retrieval client implementation class.
+        -->
+        <StatisticClientProvider>org.wso2.carbon.appmgt.usage.client.impl.AppUsageStatisticsRdbmsClient</StatisticClientProvider>
+
+        <!--
+        Thrift port of the remote DAS server.
+        -->
+        <ThriftPort>7612</ThriftPort>
+
+        <!--
+        Server URL of the remote DAS/CEP server used to collect statistics.
+        Must be specified in protocol://hostname:port/ format.
+
+        An event can also be published to multiple Receiver Groups each having 1 or more receivers.
+        Receiver Groups are delimited by curly braces whereas receivers are delimited by commas.
+
+        e.g. - Multiple Receivers within a single group
+               tcp://localhost:7612/,tcp://localhost:7613/,tcp://localhost:7614/
+
+        e.g. - Multiple Receiver Groups with two receivers each
+                 {tcp://localhost:7612/,tcp://localhost:7613},{tcp://localhost:7712/,tcp://localhost:7713/}
+        -->
+        <DASServerURL>tcp://localhost:7612</DASServerURL>
+
+        <!--
+        Administrator username to login to the remote DAS server.
+        -->
+        <DASUsername>admin</DASUsername>
+
+        <!--
+        Administrator password to login to the remote DAS server.
+        -->
+        <DASPassword>admin</DASPassword>
+
+        <DASEventStreams>
+
+            <RequestStreamName>org.wso2.appmgt.statistics.request</RequestStreamName>
+            <RequestStreamVersion>1.0.0</RequestStreamVersion>
+
+            <ResponseStreamName>org.wso2.appmgt.statistics.response</ResponseStreamName>
+            <ResponseStreamVersion>1.0.0</ResponseStreamVersion>
+
+            <FaultStreamName>org.wso2.appmgt.statistics.fault</FaultStreamName>
+            <FaultStreamVersion>1.0.0</FaultStreamVersion>
+
+            <CacheStatStreamName>org.wso2.appmgt.statistics.cache</CacheStatStreamName>
+            <CacheStatStreamVersion>1.0.0</CacheStatStreamVersion>
+
+            <!-- Used when publishing AppManager UI activities to DAS   -->
+            <UIActivityStreamName>org.wso2.appmgt.bam.uiactivitypublish</UIActivityStreamName>
+            <UIActivityStreamVersion>1.1.0</UIActivityStreamVersion>
+
+        </DASEventStreams>
+
+
+        <!--
+        JNDI name of the data source to be used for getting DAS statistics.
+        This data source should be defined in the master-datasources.xml file in conf/datasources directory.
+        -->
+        <!--DataSourceName>jdbc/WSO2AM_STATS_DB</DataSourceName-->
+
+        <!--
+        Google Analytics publisher configuration.
+        Create Google Analytics account and obtain a tracking ID.
+        Refer http://support.google.com/analytics/bin/answer.py?hl=en&answer=1009694
+        -->
+        <GoogleAnalyticsTracking>
+
+            <!--
+           Enable/Disable Google Analytics Tracking
+            -->
+            <Enabled>false</Enabled>
+
+            <!--
+            Google Analytics Tracking ID
+            -->
+            <TrackingID>UA-XXXXXXXX-X</TrackingID>
+
+        </GoogleAnalyticsTracking>
+
+    </Analytics>
+
+    <!--
+    Settings related to managing API access tiers.
+    -->
+    <TierManagement>
+
+        <!--
+            Enable the providers to expose their APIs over the special 'Unlimited' tier which
+            basically disables tier based throttling for the specified APIs.
+        -->
+        <EnableUnlimitedTier>true</EnableUnlimitedTier>
+
+    </TierManagement>
+
+    <!--Configuration to enable/disable sending CORS headers in the Gateway response
+        and define the Access-Control-Allow-Origin header value.-->
+    <CORSConfiguration>
+
+        <!--Configuration to enable/disable sending CORS headers from the Gateway-->
+        <Enabled>true</Enabled>
+
+        <!--
+        The value of the Access-Control-Allow-Origin header.
+        Default values are API Store addresses, which is needed for swagger to function.
+        -->
+        <Access-Control-Allow-Origin>https://localhost:9443,http://localhost:9763</Access-Control-Allow-Origin>
+
+        <!--Configure Access-Control-Allow-Headers-->
+        <Access-Control-Allow-Headers>authorization,Access-Control-Allow-Origin,Content-Type</Access-Control-Allow-Headers>
+
+        <!--Configure Access-Control-Allow-Methods-->
+        <Access-Control-Allow-Methods>GET,POST,PUT,DELETE,OPTIONS</Access-Control-Allow-Methods>
+
+    </CORSConfiguration>
+
+    <!--
+    AppManager uses SAML SSO as default authentication mechanism for the web apps.
+    Following configuration defines the configurations of the IDP which is used as the SSO provider.
+    -->
+    <SSOConfiguration>
+
+        <!--Is service providers are created for skip-gateway enabled apps -->
+        <CreateServiceProviderForSkipGatewayApps>false</CreateServiceProviderForSkipGatewayApps>
+
+        <!-- URL of the IDP use for SSO -->
+        <IdentityProviderUrl>https://localhost:${mgt.transport.https.port}/samlsso</IdentityProviderUrl>
+
+        <!-- Postfix of the ACS URL -->
+        <ACSURLPostfix>appm/acs</ACSURLPostfix>
+
+        <!-- Enable SAML Response Signing when adding Service Provider and validate response signature in gateway.
+             If you are switching from false to true, then already created services providers should be updated manully to have response signing true.
+        -->
+	<EnableResponseSigning>true</EnableResponseSigning>
+
+        <!-- Enable SAML Assertion Signing when adding Service Provider and validate assertion signature in gateway.
+             If you are switching from false to true, then already created services providers should be updated manully to have assertion signing true.
+        -->
+	<EnableAssertionSigning>true</EnableAssertionSigning>
+
+        <!-- Validates Assertion expiry time of SAML Response -->
+        <ValidateAssertionExpiry>true</ValidateAssertionExpiry>
+
+	<!-- Timestamp skew applied to SAML Response Validity period. Default set to 5min --> 
+        <SAMLResponseValidityTimeStampSkew>300</SAMLResponseValidityTimeStampSkew>
+
+        <!-- This alias is used to validate the signature of the responses form the IDP -->
+        <ResponseSigningKeyAlias>wso2carbon</ResponseSigningKeyAlias>
+
+        <Configurators>
+            <Configurator>
+                <name>wso2is</name>
+                <version>5.0.0</version>
+                <providerClass>org.wso2.carbon.appmgt.impl.idp.sso.configurator.IS500SAMLSSOConfigurator</providerClass>
+                <parameters>
+                    <providerURL>https://${carbon.local.ip}:${mgt.transport.https.port}</providerURL>
+                    <username>admin</username>
+                    <password>admin</password>
+                </parameters>
+            </Configurator>
+        </Configurators>
+
+    </SSOConfiguration>
+
+    <!--
+    Entitlement service is used to manage entitlement policies and evaluate them upon accessing apps.
+    -->
+    <EntitlementServiceConfiguration>
+
+        <Parameters>
+            <ServerUrl>https://${carbon.local.ip}:${mgt.transport.https.port}</ServerUrl>
+            <Username>admin</Username>
+            <Password>admin</Password>
+        </Parameters>
+
+    </EntitlementServiceConfiguration>
+
+    <!-- Configuration to handle Mobile apps and MDM. -->
+    <MobileAppsConfiguration>
+
+        <MDMConfig>
+            <!--
+            Enables the catalog mode of the Mobile App Store. If you change the value of this to true,
+            the Mobile App Store acts as a catalog, which allows you to view apps. However, it doesn't
+            allow you to perform any operations on the apps
+            -->
+            <Config name="IsCatalog">false</Config>
+
+            <!-- Enables app to download direcly to the mobile device from the App Manager without MDM -->
+            <Config name="EnableDirectDownload">false</Config>
+
+            <!-- Enables WSO2 AppM to communicate with the active MDM for performing operations on the mobile apps. -->
+            <Config name="EnableMDMOperations">true</Config>
+
+            <!--
+            Name of the MDM, which is currently active. You need to define the MDM within the <MDMProperties> element.
+            For information on defining a MDM to integrate it with WSO2 AppM, see Integrating a Mobile Device Manager
+            -->
+            <Config name="ActiveMDM">WSO2MDM_INTERNAL</Config>
+
+            <!-- Ability for users to self-unsubscribe from mobile apps -->
+            <Config name="EnableSelfUnsubscription">false</Config>
+
+            <!-- Ability for users to subscribe to mobile apps using mobile devices -->
+            <Config name="EnableSubscriptionFromDevices">true</Config>
+
+            <!-- Enables the sample devices for testing purposes -->
+            <Config name="EnableSampleDevices">false</Config>
+
+            <!--
+            Host of the installation URL of the mobile app, which is sent to the MDM:
+            e.g. %http%, %https%, or a custom host URL
+            -->
+            <Config name="AppDownloadURLHost">%http%</Config>
+
+            <!-- Path of the Property List file generated using the PLIST template for iOS apps. -->
+            <Config name="IosPlistPath">publisher/api/mobileapp/getplist</Config>
+
+            <!-- Ability to enable the enterprise-wide operations on mobile apps -->
+            <Config name="EnterpriseOperations_Enabled">true</Config>
+
+            <!-- The user role, which has the privileges to perform enterprise-wide operations on mobile apps. -->
+            <Config name="EnterpriseOperations_AuthorizedRole">Internal/store-admin</Config>
+
+        </MDMConfig>
+
+        <!-- The properties of the MDMs you need to connect with WSO2 AppM. For information on defining a MDM to integrate it with WSO2 AppM -->
+        <MDMProperties>
+            <!--
+                MDM running on separate JVM. Calls MDM methods via secured REST API. Use this when run Store/Publisher/MDM
+                in deployed in separate JVMs. This will be the most suitable active MDM when deployed on production environment.
+            -->
+            <MDM name="WSO2MDM_EXTERNAL_REST" bundle="org.wso2.carbon.appmgt.mdm.restconnector">
+                <Property name="ImageURL">/store/extensions/assets/mobileapp/resources/models/%s.png</Property>
+                <Property name="ServerURL">https://localhost:9443</Property>
+                <Property name="TokenApiURL">https://localhost:9443/oauth2</Property>
+                <property name="Username">admin</property>
+                <property name="Password">admin</property>
+                <property name="TokenRefreshTimeOffset">100</property>
+            </MDM>
+
+            <!-- Old EMM, Calls EMM using REST API -->
+            <MDM name="WSO2EMM" bundle="org.wso2.carbon.appmgt.mdm.wso2emm">
+                <Property name="ServerURL">https://localhost:9443</Property>
+                <Property name="ImageURL">https://localhost:9443/emm/assets/wso2mobile/img/models/%s.png</Property>
+                <Property name="AuthUser">admin</Property>
+                <Property name="AuthPass">admin</Property>
+            </MDM>
+
+            <!--
+                Internal MDM which dispatches the MDM calls as Java/OSGI calls. Use this when run Store/Publisher/MDM
+                in on single JVM.
+            -->
+            <MDM name="WSO2MDM_INTERNAL" bundle="org.wso2.carbon.appmgt.mdm.osgiconnector">
+                <Property name="ImageURL">/store/extensions/assets/mobileapp/resources/models/%s.png</Property>
+            </MDM>
+
+            <!-- Please uncommnent the following block and define the name in ActiveMDM to activate this MDM -->
+
+            <!--
+            <MDM name="WSO2MDM" bundle="org.wso2.carbon.appmgt.mdm.othermdm">
+              <Property name="serverUrl">https://localhost:9454</Property>
+            </MDM>
+            -->
+        </MDMProperties>
+        <BinaryFileStorage>        
+            <FilePreciseLocation>repository/resources/mobileapps/</FilePreciseLocation>     
+            <FileAPILocation>/api/mobileapp/getfile/</FileAPILocation>      
+        </BinaryFileStorage>
+
+    </MobileAppsConfiguration>
+
+    <BinaryFileStorage>
+        <AbsoluteLocation>${carbon.home}/repository/resources/mobileapps/</AbsoluteLocation>
+    </BinaryFileStorage>
+
+    <!-- Configuration to secure mobile app services.-->
+    <ServicesAPI>
+        <AuthorizedRole>admin</AuthorizedRole>
+    </ServicesAPI>
+
+    <!--These types in the configuration provides a list of enabled types in the APP Manager.
+    If web app is commented, it will be hidden from APP Manager. These type values can be read as artifact types in RXT template -->
+    <EnabledAssetTypeList>
+        <Type>mobileapp</Type>
+    </EnabledAssetTypeList>
+
+    <RESTAPI>
+        <!--Configure publisher and store REST API context path-->
+        <PublisherAPIContextPath>/api/appm/publisher/v1.1</PublisherAPIContextPath>
+        <StoreAPIContextPath>/api/appm/store/v1.1</StoreAPIContextPath>
+
+        <!--Configure white-listed URIs of REST API. Accessing white-listed URIs does not require credentials (does not require Authorization header). -->
+        <WhiteListedURIs>
+            <WhiteListedURI>
+                <URI>/api/appm/store/{version}/apps/mobile/binaries/one-time/{uuid}</URI>
+                <HTTPMethods>GET,HEAD</HTTPMethods>
+            </WhiteListedURI>
+            <WhiteListedURI>
+                <URI>/api/appm/store/{version}/apps/static-contents/{fileName}</URI>
+                <HTTPMethods>GET,HEAD</HTTPMethods>
+            </WhiteListedURI>
+            <WhiteListedURI>
+                <URI>/api/appm/store/{version}/apps/mobile/plist/{appId}/{uuid}</URI>
+                <HTTPMethods>GET,HEAD</HTTPMethods>
+            </WhiteListedURI>
+        </WhiteListedURIs>
+    </RESTAPI>
+
+</AppManager>
--- a/modules/distribution/src/core/conf/application-authenticators.xml
+++ b/modules/distribution/src/core/conf/application-authenticators.xml
@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+  ~ Copyright 2005-2013 WSO2, Inc. (http://wso2.com)
+  ~
+  ~ Licensed 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.
+  -->
+
+<Authenticators>
+    <Authenticator name="BasicAuthenticator" disabled="false" factor="1">
+        <Status value="10" loginPage="/sso/login" />
+    </Authenticator>
+</Authenticators>
--- a/modules/distribution/src/core/conf/axis2/axis2.xml
+++ b/modules/distribution/src/core/conf/axis2/axis2.xml
@ -0,0 +1,959 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  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
+  ~
+  ~    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                       -->
+    <!-- ================================================= -->
+
+    <!-- Change this to true if you want to enable hot deployment of services -->
+    <parameter name="hotdeployment" locked="false">true</parameter>
+    <!-- Change this to true if you want to enable hot update of services -->
+    <parameter name="hotupdate" locked="false">true</parameter>
+
+    <!-- Change this to true if you want to enable MTOM -->
+    <parameter name="enableMTOM" locked="false">false</parameter>
+    <!-- Change this to true if you want to enable SwA -->
+    <parameter name="enableSwA" locked="false">false</parameter>
+
+    <!-- If you want to enable file caching for attachments change this to true -->
+    <parameter name="cacheAttachments" locked="false">false</parameter>
+    <!-- Attachment file caching location relative to CARBON_HOME -->
+    <parameter name="attachmentDIR" locked="false">work/mtom</parameter>
+    <!-- Attachment file cache threshold size -->
+    <parameter name="sizeThreshold" locked="false">4000</parameter>
+
+    <!-- Completely disable REST handling in Axis2/Synapse if the value is true -->
+    <parameter name="disableREST" locked="false">false</parameter>
+
+    <!-- Sandesha2 persistance storage manager -->
+    <parameter name="Sandesha2StorageManager" locked="false">inmemory</parameter>
+
+    <!-- Our HTTP endpoints can handle both REST and SOAP under the following service path. In -->
+    <!-- case of a servlet container, 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>
+
+    <!--the directory in which .aar services are deployed inside axis2 repository-->
+    <parameter name="ServicesDirectory">axis2services</parameter>
+
+    <!--the directory in which modules are deployed inside axis2 repository-->
+    <parameter name="ModulesDirectory">axis2modules</parameter>
+
+    <!-- User agent and the server details to be used in the http communication -->
+    <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 -->
+    <parameter name="sendStacktraceDetailsWithFaults" locked="false">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" locked="false">false</parameter>
+
+    <!-- Set the flag to true if you want to enable transport level session management -->
+    <parameter name="manageTransportSession" locked="false">true</parameter>
+
+    <!-- This will give out the timout of the configuration contexts, in milliseconds -->
+    <parameter name="ConfigContextTimeoutInterval" locked="false">30000</parameter>
+
+    <!-- Synapse Configuration file location relative to CARBON_HOME -->
+    <parameter name="SynapseConfig.ConfigurationFile" locked="false">repository/deployment/server/synapse-configs</parameter>
+    <!-- Synapse Home parameter -->
+    <parameter name="SynapseConfig.HomeDirectory" locked="false">.</parameter>
+    <!-- Resolve root used to resolve synapse references like schemas inside a WSDL -->
+    <parameter name="SynapseConfig.ResolveRoot" locked="false">.</parameter>
+    <!-- Synapse Server name parameter -->
+    <parameter name="SynapseConfig.ServerName" locked="false">localhost</parameter>
+
+    <!-- To override repository/services you need to uncomment following parameter and value -->
+    <!-- SHOULD be absolute file path. -->
+    <!--<parameter name="ServicesDirectory" locked="false">service</parameter>-->
+
+    <!-- To override repository/modules you need to uncomment following parameter and value -->
+    <!-- SHOULD be absolute file path. -->
+    <!--<parameter name="ModulesDirectory" locked="false">modules</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" locked="false">https://someotherhost/context</parameter>-->
+
+    <!-- ================================================= -->
+    <!--                  Listeners                        -->
+    <!-- ================================================= -->
+
+    <!-- This deployment interceptor will be called whenever before a module is initialized or -->
+    <!-- service is deployed -->
+    <listener class="org.wso2.carbon.core.deployment.DeploymentInterceptor"/>
+
+    <!-- ================================================= -->
+    <!--                  Deployers                        -->
+    <!-- ================================================= -->
+
+    <!-- Deployer for the dataservice. -->
+    <!--<deployer extension="dbs" directory="dataservices" class="org.wso2.dataservices.DBDeployer"/>-->
+
+    <!-- Axis1 deployer for Axis2 -->
+    <!--<deployer extension="wsdd" class="org.wso2.carbon.axis1services.Axis1Deployer" directory="axis1services"/>-->
+
+    <!-- POJO service deployer for Jar -->
+    <!--<deployer extension="jar" class="org.apache.axis2.deployment.POJODeployer" directory="pojoservices"/>-->
+
+    <!-- POJO service deployer for Class -->
+    <!--<deployer extension="class" class="org.apache.axis2.deployment.POJODeployer" directory="pojoservices"/>-->
+
+    <!-- JAXWS service deployer -->
+    <!--<deployer extension=".jar" class="org.apache.axis2.jaxws.framework.JAXWSDeployer" directory="servicejars"/>-->
+
+    <!-- ================================================= -->
+    <!--                Message Receivers                  -->
+    <!-- ================================================= -->
+
+    <!-- This is the set of default Message Receivers for the system, if you want to have -->
+    <!-- message receivers for any of the other Message exchange Patterns (MEP) implement it -->
+    <!-- and add the implementation class to here, so that you can refer from any operation -->
+    <!-- Note : You can override this for particular service by adding this same element to the -->
+    <!-- services.xml with your preferences -->
+    <messageReceivers>
+        <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only"
+                         class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"/>
+        <messageReceiver mep="http://www.w3.org/ns/wsdl/robust-in-only"
+                         class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"/>
+        <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out"
+                         class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
+    </messageReceivers>
+
+    <!-- ================================================= -->
+    <!--                Message Formatters                 -->
+    <!-- ================================================= -->
+
+    <!-- Following content type to message formatter mapping can be used to implement support -->
+    <!-- for different message format serializations in Axis2. These message formats are -->
+    <!-- expected to be resolved based on the content type. -->
+    <messageFormatters>
+        <messageFormatter contentType="application/x-apple-aspen-mdm"
+                          class="org.apache.axis2.format.PlainTextFormatter"/>
+        <messageFormatter contentType="application/x-apple-aspen-config"
+                          class="org.apache.axis2.format.PlainTextFormatter"/>
+
+        <messageFormatter contentType="application/pkcs7-signature"
+                          class="org.apache.axis2.format.PlainTextFormatter"/>
+
+        <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="text/html"
+                          class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+        <messageFormatter contentType="application/xml"
+                          class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+        <messageFormatter contentType="text/xml"
+                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+        <messageFormatter contentType="application/soap+xml"
+                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+        <messageFormatter contentType="text/plain"
+                          class="org.apache.axis2.format.PlainTextFormatter"/>
+
+        <!--JSON Message Formatters-->
+        <messageFormatter contentType="application/json"
+                          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"/-->
+    </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/x-apple-aspen-mdm"
+                        class="org.apache.axis2.format.PlainTextBuilder"/>
+        <messageBuilder contentType="application/x-apple-aspen-config"
+                        class="org.apache.axis2.format.PlainTextBuilder"/>
+
+        <messageBuilder contentType="application/pkcs7-signature"
+                        class="org.apache.axis2.format.PlainTextBuilder"/>
+
+        <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"
+                        class="org.apache.axis2.builder.MultipartFormDataBuilder"/>
+        <messageBuilder contentType="text/plain"
+                        class="org.apache.axis2.format.PlainTextBuilder"/>
+
+        <!--JSON Message Builders-->
+        <messageBuilder contentType="application/json"
+                        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/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"/-->
+    </messageBuilders>
+
+    <!-- ================================================= -->
+    <!--             Transport Ins (Listeners)             -->
+    <!-- ================================================= -->
+
+    <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-->
+        <!--parameter name="WSDLEPRPrefix" locked="false">https://apachehost:port/somepath</parameter-->
+        <parameter name="httpGetProcessor" locked="false">org.wso2.carbon.mediation.transport.handlers.PassThroughNHttpGetProcessor</parameter>
+        <!--<parameter name="priorityConfigFile" locked="false">location of priority configuration file</parameter>-->
+    </transportReceiver>
+
+    <!-- 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="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>
+        <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">AllowAll</parameter>
+        <!--<parameter name="SSLVerifyClient">require</parameter>
+            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-->
+    <!--</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)
+    <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
+        <parameter name="myTopicConnectionFactory" locked="false">
+        	<parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+        	<parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</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.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+        	<parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</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.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+        	<parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
+        	<parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
+		    <parameter name="transport.jms.ConnectionFactoryType" locked="false">queue</parameter>
+        </parameter>
+    </transportReceiver>-->
+
+    <!--Uncomment this and configure as appropriate for JMS transport support with Apache Qpid -->
+    <!--transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
+        <parameter name="myTopicConnectionFactory" locked="false">
+            <parameter name="java.naming.factory.initial" locked="false">org.apache.qpid.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.apache.qpid.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.apache.qpid.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="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="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)              -->
+    <!-- ================================================= -->
+
+    <transportSender name="http" class="org.apache.synapse.transport.passthru.PassThroughHttpSender">
+        <parameter name="non-blocking" locked="false">true</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">
+            <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>
+
+    <!--<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="vfs" class="org.apache.synapse.transport.vfs.VFSTransportSender"/-->
+
+    <!-- Uncomment and configure the SMTP server information
+    check com.sun.mail.smtp package documentation for descriptions of properties
+    <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
+        <parameter name="mail.smtp.host">smtp.gmail.com</parameter>
+        <parameter name="mail.smtp.port">587</parameter>
+        <parameter name="mail.smtp.starttls.enable">true</parameter>
+        <parameter name="mail.smtp.auth">true</parameter>
+        <parameter name="mail.smtp.user">synapse.demo.0</parameter>
+        <parameter name="mail.smtp.password">mailpassword</parameter>
+        <parameter name="mail.smtp.from">synapse.demo.0@gmail.com</parameter>
+    </transportSender>-->
+
+    <!--Uncomment this for FIX transport support
+    <transportSender name="fix" class="org.apache.synapse.transport.fix.FIXTransportSender"/>
+    -->
+
+    <!--<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                -->
+    <!-- ================================================= -->
+
+    <!-- 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                         -->
+    <!-- ================================================= -->
+    <!--
+     To enable clustering for this node, set the value of "enable" attribute of the "clustering"
+     element to "true". The initialization of a node in the cluster is handled by the class
+     corresponding to the "class" attribute of the "clustering" element. It is also responsible for
+     getting this node to join the cluster.
+     -->
+    <clustering class="org.wso2.carbon.core.clustering.hazelcast.HazelcastClusteringAgent"
+                enable="false">
+
+        <!--
+           This parameter indicates whether the cluster has to be automatically initalized
+           when the AxisConfiguration is built. If set to "true" the initialization will not be
+           done at that stage, and some other party will have to explictly initialize the cluster.
+        -->
+        <parameter name="AvoidInitiation">true</parameter>
+
+        <!--
+           The membership scheme used in this setup. The only values supported at the moment are
+           "multicast" and "wka"
+
+           1. multicast - membership is automatically discovered using multicasting
+           2. wka - Well-Known Address based multicasting. Membership is discovered with the help
+                    of one or more nodes running at a Well-Known Address. New members joining a
+                    cluster will first connect to a well-known node, register with the well-known node
+                    and get the membership list from it. When new members join, one of the well-known
+                    nodes will notify the others in the group. When a member leaves the cluster or
+                    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">multicast</parameter>
+        <!--<parameter name="licenseKey">xxx</parameter>-->
+        <!--<parameter name="mgtCenterURL">http://localhost:8081/mancenter/</parameter>-->
+
+        <!--
+         The clustering domain/group. Nodes in the same group will belong to the same multicast
+         domain. There will not be interference between nodes in different groups.
+        -->
+        <parameter name="domain">wso2.carbon.domain</parameter>
+
+        <!-- The multicast address to be used -->
+        <!--<parameter name="mcastAddress">228.0.0.4</parameter>-->
+
+        <!-- The multicast port to be used -->
+        <parameter name="mcastPort">45564</parameter>
+
+        <parameter name="mcastTTL">100</parameter>
+
+        <parameter name="mcastTimeout">60</parameter>
+
+        <!--
+           The IP address of the network interface to which the multicasting has to be bound to.
+           Multicasting would be done using this interface.
+        -->
+        <!--
+            <parameter name="mcastBindAddress">127.0.0.1</parameter>
+        -->
+        <!-- The host name or IP address of this member -->
+
+        <parameter name="localMemberHost">127.0.0.1</parameter>
+
+        <!--
+            The bind adress of this member. The difference between localMemberHost & localMemberBindAddress
+            is that localMemberHost is the one that is advertised by this member, while localMemberBindAddress
+            is the address to which this member is bound to.
+        -->
+        <!--
+        <parameter name="localMemberBindAddress">127.0.0.1</parameter>
+        -->
+
+        <!--
+        The TCP port used by this member. This is the port through which other nodes will
+        contact this member
+         -->
+        <parameter name="localMemberPort">4000</parameter>
+
+        <!--
+            The bind port of this member. The difference between localMemberPort & localMemberBindPort
+            is that localMemberPort is the one that is advertised by this member, while localMemberBindPort
+            is the port to which this member is bound to.
+        -->
+        <!--
+        <parameter name="localMemberBindPort">4001</parameter>
+        -->
+
+        <!--
+        Properties specific to this member
+        -->
+        <parameter name="properties">
+            <property name="backendServerURL" value="https://${hostName}:${httpsPort}/services/"/>
+            <property name="mgtConsoleURL" value="https://${hostName}:${httpsPort}/"/>
+            <property name="subDomain" value="worker"/>
+        </parameter>
+
+        <!--
+           The list of static or well-known members. These entries will only be valid if the
+           "membershipScheme" above is set to "wka"
+        -->
+        <members>
+            <member>
+                <hostName>127.0.0.1</hostName>
+                <port>4000</port>
+            </member>
+        </members>
+
+        <!--
+        Enable the groupManagement entry if you need to run this node as a cluster manager.
+        Multiple application domains with different GroupManagementAgent implementations
+        can be defined in this section.
+        -->
+        <groupManagement enable="false">
+            <applicationDomain name="wso2.apim.domain"
+                               description="APIM group"
+                               agent="org.wso2.carbon.core.clustering.hazelcast.HazelcastGroupManagementAgent"
+                               subDomain="worker"
+                               port="2222"/>
+        </groupManagement>
+    </clustering>
+
+    <!-- ================================================= -->
+    <!--                   Transactions                    -->
+    <!-- ================================================= -->
+
+    <!--
+        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>
+        <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+        <parameter name="UserTransactionJNDIName">UserTransaction</parameter>
+        <parameter name="TransactionManagerJNDIName">TransactionManager</parameter>
+    </transaction>-->
+
+    <!-- ================================================= -->
+    <!--                    Phases                         -->
+    <!-- ================================================= -->
+
+    <phaseOrder type="InFlow">
+        <!--  System pre defined phases       -->
+        <!--
+           The MsgInObservation phase is used to observe messages as soon as they are
+           received. In this phase, we could do some things such as SOAP message tracing & keeping
+           track of the time at which a particular message was received
+
+           NOTE: This should be the very first phase in this flow
+        -->
+        <phase name="MsgInObservation">
+            <handler name="TraceMessageBuilderDispatchHandler"
+                     class="org.apache.synapse.transport.passthru.util.TraceMessageBuilderDispatchHandler"/>
+        </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="SOAPActionBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
+                <order phase="Transport"/>
+            </handler>
+            <!--handler name="SMTPFaultHandler"
+                     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"/>
+        <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"/>
+            <handler name="MultitenantDispatcher"
+                     class="org.wso2.carbon.tenant.dispatcher.MultitenantDispatcher"/>
+            <handler name="SynapseDispatcher"
+                     class="org.apache.synapse.core.axis2.SynapseDispatcher"/>
+            <handler name="SynapseMustUnderstandHandler"
+                     class="org.apache.synapse.core.axis2.SynapseMustUnderstandHandler"/>
+        </phase>
+        <!--  System pre defined phases       -->
+        <phase name="RMPhase"/>
+        <phase name="OpPhase"/>
+        <phase name="AuthPhase"/>
+        <phase name="MUPhase"/>
+        <!-- After Postdispatch phase module author or or service author can add any phase he want -->
+        <phase name="OperationInPhase"/>
+    </phaseOrder>
+
+    <phaseOrder type="OutFlow">
+        <!-- Handlers related to unified-endpoint component are added to the UEPPhase -->
+        <phase name="UEPPhase" />
+        <!--      user can add his own phases to this area  -->
+        <phase name="RMPhase"/>
+        <phase name="MUPhase"/>
+        <phase name="OpPhase"/>
+        <phase name="OperationOutPhase"/>
+        <!--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"/>
+        </phase>
+        <phase name="MessageOut"/>
+        <phase name="Security"/>
+
+        <!--
+           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.
+
+           NOTE: This should be the very last phase in this flow
+        -->
+        <phase name="MsgOutObservation"/>
+    </phaseOrder>
+
+    <phaseOrder type="InFaultFlow">
+        <!--
+           The MsgInObservation phase is used to observe messages as soon as they are
+           received. In this phase, we could do some things such as SOAP message tracing & keeping
+           track of the time at which a particular message was received
+
+           NOTE: This should be the very first phase in this flow
+        -->
+        <phase name="MsgInObservation"/>
+        <phase name="Validation"/>
+
+        <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>
+            <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">
+            <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>
+        <!--      user can add his own phases to this area  -->
+        <phase name="RMPhase"/>
+        <phase name="OpPhase"/>
+        <phase name="MUPhase"/>
+        <phase name="OperationInFaultPhase"/>
+    </phaseOrder>
+
+    <phaseOrder type="OutFaultFlow">
+        <!-- Handlers related to unified-endpoint component are added to the UEPPhase -->
+        <phase name="UEPPhase" />
+        <!--      user can add his own phases to this area  -->
+        <phase name="RMPhase"/>
+        <!-- Must Understand Header processing phase -->
+        <phase name="MUPhase"/>
+        <phase name="OperationOutFaultPhase"/>
+        <phase name="PolicyDetermination"/>
+        <phase name="MessageOut"/>
+        <phase name="Security"/>
+        <phase name="Transport"/>
+        <!--
+           The MsgOutObservation phase is used to 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.
+
+           NOTE: This should be the very last phase in this flow
+        -->
+        <phase name="MsgOutObservation"/>
+    </phaseOrder>
+
+</axisconfig>
--- a/modules/distribution/src/core/conf/axis2/axis2_client.xml
+++ b/modules/distribution/src/core/conf/axis2/axis2_client.xml
@ -0,0 +1,317 @@
+<!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~ 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>
+
+    <!-- commons-http-client defaultMaxConnPerHost -->
+    <parameter name="defaultMaxConnPerHost">500</parameter>
+    <!-- commons-http-client maxTotalConnections -->
+    <parameter name="maxTotalConnections">15000</parameter>
+
+    <!--If turned on with use the Accept header of the request to determine the contentType of the
+    response-->
+    <parameter name="httpContentNegotiation">false</parameter>
+
+    <!--During a fault, stacktrace can be sent with the fault message. The following flag will control -->
+    <!--that behaviour.-->
+    <parameter name="sendStacktraceDetailsWithFaults">true</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>
+
+    <!--This is the user name and password of admin console-->
+    <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 distinguish those endpoints-->
+    <!--<parameter name="servicePath">services</parameter>-->
+    <!--<parameter name="restPath">rest</parameter>-->
+
+    <!-- Following parameter will completely disable REST handling in Axis2-->
+    <parameter name="disableREST" locked="false">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>-->
+
+    <!-- ================================================= -->
+    <!-- Message Receivers -->
+    <!-- ================================================= -->
+    <!--This is the Default Message Receiver 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 override this for particular service by adding the same element with your requirement-->
+    <messageReceivers>
+        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+        <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only"
+                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+        <messageReceiver mep="http://www.w3.org/2006/01/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="text/xml"
+                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+        <messageFormatter contentType="application/soap+xml"
+                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+        <!--JSON Message Formatters-->
+        <messageFormatter contentType="application/json"
+                          class="org.apache.axis2.json.JSONMessageFormatter"/>
+        <messageFormatter contentType="application/json/badgerfish"
+                          class="org.apache.axis2.json.JSONBadgerfishMessageFormatter"/>
+        <messageFormatter contentType="text/javascript"
+                          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"/>
+        <!--JSON Message Builders-->
+        <messageBuilder contentType="application/json"
+                        class="org.apache.axis2.json.JSONOMBuilder"/>
+        <messageBuilder contentType="application/json/badgerfish"
+                        class="org.apache.axis2.json.JSONBadgerfishOMBuilder"/>
+        <messageBuilder contentType="text/javascript"
+                        class="org.apache.axis2.json.JSONOMBuilder"/>
+        <!--Left commented because it adds the depandancy of servlet-api to other modules.
+        Please uncomment to Receive messages in multipart/form-data format-->
+        <!--<messageBuilder contentType="multipart/form-data"-->
+        <!--class="org.apache.axis2.builder.MultipartFormDataBuilder"/>-->
+    </messageBuilders>
+
+    <!-- ================================================= -->
+    <!-- Target Resolvers -->
+    <!-- ================================================= -->
+    <!-- Uncomment the following and specify the class name for your TargetResolver to add -->
+    <!-- a TargetResolver. TargetResolvers are used to process the To EPR for example to -->
+    <!-- choose a server in a cluster -->
+    <!--<targetResolvers>-->
+    <!--<targetResolver class="" />-->
+    <!--</targetResolvers>-->
+
+
+    <!-- ================================================= -->
+    <!-- Transport Ins -->
+    <!-- ================================================= -->
+    <transportReceiver name="http"
+                       class="org.apache.axis2.transport.http.SimpleHTTPServer">
+        <parameter name="port">6071</parameter>
+        <!--If you want to give your own host address for EPR generation-->
+        <!--uncomment following parameter , and set as you required.-->
+        <!--<parameter name="hostname">http://myApp.com/ws</parameter>-->
+    </transportReceiver>
+
+    <!--Uncomment if you want to have TCP transport support-->
+    <!--<transportReceiver name="tcp"
+                       class="org.apache.axis2.transport.tcp.TCPServer">
+        <parameter name="port">6061</parameter>-->
+    <!--If you want to give your own host address for EPR generation-->
+    <!--uncomment following parameter , and set as you required.-->
+    <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
+    <!--</transportReceiver>-->
+
+    <!-- ================================================= -->
+    <!-- Transport Outs -->
+    <!-- ================================================= -->
+
+    <!--<transportSender name="jms"-->
+    <!--class="org.apache.axis2.transport.jms.JMSSender"/>-->
+    <!--transportSender name="tcp"
+                     class="org.apache.axis2.transport.tcp.TCPTransportSender"/-->
+    <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="SO_TIMEOUT">60000</parameter>
+        <parameter name="CONNECTION_TIMEOUT">60000</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="SO_TIMEOUT">60000</parameter>
+        <parameter name="CONNECTION_TIMEOUT">60000</parameter>
+    </transportSender>
+
+    <!-- To enable mail transport sender, ncomment the following and change the parameters
+     accordingly-->
+    <!--<transportSender name="mailto"
+                     class="org.apache.axis2.transport.mail.MailTransportSender">
+        <parameter name="mail.smtp.from">wso2demomail@gmail.com</parameter>
+        <parameter name="mail.smtp.user">wso2demomail</parameter>
+        <parameter name="mail.smtp.password">mailpassword</parameter>
+        <parameter name="mail.smtp.host">smtp.gmail.com</parameter>
+
+        <parameter name="mail.smtp.port">587</parameter>
+        <parameter name="mail.smtp.starttls.enable">true</parameter>
+        <parameter name="mail.smtp.auth">true</parameter>
+    </transportSender>-->
+
+    <!--<transportSender name="java"-->
+    <!--class="org.apache.axis2.transport.java.JavaTransportSender"/>-->
+
+
+    <!-- ================================================= -->
+    <!--  SOAP Role Configuration                          -->
+    <!-- ================================================= -->
+    <!-- Use the following pattern to configure this axis2
+         instance to act in particular roles. Note that in
+         the absence of any configuration, Axis2 will act 
+         only in the ultimate receiver role -->
+    <!--
+    <SOAPRoleConfiguration isUltimateReceiver="true">
+    	<role>http://my/custom/role</role>
+    </SOAPRoleConfiguration>
+	-->
+
+    <!-- ================================================= -->
+    <!-- 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 pre defined phases       -->
+        <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
+        <phase name="OperationInPhase"/>
+    </phaseOrder>
+    <phaseOrder type="OutFlow">
+        <!--      user can add his own phases to this area  -->
+        <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"/>
+    </phaseOrder>
+    <phaseOrder type="OutFaultFlow">
+        <!--      user can add his own phases to this area  -->
+        <phase name="OperationOutFaultPhase"/>
+        <phase name="RMPhase"/>
+        <phase name="PolicyDetermination"/>
+        <phase name="MessageOut"/>
+        <phase name="Security"/>
+        <phase name="Transport"/>
+    </phaseOrder>
+</axisconfig>
--- a/modules/distribution/src/core/conf/carbon.xml
+++ b/modules/distribution/src/core/conf/carbon.xml
@ -0,0 +1,688 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~ 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.
+  -->
+
+<!--
+    This is the main server configuration file
+
+    ${carbon.home} represents the carbon.home system property.
+    Other system properties can be specified in a similar manner.
+-->
+<Server xmlns="http://wso2.org/projects/carbon/carbon.xml">
+
+	<!--
+	   Product Name
+	-->
+	<Name>${product.name}</Name>
+
+	<!--
+	   machine readable unique key to identify each product
+	-->
+	<ServerKey>${product.key}</ServerKey>
+
+	<!--
+	   Product Version
+	-->
+	<Version>${product.version}</Version>
+
+	<!--
+	   Host name or IP address of the machine hosting this server
+	   e.g. www.wso2.org, 192.168.1.10
+	   This is will become part of the End Point Reference of the
+	   services deployed on this server instance.
+	-->
+
+	<HostName>localhost</HostName>
+
+	<!--
+	Host name to be used for the Carbon management console
+	-->
+	<MgtHostName>localhost</MgtHostName>
+
+	<!--
+		The URL of the back end server. This is where the admin services are hosted and
+		will be used by the clients in the front end server.
+		This is required only for the Front-end server. This is used when seperating BE server from FE server
+	   -->
+	<ServerURL>local:/${carbon.context}/services/</ServerURL>
+	<!--
+	<ServerURL>https://${carbon.local.ip}:${carbon.management.port}${carbon.context}/services/</ServerURL>
+	-->
+	<!--
+	 The URL of the index page. This is where the user will be redirected after signing in to the
+	 carbon server.
+	 -->
+	<!-- IndexPageURL>/carbon/admin/index.jsp</IndexPageURL-->
+
+	<!--
+	For cApp deployment, we have to identify the roles that can be acted by the current server.
+	The following property is used for that purpose. Any number of roles can be defined here.
+	Regular expressions can be used in the role.
+	Ex : <Role>.*</Role> means this server can act any role
+	-->
+	<ServerRoles>
+		<Role>${default.server.role}</Role>
+		<Role>${cdmf.analytics.role}</Role>
+		<Role>CDMFPlatform</Role>
+	</ServerRoles>
+
+	<!-- uncommnet this line to subscribe to a bam instance automatically -->
+	<!--<BamServerURL>https://bamhost:bamport/services/</BamServerURL>-->
+
+	<!--
+	   The fully qualified name of the server
+	-->
+	<Package>org.wso2.carbon</Package>
+
+	<!--
+	   Webapp context root of WSO2 Carbon management console.
+	-->
+	<WebContextRoot>/</WebContextRoot>
+
+	<!--
+		Proxy context path is a useful parameter to add a proxy path when a Carbon server is fronted by reverse proxy. In addtion
+		to the proxy host and proxy port this parameter allows you add a path component to external URLs. e.g.
+			 URL of the Carbon server -> https://10.100.1.1:9443/carbon
+		   URL of the reverse proxy -> https://prod.abc.com/appserver/carbon
+
+	   appserver - proxy context path. This specially required whenever you are generating URLs to displace in
+	   Carbon UI components.
+	-->
+	<!--
+		<MgtProxyContextPath></MgtProxyContextPath>
+		<ProxyContextPath></ProxyContextPath>
+	-->
+
+	<!-- In-order to  get the registry http Port from the back-end when the default http transport is not the same-->
+	<!--RegistryHttpPort>9763</RegistryHttpPort-->
+
+	<!--
+	Number of items to be displayed on a management console page. This is used at the
+	backend server for pagination of various items.
+	-->
+	<ItemsPerPage>15</ItemsPerPage>
+
+	<!-- The endpoint URL of the cloud instance management Web service -->
+	<!--<InstanceMgtWSEndpoint>https://ec2.amazonaws.com/</InstanceMgtWSEndpoint>-->
+
+	<!--
+	   Ports used by this server
+	-->
+	<Ports>
+
+		<!-- Ports offset. This entry will set the value of the ports defined below to
+		 the define value + Offset.
+		 e.g. Offset=2 and HTTPS port=9443 will set the effective HTTPS port to 9445
+		 -->
+		<Offset>0</Offset>
+
+		<!-- The JMX Ports -->
+		<JMX>
+			<!--The port RMI registry is exposed-->
+			<RMIRegistryPort>9999</RMIRegistryPort>
+			<!--The port RMI server should be exposed-->
+			<RMIServerPort>11111</RMIServerPort>
+		</JMX>
+
+		<!-- Embedded LDAP server specific ports -->
+		<EmbeddedLDAP>
+			<!-- Port which embedded LDAP server runs -->
+			<LDAPServerPort>10389</LDAPServerPort>
+			<!-- Port which KDC (Kerberos Key Distribution Center) server runs -->
+			<KDCServerPort>8000</KDCServerPort>
+		</EmbeddedLDAP>
+
+		<!--
+				 Override datasources JNDIproviderPort defined in bps.xml and datasources.properties files
+		-->
+		<!--<JNDIProviderPort>2199</JNDIProviderPort>-->
+		<!--Override receive port of thrift based entitlement service.-->
+		<ThriftEntitlementReceivePort>10500</ThriftEntitlementReceivePort>
+
+	</Ports>
+
+	<!--
+		JNDI Configuration
+	-->
+	<JNDI>
+		<!--
+			 The fully qualified name of the default initial context factory
+		-->
+		<DefaultInitialContextFactory>org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory</DefaultInitialContextFactory>
+		<!--
+			 The restrictions that are done to various JNDI Contexts in a Multi-tenant environment
+		-->
+		<Restrictions>
+			<!--
+				Contexts that will be available only to the super-tenant
+			-->
+			<!-- <SuperTenantOnly>
+				<UrlContexts>
+					<UrlContext>
+						<Scheme>foo</Scheme>
+					</UrlContext>
+					<UrlContext>
+						<Scheme>bar</Scheme>
+					</UrlContext>
+				</UrlContexts>
+			</SuperTenantOnly> -->
+			<!--
+				Contexts that are common to all tenants
+			-->
+			<AllTenants>
+				<UrlContexts>
+					<UrlContext>
+						<Scheme>java</Scheme>
+					</UrlContext>
+					<!-- <UrlContext>
+						<Scheme>foo</Scheme>
+					</UrlContext> -->
+				</UrlContexts>
+			</AllTenants>
+			<!--
+				 All other contexts not mentioned above will be available on a per-tenant basis
+				 (i.e. will not be shared among tenants)
+			-->
+		</Restrictions>
+	</JNDI>
+
+	<!--
+		Property to determine if the server is running an a cloud deployment environment.
+		This property should only be used to determine deployment specific details that are
+		applicable only in a cloud deployment, i.e when the server deployed *-as-a-service.
+	-->
+	<IsCloudDeployment>false</IsCloudDeployment>
+
+	<!--
+	Property to determine whether usage data should be collected for metering purposes
+	-->
+	<EnableMetering>false</EnableMetering>
+
+	<!-- The Max time a thread should take for execution in seconds -->
+	<MaxThreadExecutionTime>600</MaxThreadExecutionTime>
+
+	<!--
+		A flag to enable or disable Ghost Deployer. By default this is set to false. That is
+		because the Ghost Deployer works only with the HTTP/S transports. If you are using
+		other transports, don't enable Ghost Deployer.
+	-->
+	<GhostDeployment>
+		<Enabled>false</Enabled>
+	</GhostDeployment>
+
+
+	<!--
+		Eager loading or lazy loading is a design pattern commonly used in computer programming which
+		will initialize an object upon creation or load on-demand. In carbon, lazy loading is used to
+		load tenant when a request is received only. Similarly Eager loading is used to enable load
+		existing tenants after carbon server starts up. Using this feature, you will be able to include
+		or exclude tenants which are to be loaded when server startup.
+
+		We can enable only one LoadingPolicy at a given time.
+
+		1. Tenant Lazy Loading
+		   This is the default behaviour and enabled by default. With this policy, tenants are not loaded at
+		   server startup, but loaded based on-demand (i.e when a request is received for a tenant).
+		   The default tenant idle time is 30 minutes.
+
+		2. Tenant Eager Loading
+		   This is by default not enabled. It can be be enabled by un-commenting the <EagerLoading> section.
+		   The eager loading configurations supported are as below. These configurations can be given as the
+		   value for <Include> element with eager loading.
+				(i)Load all tenants when server startup             -   *
+				(ii)Load all tenants except foo.com & bar.com       -   *,!foo.com,!bar.com
+				(iii)Load only foo.com &  bar.com to be included    -   foo.com,bar.com
+	-->
+	<Tenant>
+		<LoadingPolicy>
+			<LazyLoading>
+				<IdleTime>30</IdleTime>
+			</LazyLoading>
+			<!-- <EagerLoading>
+				   <Include>*,!foo.com,!bar.com</Include>
+			</EagerLoading>-->
+		</LoadingPolicy>
+	</Tenant>
+
+	<!--
+	 Caching related configurations
+	-->
+	<Cache>
+		<!-- Default cache timeout in minutes -->
+		<DefaultCacheTimeout>15</DefaultCacheTimeout>
+	</Cache>
+
+	<!--
+	Axis2 related configurations
+	-->
+	<Axis2Config>
+		<!--
+			 Location of the Axis2 Services & Modules repository
+
+			 This can be a directory in the local file system, or a URL.
+
+			 e.g.
+			 1. /home/wso2wsas/repository/ - An absolute path
+			 2. repository - In this case, the path is relative to CARBON_HOME
+			 3. file:///home/wso2wsas/repository/
+			 4. http://wso2wsas/repository/
+		-->
+		<RepositoryLocation>${carbon.home}/repository/deployment/server/</RepositoryLocation>
+
+		<!--
+		 Deployment update interval in seconds. This is the interval between repository listener
+		 executions.
+		-->
+		<DeploymentUpdateInterval>15</DeploymentUpdateInterval>
+
+		<!--
+			Location of the main Axis2 configuration descriptor file, a.k.a. axis2.xml file
+
+			This can be a file on the local file system, or a URL
+
+			e.g.
+			1. /home/repository/axis2.xml - An absolute path
+			2. conf/axis2.xml - In this case, the path is relative to CARBON_HOME
+			3. file:///home/carbon/repository/axis2.xml
+			4. http://repository/conf/axis2.xml
+		-->
+		<ConfigurationFile>${carbon.home}/repository/conf/axis2/axis2.xml</ConfigurationFile>
+
+		<!--
+		  ServiceGroupContextIdleTime, which will be set in ConfigurationContex
+		  for multiple clients which are going to access the same ServiceGroupContext
+		  Default Value is 30 Sec.
+		-->
+		<ServiceGroupContextIdleTime>30000</ServiceGroupContextIdleTime>
+
+		<!--
+		  This repository location is used to crete the client side configuration
+		  context used by the server when calling admin services.
+		-->
+		<ClientRepositoryLocation>${carbon.home}/repository/deployment/client/</ClientRepositoryLocation>
+		<!-- This axis2 xml is used in createing the configuration context by the FE server
+		 calling to BE server -->
+		<clientAxis2XmlLocation>${carbon.home}/repository/conf/axis2/axis2_client.xml</clientAxis2XmlLocation>
+		<!-- If this parameter is set, the ?wsdl on an admin service will not give the admin service wsdl. -->
+		<HideAdminServiceWSDLs>true</HideAdminServiceWSDLs>
+
+		<!--WARNING-Use With Care! Uncommenting bellow parameter would expose all AdminServices in HTTP transport.
+		With HTTP transport your credentials and data routed in public channels are vulnerable for sniffing attacks.
+		Use bellow parameter ONLY if your communication channels are confirmed to be secured by other means -->
+		<!--HttpAdminServices>*</HttpAdminServices-->
+
+	</Axis2Config>
+
+	<!--
+	   The default user roles which will be created when the server
+	   is started up for the first time.
+	-->
+	<ServiceUserRoles>
+		<Role>
+			<Name>admin</Name>
+			<Description>Default Administrator Role</Description>
+		</Role>
+		<Role>
+			<Name>user</Name>
+			<Description>Default User Role</Description>
+		</Role>
+	</ServiceUserRoles>
+
+	<!--
+	  Enable following config to allow Emails as usernames.
+	-->
+	<!--EnableEmailUserName>true</EnableEmailUserName-->
+
+	<!--
+	  Security configurations
+	-->
+	<Security>
+		<!--
+			KeyStore which will be used for encrypting/decrypting passwords
+			and other sensitive information.
+		-->
+		<KeyStore>
+			<!-- Keystore file location-->
+			<Location>${carbon.home}/repository/resources/security/wso2carbon.jks</Location>
+			<!-- Keystore type (JKS/PKCS12 etc.)-->
+			<Type>JKS</Type>
+			<!-- Keystore password-->
+			<Password>wso2carbon</Password>
+			<!-- Private Key alias-->
+			<KeyAlias>wso2carbon</KeyAlias>
+			<!-- Private Key password-->
+			<KeyPassword>wso2carbon</KeyPassword>
+		</KeyStore>
+
+		<!--
+			System wide trust-store which is used to maintain the certificates of all
+			the trusted parties.
+		-->
+		<TrustStore>
+			<!-- trust-store file location -->
+			<Location>${carbon.home}/repository/resources/security/client-truststore.jks</Location>
+			<!-- trust-store type (JKS/PKCS12 etc.) -->
+			<Type>JKS</Type>
+			<!-- trust-store password -->
+			<Password>wso2carbon</Password>
+		</TrustStore>
+
+		<!--
+			The Authenticator configuration to be used at the JVM level. We extend the
+			java.net.Authenticator to make it possible to authenticate to given servers and
+			proxies.
+		-->
+		<NetworkAuthenticatorConfig>
+			<!--
+				Below is a sample configuration for a single authenticator. Please note that
+				all child elements are mandatory. Not having some child elements would lead to
+				exceptions at runtime.
+			-->
+			<!-- <Credential> -->
+			<!--
+				the pattern that would match a subset of URLs for which this authenticator
+				would be used
+			-->
+			<!-- <Pattern>regularExpression</Pattern> -->
+			<!--
+				the type of this authenticator. Allowed values are:
+				1. server
+				2. proxy
+			-->
+			<!-- <Type>proxy</Type> -->
+			<!-- the username used to log in to server/proxy -->
+			<!-- <Username>username</Username> -->
+			<!-- the password used to log in to server/proxy -->
+			<!-- <Password>password</Password> -->
+			<!-- </Credential> -->
+		</NetworkAuthenticatorConfig>
+
+		<!--
+		 The Tomcat realm to be used for hosted Web applications. Allowed values are;
+		 1. UserManager
+		 2. Memory
+
+		 If this is set to 'UserManager', the realm will pick users & roles from the system's
+		 WSO2 User Manager. If it is set to 'memory', the realm will pick users & roles from
+		 CARBON_HOME/repository/conf/tomcat/tomcat-users.xml
+		-->
+		<TomcatRealm>UserManager</TomcatRealm>
+
+		<!--Option to disable storing of tokens issued by STS-->
+		<DisableTokenStore>false</DisableTokenStore>
+
+		<!--
+		 Security token store class name. If this is not set, default class will be
+		 org.wso2.carbon.security.util.SecurityTokenStore
+		-->
+		<!--TokenStoreClassName>org.wso2.carbon.identity.sts.store.DBTokenStore</TokenStoreClassName-->
+
+		<!--CSRFPreventionConfig>
+			<Enabled>true</Enabled>
+			<Rule>allow</Rule>
+
+			<Patterns>
+				<Pattern>carbon</Pattern>
+				<Pattern>commonauth</Pattern>
+				<Pattern>samlsso</Pattern>
+				<Pattern>authenticationendpoint</Pattern>
+				<Pattern>wso2</Pattern>
+				<Pattern>oauth2</Pattern>
+				<Pattern>openid</Pattern>
+				<Pattern>openidserver</Pattern>
+				<Pattern>passivests</Pattern>
+				<Pattern>services</Pattern>
+			</Patterns>
+
+			<WhiteList>
+				<Url>https://localhost:9443</Url>
+			</WhiteList>
+		</CSRFPreventionConfig>
+
+		<XSSPreventionConfig>
+			<Enabled>true</Enabled>
+		</XSSPreventionConfig-->
+
+	</Security>
+
+	<!--
+	   The temporary work directory
+	-->
+	<WorkDirectory>${carbon.home}/tmp/work</WorkDirectory>
+
+	<!--
+	   House-keeping configuration
+	-->
+	<HouseKeeping>
+
+		<!--
+		   true  - Start House-keeping thread on server startup
+		   false - Do not start House-keeping thread on server startup.
+				   The user will run it manually as and when he wishes.
+		-->
+		<AutoStart>true</AutoStart>
+
+		<!--
+		   The interval in *minutes*, between house-keeping runs
+		-->
+		<Interval>10</Interval>
+
+		<!--
+		  The maximum time in *minutes*, temp files are allowed to live
+		  in the system. Files/directories which were modified more than
+		  "MaxTempFileLifetime" minutes ago will be removed by the
+		  house-keeping task
+		-->
+		<MaxTempFileLifetime>30</MaxTempFileLifetime>
+	</HouseKeeping>
+
+	<!--
+	   Configuration for handling different types of file upload & other file uploading related
+	   config parameters.
+	   To map all actions to a particular FileUploadExecutor, use
+	   <Action>*</Action>
+	-->
+	<FileUploadConfig>
+		<!--
+		   The total file upload size limit in MB
+		-->
+		<TotalFileSizeLimit>100</TotalFileSizeLimit>
+
+		<Mapping>
+			<Actions>
+				<Action>keystore</Action>
+				<Action>certificate</Action>
+				<Action>*</Action>
+			</Actions>
+			<Class>org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor</Class>
+		</Mapping>
+
+		<Mapping>
+			<Actions>
+				<Action>jarZip</Action>
+			</Actions>
+			<Class>org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor</Class>
+		</Mapping>
+		<Mapping>
+			<Actions>
+				<Action>dbs</Action>
+			</Actions>
+			<Class>org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor</Class>
+		</Mapping>
+		<Mapping>
+			<Actions>
+				<Action>tools</Action>
+			</Actions>
+			<Class>org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor</Class>
+		</Mapping>
+		<Mapping>
+			<Actions>
+				<Action>toolsAny</Action>
+			</Actions>
+			<Class>org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor</Class>
+		</Mapping>
+	</FileUploadConfig>
+
+	<!--
+	   Processors which process special HTTP GET requests such as ?wsdl, ?policy etc.
+
+	   In order to plug in a processor to handle a special request, simply add an entry to this
+	   section.
+
+	   The value of the Item element is the first parameter in the query string(e.g. ?wsdl)
+	   which needs special processing
+
+	   The value of the Class element is a class which implements
+	   org.wso2.carbon.transport.HttpGetRequestProcessor
+	-->
+	<HttpGetRequestProcessors>
+		<Processor>
+			<Item>info</Item>
+			<Class>org.wso2.carbon.core.transports.util.InfoProcessor</Class>
+		</Processor>
+		<Processor>
+			<Item>wsdl</Item>
+			<Class>org.wso2.carbon.core.transports.util.Wsdl11Processor</Class>
+		</Processor>
+		<Processor>
+			<Item>wsdl2</Item>
+			<Class>org.wso2.carbon.core.transports.util.Wsdl20Processor</Class>
+		</Processor>
+		<Processor>
+			<Item>xsd</Item>
+			<Class>org.wso2.carbon.core.transports.util.XsdProcessor</Class>
+		</Processor>
+	</HttpGetRequestProcessors>
+
+	<!-- Deployment Synchronizer Configuration. t Enabled value to true when running with "svn based" dep sync.
+	In master nodes you need to set both AutoCommit and AutoCheckout to true
+	and in  worker nodes set only AutoCheckout to true.
+	-->
+	<DeploymentSynchronizer>
+		<Enabled>false</Enabled>
+		<AutoCommit>false</AutoCommit>
+		<AutoCheckout>true</AutoCheckout>
+		<RepositoryType>svn</RepositoryType>
+		<SvnUrl>http://svnrepo.example.com/repos/</SvnUrl>
+		<SvnUser>username</SvnUser>
+		<SvnPassword>password</SvnPassword>
+		<SvnUrlAppendTenantId>true</SvnUrlAppendTenantId>
+	</DeploymentSynchronizer>
+
+	<!-- Deployment Synchronizer Configuration. Uncomment the following section when running with "registry based" dep sync.
+		In master nodes you need to set both AutoCommit and AutoCheckout to true
+		and in  worker nodes set only AutoCheckout to true.
+	-->
+	<!--<DeploymentSynchronizer>
+		<Enabled>true</Enabled>
+		<AutoCommit>false</AutoCommit>
+		<AutoCheckout>true</AutoCheckout>
+	</DeploymentSynchronizer>-->
+
+	<!-- Mediation persistence configurations. Only valid if mediation features are available i.e. ESB -->
+	<!--<MediationConfig>
+		<LoadFromRegistry>false</LoadFromRegistry>
+		<SaveToFile>false</SaveToFile>
+		<Persistence>enabled</Persistence>
+		<RegistryPersistence>enabled</RegistryPersistence>
+	</MediationConfig>-->
+
+	<!--
+	Server intializing code, specified as implementation classes of org.wso2.carbon.core.ServerInitializer.
+	This code will be run when the Carbon server is initialized
+	-->
+	<ServerInitializers>
+		<!--<Initializer></Initializer>-->
+	</ServerInitializers>
+
+	<!--
+	Indicates whether the Carbon Servlet is required by the system, and whether it should be
+	registered
+	-->
+	<RequireCarbonServlet>${require.carbon.servlet}</RequireCarbonServlet>
+
+	<!--
+	Carbon H2 OSGI Configuration
+	By default non of the servers start.
+		name="web" - Start the web server with the H2 Console
+		name="webPort" - The port (default: 8082)
+		name="webAllowOthers" - Allow other computers to connect
+		name="webSSL" - Use encrypted (HTTPS) connections
+		name="tcp" - Start the TCP server
+		name="tcpPort" - The port (default: 9092)
+		name="tcpAllowOthers" - Allow other computers to connect
+		name="tcpSSL" - Use encrypted (SSL) connections
+		name="pg" - Start the PG server
+		name="pgPort"  - The port (default: 5435)
+		name="pgAllowOthers"  - Allow other computers to connect
+		name="trace" - Print additional trace information; for all servers
+		name="baseDir" - The base directory for H2 databases; for all servers
+	-->
+	<!--H2DatabaseConfiguration>
+		<property name="web" />
+		<property name="webPort">8082</property>
+		<property name="webAllowOthers" />
+		<property name="webSSL" />
+		<property name="tcp" />
+		<property name="tcpPort">9092</property>
+		<property name="tcpAllowOthers" />
+		<property name="tcpSSL" />
+		<property name="pg" />
+		<property name="pgPort">5435</property>
+		<property name="pgAllowOthers" />
+		<property name="trace" />
+		<property name="baseDir">${carbon.home}</property>
+	</H2DatabaseConfiguration-->
+	<!--Disabling statistics reporter by default-->
+	<StatisticsReporterDisabled>true</StatisticsReporterDisabled>
+
+	<!-- Enable accessing Admin Console via HTTP -->
+	<!-- EnableHTTPAdminConsole>true</EnableHTTPAdminConsole -->
+
+	<!--
+	   Default Feature Repository of WSO2 Carbon.
+	-->
+	<FeatureRepository>
+		<RepositoryName>default repository</RepositoryName>
+		<RepositoryURL>http://dist.wso2.org/p2/carbon/releases/4.4.1-SNAPSHOT</RepositoryURL>
+	</FeatureRepository>
+
+	<!--
+	Configure API Management
+   -->
+	<APIManagement>
+
+		<!--Uses the embedded API Manager by default. If you want to use an external
+		API Manager instance to manage APIs, configure below  externalAPIManager-->
+
+		<Enabled>true</Enabled>
+
+		<!--Uncomment and configure API Gateway and
+		Publisher URLs to use external API Manager instance-->
+
+		<!--ExternalAPIManager>
+
+			<APIGatewayURL>http://localhost:8281</APIGatewayURL>
+			<APIPublisherURL>http://localhost:8281/publisher</APIPublisherURL>
+
+		</ExternalAPIManager-->
+
+		<LoadAPIContextsInServerStartup>true</LoadAPIContextsInServerStartup>
+	</APIManagement>
+</Server>
--- a/modules/distribution/src/core/conf/datasources/cdm-datasources.xml
+++ b/modules/distribution/src/core/conf/datasources/cdm-datasources.xml
@ -0,0 +1,45 @@
+<!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~ 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.
+  -->
+
+<datasources-configuration xmlns:svns="http://org.wso2.securevault/configuration">
+    <providers>
+        <provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider>
+    </providers>
+    <datasources>
+        <datasource>
+            <name>DM_DS</name>
+            <description>The datasource used for CDM</description>
+            <jndiConfig>
+                <name>jdbc/DM_DS</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE</url>
+                    <username>wso2carbon</username>
+                    <password>wso2carbon</password>
+                    <driverClassName>org.h2.Driver</driverClassName>
+                    <maxActive>50</maxActive>
+                    <maxWait>60000</maxWait>
+                    <testOnBorrow>true</testOnBorrow>
+                    <validationQuery>SELECT 1</validationQuery>
+                    <validationInterval>30000</validationInterval>
+                </configuration>
+            </definition>
+        </datasource>
+    </datasources>
+</datasources-configuration>
--- a/modules/distribution/src/core/conf/datasources/master-datasources.xml
+++ b/modules/distribution/src/core/conf/datasources/master-datasources.xml
@ -0,0 +1,147 @@
+<!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~ 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.
+  -->
+
+<datasources-configuration xmlns:svns="http://org.wso2.securevault/configuration">
+    <providers>
+        <provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider>
+    </providers>
+
+    <datasources>
+        <datasource>
+            <name>WSO2_CARBON_DB</name>
+            <description>The datasource used for registry and user manager</description>
+            <jndiConfig>
+                <name>jdbc/WSO2CarbonDB</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;AUTO_SERVER=TRUE;AUTO_SERVER_PORT=9095</url>
+                    <username>wso2carbon</username>
+                    <password>wso2carbon</password>
+                    <driverClassName>org.h2.Driver</driverClassName>
+                    <maxActive>50</maxActive>
+                    <maxWait>60000</maxWait>
+                    <testOnBorrow>true</testOnBorrow>
+                    <validationQuery>SELECT 1</validationQuery>
+                    <validationInterval>30000</validationInterval>
+                </configuration>
+            </definition>
+        </datasource>
+
+        <datasource>
+            <name>WSO2APPM_DB</name>
+            <description>The datasource used for App Manager database</description>
+            <jndiConfig>
+                <name>jdbc/WSO2APPM_DB</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/WSO2APPM_DB;DB_CLOSE_ON_EXIT=FALSE</url>
+                    <username>wso2carbon</username>
+                    <password>wso2carbon</password>
+                    <driverClassName>org.h2.Driver</driverClassName>
+                    <maxActive>50</maxActive>
+                    <maxWait>60000</maxWait>
+                    <testOnBorrow>true</testOnBorrow>
+                    <validationQuery>SELECT 1</validationQuery>
+                    <validationInterval>30000</validationInterval>
+                </configuration>
+            </definition>
+        </datasource>
+
+        <datasource>
+            <name>WSO2AM_DB</name>
+            <description>The datasource used for API Manager database</description>
+            <jndiConfig>
+                <name>jdbc/WSO2AM_DB</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/WSO2AM_DB;DB_CLOSE_ON_EXIT=FALSE</url>
+                    <username>wso2carbon</username>
+                    <password>wso2carbon</password>
+                    <driverClassName>org.h2.Driver</driverClassName>
+                    <maxActive>50</maxActive>
+                    <maxWait>60000</maxWait>
+                    <testOnBorrow>true</testOnBorrow>
+                    <validationQuery>SELECT 1</validationQuery>
+                    <validationInterval>30000</validationInterval>
+                </configuration>
+            </definition>
+        </datasource>
+
+        <datasource>
+            <name>WSO2_MB_STORE_DB</name>
+            <description>The datasource used for message broker database</description>
+            <jndiConfig>
+                <name>WSO2MBStoreDB</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/WSO2MB_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000</url>
+                    <username>wso2carbon</username>
+                    <password>wso2carbon</password>
+                    <driverClassName>org.h2.Driver</driverClassName>
+                    <maxActive>50</maxActive>
+                    <maxWait>60000</maxWait>
+                    <testOnBorrow>true</testOnBorrow>
+                    <validationQuery>SELECT 1</validationQuery>
+                    <validationInterval>30000</validationInterval>
+                    <defaultAutoCommit>false</defaultAutoCommit>
+                </configuration>
+            </definition>
+        </datasource>
+        <datasource>
+            <name>JAGH2</name>
+            <description>The datasource used for by the Jaggery Storage Manager</description>
+            <jndiConfig>
+                <name>jdbc/ES_Storage</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/ES_STORAGE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000</url>
+                    <username>wso2carbon</username>
+                    <password>wso2carbon</password>
+                    <driverClassName>org.h2.Driver</driverClassName>
+                    <maxActive>50</maxActive>
+                    <maxWait>60000</maxWait>
+                </configuration>
+            </definition>
+        </datasource>
+        <datasource>
+            <name>WSO2_SOCIAL_DB</name>
+            <description>The datasource used for Store social database</description>
+            <jndiConfig>
+                <name>jdbc/WSO2_SOCIAL_DB</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/WSO2_SOCIAL_DB;DB_CLOSE_ON_EXIT=FALSE</url>
+                    <username>wso2carbon</username>
+                    <password>wso2carbon</password>
+                    <driverClassName>org.h2.Driver</driverClassName>
+                    <maxActive>50</maxActive>
+                    <maxWait>60000</maxWait>
+                    <testOnBorrow>true</testOnBorrow>
+                    <validationQuery>SELECT 1</validationQuery>
+                    <validationInterval>30000</validationInterval>
+                </configuration>
+            </definition>
+        </datasource>
+    </datasources>
+</datasources-configuration>
--- a/modules/distribution/src/core/conf/etc/device-analytics-config.xml
+++ b/modules/distribution/src/core/conf/etc/device-analytics-config.xml
@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~   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.
+  -->
+
+<AnalyticsConfiguration>
+    <!--
+        Server URL of the remote DAS/BAM/CEP server used to collect statistics. Must
+        be specified in protocol://hostname:port/ format.
+
+        An event can also be published to multiple Receiver Groups each having 1 or more receivers. Receiver
+        Groups are delimited by curly braces whereas receivers are delimited by commas.
+        Ex - Multiple Receivers within a single group
+        tcp://localhost:7612/,tcp://localhost:7613/,tcp://localhost:7614/
+        Ex - Multiple Receiver Groups with two receivers each
+                 {tcp://localhost:7612/,tcp://localhost:7613},{tcp://localhost:7712/,tcp://localhost:7713/}
+    -->
+    <Enabled>true</Enabled>
+    <ReceiverServerUrl>tcp://localhost:7613</ReceiverServerUrl>
+    <AdminUsername>admin</AdminUsername>
+    <AdminPassword>admin</AdminPassword>
+</AnalyticsConfiguration>
--- a/modules/distribution/src/core/conf/etc/launch.ini
+++ b/modules/distribution/src/core/conf/etc/launch.ini
@ -0,0 +1,258 @@
+# Eclipse Runtime Configuration Overrides
+# These properties are loaded prior to starting the framework and can also be used to override System Properties
+# @null is a special value used to override and clear the framework's copy of a System Property prior to starting the framework
+# "*" can be used together with @null to clear System Properties that match a prefix name.
+
+osgi.*=@null
+org.osgi.*=@null
+eclipse.*=@null
+
+osgi.parentClassloader=app
+osgi.contextClassLoaderParent=app
+
+# When osgi.clean is set to "true", any cached data used by the OSGi framework 
+# will be wiped clean. This will clean the caches used to store bundle 
+# dependency resolution and eclipse extension registry data. Using this 
+# option will force OSGi framework to reinitialize these caches.
+# The following setting is put in place to get rid of the problems
+# faced when re-starting the system. Please note that, when this setting is 
+# true, if you manually start a bundle, it would not be available when 
+# you re-start the system. To avid this, copy the bundle jar to the plugins 
+# folder, before you re-start the system. 
+osgi.clean=true
+
+# Uncomment the following line to turn on Eclipse Equinox debugging. 
+# You may also edit the osgi-debug.options file and fine tune the debugging 
+# options to suite your needs. 
+#osgi.debug=./repository/conf/osgi-debug.options
+
+# Following system property allows us to control the public JDK packages exported through the system bundle.
+org.osgi.framework.system.packages=javax.accessibility,\
+javax.activity,\
+javax.crypto,\
+javax.crypto.interfaces,\
+javax.crypto.spec,\
+javax.imageio,\
+javax.imageio.event,\
+javax.imageio.metadata,\
+javax.imageio.plugins.bmp,\
+javax.imageio.plugins.jpeg,\
+javax.imageio.spi,\
+javax.imageio.stream,\
+javax.jms,\
+javax.management,\
+javax.management.loading,\
+javax.management.modelmbean,\
+javax.management.monitor,\
+javax.management.openmbean,\
+javax.management.relation,\
+javax.management.remote,\
+javax.management.remote.rmi,\
+javax.management.timer,\
+javax.naming,\
+javax.naming.directory,\
+javax.naming.event,\
+javax.naming.ldap,\
+javax.naming.spi,\
+javax.net,\
+javax.net.ssl,\
+javax.print,\
+javax.print.attribute,\
+javax.print.attribute.standard,\
+javax.print.event,\
+javax.rmi,\
+javax.rmi.CORBA,\
+javax.rmi.ssl,\
+javax.script,\
+javax.security.auth,\
+javax.security.auth.callback,\
+javax.security.auth.kerberos,\
+javax.security.auth.login,\
+javax.security.auth.spi,\
+javax.security.auth.x500,\
+javax.security.cert,\
+javax.security.sasl,\
+javax.sound.midi,\
+javax.sound.midi.spi,\
+javax.sound.sampled,\
+javax.sound.sampled.spi,\
+javax.sql,\
+javax.sql.rowset,\
+javax.sql.rowset.serial,\
+javax.sql.rowset.spi,\
+javax.swing,\
+javax.swing.border,\
+javax.swing.colorchooser,\
+javax.swing.event,\
+javax.swing.filechooser,\
+javax.swing.plaf,\
+javax.swing.plaf.basic,\
+javax.swing.plaf.metal,\
+javax.swing.plaf.multi,\
+javax.swing.plaf.synth,\
+javax.swing.table,\
+javax.swing.text,\
+javax.swing.text.html,\
+javax.swing.text.html.parser,\
+javax.swing.text.rtf,\
+javax.swing.tree,\
+javax.swing.undo,\
+javax.transaction,\
+javax.transaction.xa,\
+javax.xml.namespace,\
+javax.xml.parsers,\
+javax.xml.stream,\
+javax.xml.stream.events,\
+javax.xml.stream.util,\
+javax.xml.transform,\
+javax.xml.transform.stream,\
+javax.xml.transform.dom,\
+javax.xml.transform.sax,\
+javax.xml,\
+javax.xml.validation,\
+javax.xml.datatype,\
+javax.xml.xpath,\
+javax.activation,\
+com.sun.activation.registries,\
+com.sun.activation.viewers,\
+org.ietf.jgss,\
+org.omg.CORBA,\
+org.omg.CORBA_2_3,\
+org.omg.CORBA_2_3.portable,\
+org.omg.CORBA.DynAnyPackage,\
+org.omg.CORBA.ORBPackage,\
+org.omg.CORBA.portable,\
+org.omg.CORBA.TypeCodePackage,\
+org.omg.CosNaming,\
+org.omg.CosNaming.NamingContextExtPackage,\
+org.omg.CosNaming.NamingContextPackage,\
+org.omg.Dynamic,\
+org.omg.DynamicAny,\
+org.omg.DynamicAny.DynAnyFactoryPackage,\
+org.omg.DynamicAny.DynAnyPackage,\
+org.omg.IOP,\
+org.omg.IOP.CodecFactoryPackage,\
+org.omg.IOP.CodecPackage,\
+org.omg.Messaging,\
+org.omg.PortableInterceptor,\
+org.omg.PortableInterceptor.ORBInitInfoPackage,\
+org.omg.PortableServer,\
+org.omg.PortableServer.CurrentPackage,\
+org.omg.PortableServer.POAManagerPackage,\
+org.omg.PortableServer.POAPackage,\
+org.omg.PortableServer.portable,\
+org.omg.PortableServer.ServantLocatorPackage,\
+org.omg.SendingContext,\
+org.omg.stub.java.rmi,\
+org.w3c.dom,\
+org.w3c.dom.bootstrap,\
+org.w3c.dom.css,\
+org.w3c.dom.events,\
+org.w3c.dom.html,\
+org.w3c.dom.ls,\
+org.w3c.dom.ranges,\
+org.w3c.dom.stylesheets,\
+org.w3c.dom.traversal,\
+org.w3c.dom.views ,\
+org.xml.sax,\
+org.xml.sax.ext,\
+org.xml.sax.helpers,\
+org.apache.xerces.xpointer,\
+org.apache.xerces.xni.grammars,\
+org.apache.xerces.impl.xs.util,\
+org.apache.xerces.jaxp.validation,\
+org.apache.xerces.impl.dtd.models,\
+org.apache.xerces.impl.xpath,\
+org.apache.xerces.dom3.as,\
+org.apache.xerces.impl.dv.xs,\
+org.apache.xerces.util,\
+org.apache.xerces.impl.xs.identity,\
+org.apache.xerces.impl.xs.opti,\
+org.apache.xerces.jaxp,\
+org.apache.xerces.impl.dv,\
+org.apache.xerces.xs.datatypes,\
+org.apache.xerces.dom.events,\
+org.apache.xerces.impl.msg,\
+org.apache.xerces.xni,\
+org.apache.xerces.impl.xs,\
+org.apache.xerces.impl,\
+org.apache.xerces.impl.io,\
+org.apache.xerces.xinclude,\
+org.apache.xerces.jaxp.datatype,\
+org.apache.xerces.parsers,\
+org.apache.xerces.impl.dv.util,\
+org.apache.xerces.xni.parser,\
+org.apache.xerces.impl.xs.traversers,\
+org.apache.xerces.impl.dv.dtd,\
+org.apache.xerces.xs,\
+org.apache.xerces.impl.dtd,\
+org.apache.xerces.impl.validation,\
+org.apache.xerces.impl.xs.models,\
+org.apache.xerces.impl.xpath.regex,\
+org.apache.xml.serialize,\
+org.apache.xerces.dom,\
+org.apache.xalan,\
+org.apache.xalan.xslt,\
+org.apache.xalan.templates,\
+org.apache.xalan.xsltc,\
+org.apache.xalan.xsltc.cmdline,\
+org.apache.xalan.xsltc.cmdline.getopt,\
+org.apache.xalan.xsltc.trax,\
+org.apache.xalan.xsltc.dom,\
+org.apache.xalan.xsltc.runtime,\
+org.apache.xalan.xsltc.runtime.output,\
+org.apache.xalan.xsltc.util,\
+org.apache.xalan.xsltc.compiler,\
+org.apache.xalan.xsltc.compiler.util,\
+org.apache.xalan.serialize,\
+org.apache.xalan.client,\
+org.apache.xalan.res,\
+org.apache.xalan.transformer,\
+org.apache.xalan.extensions,\
+org.apache.xalan.lib,\
+org.apache.xalan.lib.sql,\
+org.apache.xalan.processor,\
+org.apache.xalan.trace,\
+org.apache.xml.dtm,\
+org.apache.xml.dtm.ref,\
+org.apache.xml.dtm.ref.sax2dtm,\
+org.apache.xml.dtm.ref.dom2dtm,\
+org.apache.xml.utils,\
+org.apache.xml.utils.res,\
+org.apache.xml.res,\
+org.apache.xml.serializer,\
+org.apache.xml.serializer.utils,\
+org.apache.xpath,\
+org.apache.xpath.domapi,\
+org.apache.xpath.objects,\
+org.apache.xpath.patterns,\
+org.apache.xpath.jaxp,\
+org.apache.xpath.res,\
+org.apache.xpath.operations,\
+org.apache.xpath.functions,\
+org.apache.xpath.axes,\
+org.apache.xpath.compiler,\
+org.apache.xml.resolver,\
+org.apache.xml.resolver.tools,\
+org.apache.xml.resolver.helpers,\
+org.apache.xml.resolver.readers,\
+org.apache.xml.resolver.etc,\
+org.apache.xml.resolver.apps,\
+javax.xml.ws,\
+javax.xml.ws.handler,\
+javax.xml.ws.handler.soap,\
+javax.xml.ws.http,\
+javax.xml.ws.soap,\
+javax.xml.ws.spi,\
+javax.xml.ws.spi.http,\
+javax.xml.ws.wsaddressing,\
+javax.xml.bind,\
+javax.xml.bind.annotation,\
+javax.annotation,\
+javax.xml.bind.annotation.adapters,\
+javax.jws,\
+javax.jws.soap,\
+com.sun.xml.internal.messaging.saaj.soap.ver1_1,\
+com.sun.xml.internal.messaging.saaj.soap,\
+com.sun.tools.internal.ws.spi,\
+org.wso2.carbon.bootstrap
--- a/modules/distribution/src/core/conf/etc/webapp-publisher-config.xml
+++ b/modules/distribution/src/core/conf/etc/webapp-publisher-config.xml
@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~   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.
+  -->
+
+<!--
+        This configuration file represents the configuration that are needed
+        when publishing APIs to API Manager
+-->
+<WebappPublisherConfigs>
+
+	<!-- This host is used to define the host address which is used to publish APIs -->
+	<Host>https://${iot.core.host}:${iot.core.https.port}</Host>
+
+	<!-- If it is true, the APIs of this instance will be published to the defined host -->
+	<PublishAPI>true</PublishAPI>
+
+	<!-- If it is true, the APIs of this instance will be updated when the webapps are redeployed -->
+	<EnabledUpdateApi>false</EnabledUpdateApi>
+
+	<!--Webapp will be published only when running below profiles-->
+	<Profiles>
+		<Profile>default</Profile>
+		<Profile>device-manager</Profile>
+	</Profiles>
+</WebappPublisherConfigs>
--- a/modules/distribution/src/core/conf/identity/application-authentication.xml
+++ b/modules/distribution/src/core/conf/identity/application-authentication.xml
@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~
+~ Licensed 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.
+ -->
+
+<ApplicationAuthentication xmlns="http://wso2.org/projects/carbon/application-authentication.xml">
+
+    <!--
+        ProxyMode allows framework to operate in either 'smart' mode
+        or 'dumb' mode.
+        smart = both local and federated authentication is supported
+        dumb = only federated authentication is supported
+    -->
+    <ProxyMode>smart</ProxyMode>
+
+    <!--
+        AuthenticationEndpointURL is location of the web app containing
+        the authentication related pages
+    -->
+    <AuthenticationEndpointURL>/devicemgt/login</AuthenticationEndpointURL>
+    <AuthenticationEndpointRetryURL>/authenticationendpoint/retry.do</AuthenticationEndpointRetryURL>
+
+    <!--
+        Extensions allow extending the default behaviour of the authentication
+        process.
+    -->
+    <Extensions>
+        <RequestCoordinator>org.wso2.carbon.identity.application.authentication.framework.handler.request.impl.DefaultRequestCoordinator</RequestCoordinator>
+        <AuthenticationRequestHandler>org.wso2.carbon.identity.application.authentication.framework.handler.request.impl.DefaultAuthenticationRequestHandler</AuthenticationRequestHandler>
+        <LogoutRequestHandler>org.wso2.carbon.identity.application.authentication.framework.handler.request.impl.DefaultLogoutRequestHandler</LogoutRequestHandler>
+        <StepBasedSequenceHandler>org.wso2.carbon.identity.application.authentication.framework.handler.sequence.impl.DefaultStepBasedSequenceHandler</StepBasedSequenceHandler>
+        <RequestPathBasedSequenceHandler>org.wso2.carbon.identity.application.authentication.framework.handler.sequence.impl.DefaultRequestPathBasedSequenceHandler</RequestPathBasedSequenceHandler>
+        <StepHandler>org.wso2.carbon.identity.application.authentication.framework.handler.step.impl.DefaultStepHandler</StepHandler>
+        <HomeRealmDiscoverer>org.wso2.carbon.identity.application.authentication.framework.handler.hrd.impl.DefaultHomeRealmDiscoverer</HomeRealmDiscoverer>
+        <ClaimHandler>org.wso2.carbon.identity.application.authentication.framework.handler.claims.impl.DefaultClaimHandler</ClaimHandler>
+        <ProvisioningHandler>org.wso2.carbon.identity.application.authentication.framework.handler.provisioning.impl.DefaultProvisioningHandler</ProvisioningHandler>
+    </Extensions>
+
+    <!--
+        AuthenticatorNameMappings allow specifying an authenticator
+        against a pre-defined alias (which will be used by other components.
+        E.g. Application Mgt component). This enables the usage of a custom
+        authenticator in place of an authenticator that gets packed with the
+        distribution.
+    -->
+    <AuthenticatorNameMappings>
+        <AuthenticatorNameMapping name="BasicAuthenticator" alias="basic" />
+        <AuthenticatorNameMapping name="OAuthRequestPathAuthenticator" alias="oauth-bearer" />
+        <AuthenticatorNameMapping name="BasicAuthRequestPathAuthenticator" alias="basic-auth" />
+        <AuthenticatorNameMapping name="IWAAuthenticator" alias="iwa" />
+        <AuthenticatorNameMapping name="SAMLSSOAuthenticator" alias="samlsso" />
+        <AuthenticatorNameMapping name="OpenIDConnectAuthenticator" alias="openidconnect" />
+        <AuthenticatorNameMapping name="OpenIDAuthenticator" alias="openid" />
+        <AuthenticatorNameMapping name="PassiveSTSAuthenticator" alias="passive-sts" />
+    </AuthenticatorNameMappings>
+
+    <!--
+		AuthenticatorConfigs allow specifying various configurations needed
+		by the authenticators by using any number of \'Parameter\' elements
+		E.g.
+		<AuthenticatorConfig name="CustomAuthenticator" enabled="true" />
+			<Parameter name="paramName1">paramValue</Parameter>
+			<Parameter name="paramName2">paramValue</Parameter>
+		</AuthenticatorConfig>
+    -->
+    <AuthenticatorConfigs>
+        <AuthenticatorConfig name="BasicAuthenticator" enabled="true">
+            <!--Parameter name="UserNameAttributeClaimUri">http://wso2.org/claims/emailaddress</Parameter-->
+            <!--Parameter name="showAuthFailureReason">true</Parameter-->
+        </AuthenticatorConfig>
+        <AuthenticatorConfig name="OAuthRequestPathAuthenticator" enabled="true" />
+        <AuthenticatorConfig name="BasicAuthRequestPathAuthenticator" enabled="true" />
+        <AuthenticatorConfig name="SAMLSSOAuthenticator" enabled="true">
+            <!--Parameter name="SignAuth2SAMLUsingSuperTenant">true</Parameter-->
+            <!--Parameter name="SAML2SSOManager">org.wso2.carbon.identity.application.authenticator.samlsso.manager.DefaultSAML2SSOManager</Parameter-->
+        </AuthenticatorConfig>
+        <AuthenticatorConfig name="OpenIDConnectAuthenticator" enabled="true">
+            <!--Parameter name="IDTokenHandler">org.wso2.carbon.identity.application.authenticator.oidc.DefaultIDTokenHandler</Parameter-->
+            <!--Parameter name="ClaimsRetriever">org.wso2.carbon.identity.application.authenticator.oidc.OIDCUserInfoClaimsRetriever</Parameter-->
+        </AuthenticatorConfig>
+        <AuthenticatorConfig name="OpenIDAuthenticator" enabled="true">
+            <Parameter name="LoginPage">/authenticationendpoint/login.do</Parameter>
+            <Parameter name="TrustStorePath">/repository/resources/security/client-truststore.jks</Parameter>
+            <Parameter name="TrustStorePassword">wso2carbon</Parameter>
+            <!--Parameter name="OpenIDManager">org.wso2.carbon.identity.application.authenticator.openid.manager.DefaultOpenIDManager</Parameter>
+            <Parameter name="AttributesRequestor">org.wso2.carbon.identity.application.authenticator.openid.manager.SampleAttributesRequestor</Parameter-->
+        </AuthenticatorConfig>
+        <AuthenticatorConfig name="GoogleOIDCAuthenticator" enabled="true">
+            <Parameter name="GoogleTokenEndpoint">https://accounts.google.com/o/oauth2/token</Parameter>
+            <Parameter name="GoogleAuthzEndpoint">https://accounts.google.com/o/oauth2/auth</Parameter>
+            <Parameter name="GoogleUserInfoEndpoint">https://www.googleapis.com/oauth2/v3/userinfo</Parameter>
+        </AuthenticatorConfig>
+        <AuthenticatorConfig name="MicrosoftWindowsLive" enabled="true">
+            <Parameter name="AuthTokenEndpoint">https://login.live.com/oauth20_token.srf</Parameter>
+            <Parameter name="AuthnEndpoint">https://login.live.com/oauth20_authorize.srf</Parameter>
+            <Parameter name="UserInfoEndpoint">https://apis.live.net/v5.0/me?access_token=</Parameter>
+        </AuthenticatorConfig>
+        <AuthenticatorConfig name="FacebookAuthenticator" enabled="true">
+            <Parameter name="AuthTokenEndpoint">https://graph.facebook.com/oauth/access_token</Parameter>
+            <Parameter name="AuthnEndpoint">http://www.facebook.com/dialog/oauth</Parameter>
+            <Parameter name="UserInfoEndpoint">https://graph.facebook.com/me</Parameter>
+        </AuthenticatorConfig>
+        <AuthenticatorConfig  name="FIDOAuthenticator" enabled="true">
+            <Parameter name="FidoAuth">/authenticationendpoint/fido-auth.jsp</Parameter>
+        </AuthenticatorConfig>
+        <AuthenticatorConfig name="YahooOAuth2Authenticator" enabled="true">
+            <Parameter name="YahooTokenEndpoint">https://api.login.yahoo.com/oauth2/get_token</Parameter>
+            <Parameter name="YahooOAuthzEndpoint">https://api.login.yahoo.com/oauth2/request_auth</Parameter>
+            <Parameter name="YahooUserInfoEndpoint">https://social.yahooapis.com/v1/user/</Parameter>
+        </AuthenticatorConfig>
+    </AuthenticatorConfigs>
+
+    <!--
+		Sequences allow specifying authentication flows for different
+		registered applications. \'default\' sequence is taken if an
+		application specific sequence doesn't exist in this file or
+		in the Application Mgt module.
+    -->
+    <Sequences>
+        <!-- Default Sequence. This is mandatory -->
+        <Sequence appId="default">
+            <Step order="1">
+                <Authenticator name="BasicAuthenticator"/>
+            </Step>
+        </Sequence>
+    </Sequences>
+
+    <!--
+            AuthenticationEndpointQueryParams are the request parameters
+            that would be sent to the AuthenticationEndpoint.
+            'action' defines the behaviour: if 'include', only the defined
+            parameters would be included in the request.
+            If 'exclude' specified, all the parameters received by the
+            Authentication Framework would be sent in the request except
+            the ones specified.
+            'sessionDataKey', 'type', 'relyingParty', 'sp' and 'authenticators'
+            parameters will be always sent. They should not be specified here.
+        -->
+    <AuthenticationEndpointQueryParams action="exclude">
+        <AuthenticationEndpointQueryParam name="username"/>
+        <AuthenticationEndpointQueryParam name="password"/>
+        <AuthenticationEndpointQueryParam name="SAMLRequest"/>
+    </AuthenticationEndpointQueryParams>
+
+    <!--TenantDomainDropDownEnabled>true</TenantDomainDropDownEnabled>
+    <TenantDataListenerURLs>
+      <TenantDataListenerURL>/authenticationendpoint/tenantlistrefresher.do</TenantDataListenerURL>
+    </TenantDataListenerURLs-->
+
+</ApplicationAuthentication>
--- a/modules/distribution/src/core/conf/identity/identity-providers/default.xml
+++ b/modules/distribution/src/core/conf/identity/identity-providers/default.xml
@ -0,0 +1,42 @@
+<!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~ 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.
+  -->
+
+<IdentityProvider>
+    <IdentityProviderName>default</IdentityProviderName>
+    <DisplayName>default</DisplayName>
+    <IdentityProviderDescription></IdentityProviderDescription>
+    <Alias></Alias>
+    <IsPrimary></IsPrimary>
+    <IsFederationHub></IsFederationHub>
+    <HomeRealmId></HomeRealmId>
+    <ProvisioningRole></ProvisioningRole>
+    <FederatedAuthenticatorConfigs></FederatedAuthenticatorConfigs>
+    <DefaultAuthenticatorConfig>
+    </DefaultAuthenticatorConfig>
+    <ProvisioningConnectorConfigs>
+        <ProvisioningConnectorConfig>
+            <ProvisioningProperties>
+            </ProvisioningProperties>
+        </ProvisioningConnectorConfig>
+    </ProvisioningConnectorConfigs>
+    <DefaultProvisioningConnectorConfig></DefaultProvisioningConnectorConfig>
+    <ClaimConfig></ClaimConfig>
+    <Certificate></Certificate>
+    <PermissionAndRoleConfig></PermissionAndRoleConfig>
+    <JustInTimeProvisioningConfig></JustInTimeProvisioningConfig>
+</IdentityProvider>
--- a/modules/distribution/src/core/conf/identity/identity-providers/iot_default.xml
+++ b/modules/distribution/src/core/conf/identity/identity-providers/iot_default.xml
@ -0,0 +1,44 @@
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~ 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.
+  -->
+
+<IdentityProvider>
+	<IdentityProviderName>wso2.org/products/iot</IdentityProviderName>
+	<DisplayName>wso2.org/products/iot</DisplayName>
+	<IdentityProviderDescription></IdentityProviderDescription>
+	<Alias>devicemgt</Alias>
+	<IsPrimary>true</IsPrimary>
+	<IsFederationHub></IsFederationHub>
+	<HomeRealmId></HomeRealmId>
+	<ProvisioningRole></ProvisioningRole>
+	<FederatedAuthenticatorConfigs></FederatedAuthenticatorConfigs>
+	<DefaultAuthenticatorConfig>
+	</DefaultAuthenticatorConfig>
+	<ProvisioningConnectorConfigs>
+		<!--<ProvisioningConnectorConfig>
+			<ProvisioningProperties>
+			</ProvisioningProperties>
+		</ProvisioningConnectorConfig>-->
+	</ProvisioningConnectorConfigs>
+	<!--<DefaultProvisioningConnectorConfig></DefaultProvisioningConnectorConfig>-->
+	<ClaimConfig></ClaimConfig>
+	<Certificate>
+MIICNTCCAZ6gAwIBAgIES343gjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDU1vdW50YWluIFZpZXcxDTALBgNVBAoMBFdTTzIxEjAQBgNVBAMMCWxvY2FsaG9zdDAeFw0xMDAyMTkwNzAyMjZaFw0zNTAyMTMwNzAyMjZaMFUxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzENMAsGA1UECgwEV1NPMjESMBAGA1UEAwwJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCUp/oV1vWc8/TkQSiAvTousMzOM4asB2iltr2QKozni5aVFu818MpOLZIr8LMnTzWllJvvaA5RAAdpbECb+48FjbBe0hseUdN5HpwvnH/DW8ZccGvk53I6Orq7hLCv1ZHtuOCokghz/ATrhyPq+QktMfXnRS4HrKGJTzxaCcU7OQIDAQABoxIwEDAOBgNVHQ8BAf8EBAMCBPAwDQYJKoZIhvcNAQEFBQADgYEAW5wPR7cr1LAdq+IrR44iQlRG5ITCZXY9hI0PygLP2rHANh+PYfTmxbuOnykNGyhM6FjFLbW2uZHQTY1jMrPprjOrmyK5sjJRO4d1DeGHT/YnIjs9JogRKv4XHECwLtIVdAbIdWHEtVZJyMSktcyysFcvuhPQK8Qc/E/Wq8uHSCo=
+	</Certificate>
+	<PermissionAndRoleConfig></PermissionAndRoleConfig>
+	<JustInTimeProvisioningConfig></JustInTimeProvisioningConfig>
+</IdentityProvider>
--- a/modules/distribution/src/core/conf/identity/service-providers/API_STORE.xml
+++ b/modules/distribution/src/core/conf/identity/service-providers/API_STORE.xml
@ -0,0 +1,60 @@
+<!--
+~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~
+~ Licensed 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.
+ -->
+
+<ServiceProvider>
+  <ApplicationID>8</ApplicationID>
+  <ApplicationName>API_STORE</ApplicationName>
+  <Description>App Manager - Publisher</Description>
+  <InboundAuthenticationConfig>
+    <InboundAuthenticationRequestConfigs>
+      <InboundAuthenticationRequestConfig>
+        <InboundAuthKey>API_STORE</InboundAuthKey>
+        <InboundAuthType>samlsso</InboundAuthType>
+        <Properties>
+        </Properties>
+      </InboundAuthenticationRequestConfig>
+    </InboundAuthenticationRequestConfigs>
+  </InboundAuthenticationConfig>
+  <LocalAndOutBoundAuthenticationConfig>
+    <AuthenticationSteps>
+      <AuthenticationStep>
+        <StepOrder>1</StepOrder>
+        <LocalAuthenticatorConfigs>
+          <LocalAuthenticatorConfig>
+            <Name>BasicAuthenticator</Name>
+            <DisplayName>basicauth</DisplayName>
+            <IsEnabled>true</IsEnabled>
+          </LocalAuthenticatorConfig>
+        </LocalAuthenticatorConfigs>
+        <SubjectStep>true</SubjectStep>
+        <AttributeStep>true</AttributeStep>
+      </AuthenticationStep>
+    </AuthenticationSteps>
+    <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
+    <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
+  </LocalAndOutBoundAuthenticationConfig>
+  <RequestPathAuthenticatorConfigs>
+  </RequestPathAuthenticatorConfigs>
+  <InboundProvisioningConfig>
+  </InboundProvisioningConfig>
+  <OutboundProvisioningConfig>
+  </OutboundProvisioningConfig>
+  <ClaimConfig>
+    <AlwaysSendMappedLocalSubjectId>true</AlwaysSendMappedLocalSubjectId>
+  </ClaimConfig>
+  <PermissionAndRoleConfig>
+  </PermissionAndRoleConfig>
+</ServiceProvider>
--- a/modules/distribution/src/core/conf/identity/service-providers/default.xml
+++ b/modules/distribution/src/core/conf/identity/service-providers/default.xml
@ -0,0 +1,67 @@
+<!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~ 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.
+  -->
+
+<ServiceProvider>
+    <ApplicationID>1</ApplicationID>
+    <ApplicationName>default</ApplicationName>
+    <Description>Default Service Provider</Description>
+    <InboundAuthenticationConfig>
+        <InboundAuthenticationRequestConfigs>
+            <InboundAuthenticationRequestConfig>
+                <InboundAuthKey>default</InboundAuthKey>
+                <InboundAuthType></InboundAuthType>
+                <Properties></Properties>
+            </InboundAuthenticationRequestConfig>
+        </InboundAuthenticationRequestConfigs>
+    </InboundAuthenticationConfig>
+    <LocalAndOutBoundAuthenticationConfig>
+        <AuthenticationSteps>
+            <AuthenticationStep>
+                <StepOrder>1</StepOrder>
+                <LocalAuthenticatorConfigs>
+                    <LocalAuthenticatorConfig>
+                        <Name>BasicAuthenticator</Name>
+                        <DisplayName>basicauth</DisplayName>
+                        <IsEnabled>true</IsEnabled>
+                    </LocalAuthenticatorConfig>
+                </LocalAuthenticatorConfigs>
+                <!-- FederatedIdentityProviders>
+                 <IdentityProvider>
+                       <IdentityProviderName>facebook</IdentityProviderName>
+                       <IsEnabled>true</IsEnabled>
+                                     <DefaultAuthenticatorConfig>
+                                             <FederatedAuthenticatorConfig>
+                                                     <Name>FacebookAuthenticator</Name>
+                                                     <IsEnabled>true</IsEnabled>
+                                             </FederatedAuthenticatorConfig>
+                                     </DefaultAuthenticatorConfig>
+                 </IdentityProvider>
+                </FederatedIdentityProviders -->
+                <SubjectStep>true</SubjectStep>
+                <AttributeStep>true</AttributeStep>
+            </AuthenticationStep>
+        </AuthenticationSteps>
+    </LocalAndOutBoundAuthenticationConfig>
+    <RequestPathAuthenticatorConfigs></RequestPathAuthenticatorConfigs>
+    <InboundProvisioningConfig></InboundProvisioningConfig>
+    <OutboundProvisioningConfig></OutboundProvisioningConfig>
+    <ClaimConfig>
+        <AlwaysSendMappedLocalSubjectId>true</AlwaysSendMappedLocalSubjectId>
+    </ClaimConfig>
+    <PermissionAndRoleConfig></PermissionAndRoleConfig>
+</ServiceProvider>
--- a/modules/distribution/src/core/conf/identity/service-providers/devicemgt.xml
+++ b/modules/distribution/src/core/conf/identity/service-providers/devicemgt.xml
@ -0,0 +1,60 @@
+<!--
+~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~
+~ Licensed 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.
+ -->
+
+<ServiceProvider>
+    <ApplicationID>8</ApplicationID>
+    <ApplicationName>devicemgt</ApplicationName>
+    <Description>Device Manager</Description>
+    <InboundAuthenticationConfig>
+        <InboundAuthenticationRequestConfigs>
+            <InboundAuthenticationRequestConfig>
+                <InboundAuthKey>devicemgt</InboundAuthKey>
+                <InboundAuthType>samlsso</InboundAuthType>
+                <Properties>
+                </Properties>
+            </InboundAuthenticationRequestConfig>
+        </InboundAuthenticationRequestConfigs>
+    </InboundAuthenticationConfig>
+    <LocalAndOutBoundAuthenticationConfig>
+        <AuthenticationSteps>
+            <AuthenticationStep>
+                <StepOrder>1</StepOrder>
+                <LocalAuthenticatorConfigs>
+                    <LocalAuthenticatorConfig>
+                        <Name>BasicAuthenticator</Name>
+                        <DisplayName>basicauth</DisplayName>
+                        <IsEnabled>true</IsEnabled>
+                    </LocalAuthenticatorConfig>
+                </LocalAuthenticatorConfigs>
+                <SubjectStep>true</SubjectStep>
+                <AttributeStep>true</AttributeStep>
+            </AuthenticationStep>
+        </AuthenticationSteps>
+        <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
+        <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
+    </LocalAndOutBoundAuthenticationConfig>
+    <RequestPathAuthenticatorConfigs>
+    </RequestPathAuthenticatorConfigs>
+    <InboundProvisioningConfig>
+    </InboundProvisioningConfig>
+    <OutboundProvisioningConfig>
+    </OutboundProvisioningConfig>
+    <ClaimConfig>
+        <AlwaysSendMappedLocalSubjectId>true</AlwaysSendMappedLocalSubjectId>
+    </ClaimConfig>
+    <PermissionAndRoleConfig>
+    </PermissionAndRoleConfig>
+</ServiceProvider>
--- a/modules/distribution/src/core/conf/identity/service-providers/portal.xml
+++ b/modules/distribution/src/core/conf/identity/service-providers/portal.xml
@ -0,0 +1,60 @@
+<!--
+~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~
+~ Licensed 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.
+ -->
+
+<ServiceProvider>
+    <ApplicationID>9</ApplicationID>
+    <ApplicationName>portal</ApplicationName>
+    <Description>Carbon Dashboards Portal</Description>
+    <InboundAuthenticationConfig>
+        <InboundAuthenticationRequestConfigs>
+            <InboundAuthenticationRequestConfig>
+                <InboundAuthKey>portal</InboundAuthKey>
+                <InboundAuthType>samlsso</InboundAuthType>
+                <Properties>
+                </Properties>
+            </InboundAuthenticationRequestConfig>
+        </InboundAuthenticationRequestConfigs>
+    </InboundAuthenticationConfig>
+    <LocalAndOutBoundAuthenticationConfig>
+        <AuthenticationSteps>
+            <AuthenticationStep>
+                <StepOrder>1</StepOrder>
+                <LocalAuthenticatorConfigs>
+                    <LocalAuthenticatorConfig>
+                        <Name>BasicAuthenticator</Name>
+                        <DisplayName>basicauth</DisplayName>
+                        <IsEnabled>true</IsEnabled>
+                    </LocalAuthenticatorConfig>
+                </LocalAuthenticatorConfigs>
+                <SubjectStep>true</SubjectStep>
+                <AttributeStep>true</AttributeStep>
+            </AuthenticationStep>
+        </AuthenticationSteps>
+        <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
+        <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
+    </LocalAndOutBoundAuthenticationConfig>
+    <RequestPathAuthenticatorConfigs>
+    </RequestPathAuthenticatorConfigs>
+    <InboundProvisioningConfig>
+    </InboundProvisioningConfig>
+    <OutboundProvisioningConfig>
+    </OutboundProvisioningConfig>
+    <ClaimConfig>
+        <AlwaysSendMappedLocalSubjectId>true</AlwaysSendMappedLocalSubjectId>
+    </ClaimConfig>
+    <PermissionAndRoleConfig>
+    </PermissionAndRoleConfig>
+</ServiceProvider>
--- a/modules/distribution/src/core/conf/identity/service-providers/publisher.xml
+++ b/modules/distribution/src/core/conf/identity/service-providers/publisher.xml
@ -0,0 +1,60 @@
+<!--
+~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~
+~ Licensed 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.
+ -->
+
+<ServiceProvider>
+  <ApplicationID>2</ApplicationID>
+  <ApplicationName>publisher</ApplicationName>
+  <Description>App Manager - Publisher</Description>
+  <InboundAuthenticationConfig>
+    <InboundAuthenticationRequestConfigs>
+      <InboundAuthenticationRequestConfig>
+        <InboundAuthKey>publisher</InboundAuthKey>
+        <InboundAuthType>samlsso</InboundAuthType>
+        <Properties>
+        </Properties>
+      </InboundAuthenticationRequestConfig>
+    </InboundAuthenticationRequestConfigs>
+  </InboundAuthenticationConfig>
+  <LocalAndOutBoundAuthenticationConfig>
+    <AuthenticationSteps>
+      <AuthenticationStep>
+        <StepOrder>1</StepOrder>
+        <LocalAuthenticatorConfigs>
+          <LocalAuthenticatorConfig>
+            <Name>BasicAuthenticator</Name>
+            <DisplayName>basicauth</DisplayName>
+            <IsEnabled>true</IsEnabled>
+          </LocalAuthenticatorConfig>
+        </LocalAuthenticatorConfigs>
+        <SubjectStep>true</SubjectStep>
+        <AttributeStep>true</AttributeStep>
+      </AuthenticationStep>
+    </AuthenticationSteps>
+    <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
+    <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
+  </LocalAndOutBoundAuthenticationConfig>
+  <RequestPathAuthenticatorConfigs>
+  </RequestPathAuthenticatorConfigs>
+  <InboundProvisioningConfig>
+  </InboundProvisioningConfig>
+  <OutboundProvisioningConfig>
+  </OutboundProvisioningConfig>
+  <ClaimConfig>
+    <AlwaysSendMappedLocalSubjectId>true</AlwaysSendMappedLocalSubjectId>
+  </ClaimConfig>
+  <PermissionAndRoleConfig>
+  </PermissionAndRoleConfig>
+</ServiceProvider>
--- a/modules/distribution/src/core/conf/identity/service-providers/sp_cdm.xml
+++ b/modules/distribution/src/core/conf/identity/service-providers/sp_cdm.xml
@ -0,0 +1,67 @@
+<!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~ 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.
+  -->
+
+<ServiceProvider>
+    <ApplicationID>2</ApplicationID>
+    <ApplicationName>wso2_cdm</ApplicationName>
+    <Description>CDM</Description>
+    <InboundAuthenticationConfig>
+        <InboundAuthenticationRequestConfigs>
+            <InboundAuthenticationRequestConfig>
+                <InboundAuthKey>cdm</InboundAuthKey>
+                <InboundAuthType>samlsso</InboundAuthType>
+                <Properties></Properties>
+            </InboundAuthenticationRequestConfig>
+        </InboundAuthenticationRequestConfigs>
+    </InboundAuthenticationConfig>
+    <LocalAndOutBoundAuthenticationConfig>
+        <AuthenticationSteps>
+            <AuthenticationStep>
+                <StepOrder>1</StepOrder>
+                <LocalAuthenticatorConfigs>
+                    <LocalAuthenticatorConfig>
+                        <Name>BasicAuthenticator</Name>
+                        <DisplayName>basicauth</DisplayName>
+                        <IsEnabled>true</IsEnabled>
+                    </LocalAuthenticatorConfig>
+                </LocalAuthenticatorConfigs>
+                <!-- FederatedIdentityProviders>
+                 <IdentityProvider>
+                       <IdentityProviderName>facebook</IdentityProviderName>
+                       <IsEnabled>true</IsEnabled>
+                                     <DefaultAuthenticatorConfig>
+                                             <FederatedAuthenticatorConfig>
+                                                     <Name>FacebookAuthenticator</Name>
+                                                     <IsEnabled>true</IsEnabled>
+                                             </FederatedAuthenticatorConfig>
+                                     </DefaultAuthenticatorConfig>
+                 </IdentityProvider>
+                </FederatedIdentityProviders -->
+                <SubjectStep>true</SubjectStep>
+                <AttributeStep>true</AttributeStep>
+            </AuthenticationStep>
+        </AuthenticationSteps>
+    </LocalAndOutBoundAuthenticationConfig>
+    <RequestPathAuthenticatorConfigs></RequestPathAuthenticatorConfigs>
+    <InboundProvisioningConfig></InboundProvisioningConfig>
+    <OutboundProvisioningConfig></OutboundProvisioningConfig>
+    <ClaimConfig>
+        <AlwaysSendMappedLocalSubjectId>true</AlwaysSendMappedLocalSubjectId>
+    </ClaimConfig>
+    <PermissionAndRoleConfig></PermissionAndRoleConfig>
+</ServiceProvider>
--- a/modules/distribution/src/core/conf/identity/service-providers/sp_mdm.xml
+++ b/modules/distribution/src/core/conf/identity/service-providers/sp_mdm.xml
@ -0,0 +1,67 @@
+<!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~ 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.
+  -->
+
+<ServiceProvider>
+    <ApplicationID>2</ApplicationID>
+    <ApplicationName>wso2_mdm</ApplicationName>
+    <Description>MDM</Description>
+    <InboundAuthenticationConfig>
+        <InboundAuthenticationRequestConfigs>
+            <InboundAuthenticationRequestConfig>
+                <InboundAuthKey>mdm</InboundAuthKey>
+                <InboundAuthType>samlsso</InboundAuthType>
+                <Properties></Properties>
+            </InboundAuthenticationRequestConfig>
+        </InboundAuthenticationRequestConfigs>
+    </InboundAuthenticationConfig>
+    <LocalAndOutBoundAuthenticationConfig>
+        <AuthenticationSteps>
+            <AuthenticationStep>
+                <StepOrder>1</StepOrder>
+                <LocalAuthenticatorConfigs>
+                    <LocalAuthenticatorConfig>
+                        <Name>BasicAuthenticator</Name>
+                        <DisplayName>basicauth</DisplayName>
+                        <IsEnabled>true</IsEnabled>
+                    </LocalAuthenticatorConfig>
+                </LocalAuthenticatorConfigs>
+                <!-- FederatedIdentityProviders>
+                 <IdentityProvider>
+                       <IdentityProviderName>facebook</IdentityProviderName>
+                       <IsEnabled>true</IsEnabled>
+                                     <DefaultAuthenticatorConfig>
+                                             <FederatedAuthenticatorConfig>
+                                                     <Name>FacebookAuthenticator</Name>
+                                                     <IsEnabled>true</IsEnabled>
+                                             </FederatedAuthenticatorConfig>
+                                     </DefaultAuthenticatorConfig>
+                 </IdentityProvider>
+                </FederatedIdentityProviders -->
+                <SubjectStep>true</SubjectStep>
+                <AttributeStep>true</AttributeStep>
+            </AuthenticationStep>
+        </AuthenticationSteps>
+    </LocalAndOutBoundAuthenticationConfig>
+    <RequestPathAuthenticatorConfigs></RequestPathAuthenticatorConfigs>
+    <InboundProvisioningConfig></InboundProvisioningConfig>
+    <OutboundProvisioningConfig></OutboundProvisioningConfig>
+    <ClaimConfig>
+        <AlwaysSendMappedLocalSubjectId>true</AlwaysSendMappedLocalSubjectId>
+    </ClaimConfig>
+    <PermissionAndRoleConfig></PermissionAndRoleConfig>
+</ServiceProvider>
--- a/modules/distribution/src/core/conf/identity/service-providers/store.xml
+++ b/modules/distribution/src/core/conf/identity/service-providers/store.xml
@ -0,0 +1,60 @@
+<!--
+~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~
+~ Licensed 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.
+ -->
+
+<ServiceProvider>
+  <ApplicationID>3</ApplicationID>
+  <ApplicationName>store</ApplicationName>
+  <Description>App Manager - Store</Description>
+  <InboundAuthenticationConfig>
+    <InboundAuthenticationRequestConfigs>
+      <InboundAuthenticationRequestConfig>
+        <InboundAuthKey>store</InboundAuthKey>
+        <InboundAuthType>samlsso</InboundAuthType>
+        <Properties>
+        </Properties>
+      </InboundAuthenticationRequestConfig>
+    </InboundAuthenticationRequestConfigs>
+  </InboundAuthenticationConfig>
+  <LocalAndOutBoundAuthenticationConfig>
+    <AuthenticationSteps>
+      <AuthenticationStep>
+        <StepOrder>1</StepOrder>
+        <LocalAuthenticatorConfigs>
+          <LocalAuthenticatorConfig>
+            <Name>BasicAuthenticator</Name>
+            <DisplayName>basicauth</DisplayName>
+            <IsEnabled>true</IsEnabled>
+          </LocalAuthenticatorConfig>
+        </LocalAuthenticatorConfigs>
+        <SubjectStep>true</SubjectStep>
+        <AttributeStep>true</AttributeStep>
+      </AuthenticationStep>
+    </AuthenticationSteps>
+    <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
+    <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
+  </LocalAndOutBoundAuthenticationConfig>
+  <RequestPathAuthenticatorConfigs>
+  </RequestPathAuthenticatorConfigs>
+  <InboundProvisioningConfig>
+  </InboundProvisioningConfig>
+  <OutboundProvisioningConfig>
+  </OutboundProvisioningConfig>
+  <ClaimConfig>
+    <AlwaysSendMappedLocalSubjectId>true</AlwaysSendMappedLocalSubjectId>
+  </ClaimConfig>
+  <PermissionAndRoleConfig>
+  </PermissionAndRoleConfig>
+</ServiceProvider>
--- a/modules/distribution/src/core/conf/identity/sso-idp-config.xml
+++ b/modules/distribution/src/core/conf/identity/sso-idp-config.xml
@ -0,0 +1,120 @@
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http:www.wso2.org) 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
+  ~
+  ~ 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.
+  -->
+<SSOIdentityProviderConfig>
+    <TenantRegistrationPage>https://stratos-local.wso2.com/carbon/tenant-register/select_domain.jsp</TenantRegistrationPage>
+    <ServiceProviders>
+        <ServiceProvider>
+            <Issuer>devicemgt</Issuer>
+            <AssertionConsumerServiceURLs>
+                <AssertionConsumerServiceURL>https://localhost:9443/devicemgt/uuf/sso/acs</AssertionConsumerServiceURL>
+            </AssertionConsumerServiceURLs>
+            <DefaultAssertionConsumerServiceURL>https://localhost:9443/devicemgt/uuf/sso/acs</DefaultAssertionConsumerServiceURL>
+            <SignAssertion>true</SignAssertion>
+            <SignResponse>true</SignResponse>
+            <EnableAttributeProfile>false</EnableAttributeProfile>
+            <IncludeAttributeByDefault>false</IncludeAttributeByDefault>
+            <Claims>
+                <Claim>http://wso2.org/claims/role</Claim>
+                <Claim>http://wso2.org/claims/emailaddress</Claim>
+            </Claims>
+            <EnableAudienceRestriction>true</EnableAudienceRestriction>
+            <EnableRecipients>true</EnableRecipients>
+            <AudiencesList>
+                <Audience>https://localhost:9443/oauth2/token</Audience>
+            </AudiencesList>
+            <RecipientList>
+                <Recipient>https://localhost:9443/oauth2/token</Recipient>
+            </RecipientList>
+        </ServiceProvider>
+        <ServiceProvider>
+            <Issuer>store</Issuer>
+            <AssertionConsumerServiceURLs>
+                <AssertionConsumerServiceURL>https://localhost:9443/store/acs</AssertionConsumerServiceURL>
+            </AssertionConsumerServiceURLs>
+            <DefaultAssertionConsumerServiceURL>https://localhost:9443/store/acs</DefaultAssertionConsumerServiceURL>
+            <SignResponse>true</SignResponse>
+            <CustomLoginPage>/store/login.jag</CustomLoginPage>
+        </ServiceProvider>
+        <ServiceProvider>
+            <Issuer>social</Issuer>
+            <AssertionConsumerServiceURLs>
+                <AssertionConsumerServiceURL>https://localhost:9443/social/acs</AssertionConsumerServiceURL>
+            </AssertionConsumerServiceURLs>
+            <DefaultAssertionConsumerServiceURL>https://localhost:9443/social/acs</DefaultAssertionConsumerServiceURL>
+            <SignResponse>true</SignResponse>
+            <CustomLoginPage>/social/login</CustomLoginPage>
+        </ServiceProvider>
+        <ServiceProvider>
+            <Issuer>publisher</Issuer>
+            <AssertionConsumerServiceURLs>
+                <AssertionConsumerServiceURL>https://localhost:9443/publisher/acs</AssertionConsumerServiceURL>
+            </AssertionConsumerServiceURLs>
+            <DefaultAssertionConsumerServiceURL>https://localhost:9443/publisher/acs</DefaultAssertionConsumerServiceURL>
+            <SignResponse>true</SignResponse>
+            <CustomLoginPage>/publisher/controllers/login.jag</CustomLoginPage>
+            <EnableAudienceRestriction>true</EnableAudienceRestriction>
+            <AudiencesList>
+                <Audience>carbonServer</Audience>
+            </AudiencesList>
+        </ServiceProvider>
+        <ServiceProvider>
+            <Issuer>API_STORE</Issuer>
+            <AssertionConsumerServiceURLs>
+                <AssertionConsumerServiceURL>https://localhost:9443/api-store/jagg/jaggery_acs.jag</AssertionConsumerServiceURL>
+            </AssertionConsumerServiceURLs>
+            <DefaultAssertionConsumerServiceURL>https://localhost:9443/api-store/jagg/jaggery_acs.jag</DefaultAssertionConsumerServiceURL>
+            <SignResponse>true</SignResponse>
+            <EnableAudienceRestriction>true</EnableAudienceRestriction>
+            <AudiencesList>
+                <Audience>carbonServer</Audience>
+            </AudiencesList>
+        </ServiceProvider>
+        <ServiceProvider>
+            <Issuer>portal</Issuer>
+            <AssertionConsumerServiceURLs>
+                <AssertionConsumerServiceURL>https://localhost:9443/portal/acs</AssertionConsumerServiceURL>
+            </AssertionConsumerServiceURLs>
+            <DefaultAssertionConsumerServiceURL>https://localhost:9443/portal/acs</DefaultAssertionConsumerServiceURL>
+            <SignResponse>true</SignResponse>
+            <EnableAudienceRestriction>true</EnableAudienceRestriction>
+            <EnableRecipients>true</EnableRecipients>
+            <AudiencesList>
+                <Audience>https://localhost:9443/oauth2/token</Audience>
+            </AudiencesList>
+            <RecipientList>
+                <Recipient>https://localhost:9443/oauth2/token</Recipient>
+            </RecipientList>
+        </ServiceProvider>
+        <ServiceProvider>
+            <Issuer>analyticsportal</Issuer>
+            <AssertionConsumerServiceURLs>
+                <AssertionConsumerServiceURL>https://localhost:9445/portal/acs</AssertionConsumerServiceURL>
+            </AssertionConsumerServiceURLs>
+            <DefaultAssertionConsumerServiceURL>https://localhost:9445/portal/acs</DefaultAssertionConsumerServiceURL>
+            <SignResponse>true</SignResponse>
+            <EnableAudienceRestriction>true</EnableAudienceRestriction>
+            <EnableRecipients>true</EnableRecipients>
+            <AudiencesList>
+                <Audience>https://localhost:9443/oauth2/token</Audience>
+            </AudiencesList>
+            <RecipientList>
+                <Recipient>https://localhost:9443/oauth2/token</Recipient>
+            </RecipientList>
+        </ServiceProvider>
+    </ServiceProviders>
+</SSOIdentityProviderConfig>
--- a/modules/distribution/src/core/conf/identity_config_change.xml
+++ b/modules/distribution/src/core/conf/identity_config_change.xml
@ -0,0 +1,32 @@
+<processor>
+	<!-- Remove the scope validator from the identity.xml if it exists. Otherwise running the build several times
+	   causes several scope validator elements to be added-->
+	<remove>
+		<name>//s:Server/s:OAuth/s:OAuthScopeValidator</name>
+	</remove>
+	<!-- Add the scope validator config element -->
+	<add>
+		<after>//s:Server/s:OAuth/s:OAuthCallbackHandlers</after>
+		<value><![CDATA[<OAuthScopeValidator class="org.wso2.carbon.device.mgt.oauth.extensions.handlers.ScopeValidationHandler"/>]]></value>
+	</add>
+	<!-- Add the ntlm grant type validator config element -->
+	<add>
+		<after>//s:Server/s:OAuth/s:SupportedGrantTypes/s:SupportedGrantType[s:GrantTypeName='iwa:ntlm']/s:GrantTypeName</after>
+		<value>
+			<![CDATA[<GrantTypeValidatorImplClass>org.wso2.carbon.identity.oauth.common.NTLMAuthenticationValidator</GrantTypeValidatorImplClass>]]></value>
+	</add>
+	<add>
+		<after>//s:Server/s:OAuth/s:SupportedGrantTypes/s:SupportedGrantType[s:GrantTypeName='iwa:ntlm']/s:GrantTypeName</after>
+		<value>
+			<![CDATA[<GrantTypeValidatorImplClass>org.wso2.carbon.identity.oauth.common.NTLMAuthenticationValidator</GrantTypeValidatorImplClass>]]></value>
+	</add>
+	<add>
+		<after>//s:Server/s:OAuth/s:SupportedGrantTypes/s:SupportedGrantType[s:GrantTypeName='iwa:ntlm']</after>
+		<value>
+			<![CDATA[<SupportedGrantType>
+		<GrantTypeName>urn:ietf:params:oauth:grant-type:jwt-bearer</GrantTypeName>
+		<GrantTypeHandlerImplClass>org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.ExtendedJWTGrantHandler</GrantTypeHandlerImplClass>
+		<GrantTypeValidatorImplClass>org.wso2.carbon.identity.oauth2.grant.jwt.JWTGrantValidator</GrantTypeValidatorImplClass>
+	</SupportedGrantType>]]></value>
+	</add>
+</processor>
--- a/modules/distribution/src/core/conf/input-adapter-change.xml
+++ b/modules/distribution/src/core/conf/input-adapter-change.xml
@ -0,0 +1,33 @@
+<processor>
+	<!-- Add input event adapter config element -->
+	<add>
+		<after>inputEventAdaptersConfig/adapterConfig[@type="jms"]</after>
+		<value><![CDATA[<adapterConfig type="oauth-http">
+	<property key="minThread">8</property>
+	<property key="maxThread">100</property>
+	<property key="keepAliveTimeInMillis">20000</property>
+	<property key="jobQueueSize">10000</property>
+	<property key="maximumHttpConnectionPerHost">2</property>
+	<property key="maximumTotalHttpConnection">100</property>
+	<property key="tokenValidationUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</property>
+	<property key="username">admin</property>
+	<property key="password">admin</property>
+	<property key="tokenUrl">https://${iot.gateway.host}:${iot.gateway.https.port}/token</property>
+	<property key="deviceMgtServerUrl">https://${iot.gateway.host}:${iot.gateway.https.port}</property>
+	<property key="tokenRefreshTimeOffset">100</property>
+</adapterConfig>
+
+<adapterConfig type="oauth-mqtt">
+	<!-- Thread Pool Related Properties -->
+	<property key="minThread">8</property>
+	<property key="maxThread">100</property>
+	<property key="keepAliveTimeInMillis">20000</property>
+	<property key="jobQueueSize">10000</property>
+	<property key="connectionKeepAliveInterval">60</property>
+	<property key="dcrUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register</property>
+	<property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
+	<property key="username">admin</property>
+	<property key="password">admin</property>
+</adapterConfig>]]></value>
+	</add>
+</processor>
--- a/modules/distribution/src/core/conf/license-config.xml
+++ b/modules/distribution/src/core/conf/license-config.xml
@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~
+  ~   Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) 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
+  ~
+  ~   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.
+  ~
+  -->
+
+<LicenseConfig>
+    <Licenses>
+        <License>
+            <Provider>wso2</Provider>
+            <Name>android</Name>
+            <Version>1.0.0</Version>
+            <Language>en-us</Language>
+            <ValidFrom>01-01-2014</ValidFrom>
+            <ValidTo>31-12-2035</ValidTo>
+            <Text><![CDATA[Test License]]></Text>
+        </License>
+        <License>
+            <Provider>wso2</Provider>
+            <Name>ios</Name>
+            <Version>1.0.0</Version>
+            <Language>1.0.0</Language>
+            <ValidFrom>01-01-2014</ValidFrom>
+            <ValidTo>31-12-2035</ValidTo>
+            <Text><![CDATA[IOS License]]></Text>
+        </License>
+        <License>
+            <Provider>wso2</Provider>
+            <Name>windows</Name>
+            <Version>1.0.0</Version>
+            <Language>1.0.0</Language>
+            <ValidFrom>01-01-2014</ValidFrom>
+            <ValidTo>31-12-2035</ValidTo>
+            <Text><![CDATA[Windows License]]></Text>
+        </License>
+    </Licenses>
+</LicenseConfig>
--- a/modules/distribution/src/core/conf/log4j.properties
+++ b/modules/distribution/src/core/conf/log4j.properties
@ -0,0 +1,245 @@
+#
+#  Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
+#
+#  Licensed 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.
+#
+
+##
+# This is the log4j configuration file used by WSO2 ESB
+# =====================================================
+#
+# IMPORTANT : Please do not remove or change the names of any of the Appenders defined here.
+# The layout pattern & log file can be changed using the WSO2 ESB Management Console, and those
+# settings will override the settings in this file.
+##
+
+##
+# WSO2 ESB is now able to create per-service trace logs at runtime. Thus while a message
+# is being processed through a Proxy service or the Synapse service (i.e. message mediation through
+# the 'main' sequence), tracing may be turned 'on' at any Proxy, Sequence or Mediator level. This
+# trace state 'flows' with the message - i.e from a trace enabled sequence to another sequence etc.
+# and applies to all mediators within a trace enabled sequence etc. unless another sequence or
+# mediator does not override and specify a different trace setting.
+##
+
+# the root category is ERROR (applies for all 3rd party JARs etc) and will be logged to the
+# LOG_APPENDER and the CONSOLE_APPENDER
+
+log4j.rootLogger=ERROR, CARBON_CONSOLE, CARBON_LOGFILE, CARBON_MEMORY, CARBON_SYS_LOG, ERROR_LOGFILE
+log4j.logger.AUDIT_LOG=INFO, AUDIT_LOGFILE
+
+log4j.category.org.apache.synapse=WARN
+log4j.category.org.apache.synapse.transport=WARN
+log4j.category.org.apache.axis2=WARN
+log4j.category.org.apache.axis2.transport=WARN
+log4j.logger.com.atomikos=INFO,ATOMIKOS
+log4j.logger.org.quartz=WARN
+log4j.logger.org.wso2=INFO
+log4j.logger.org.wso2.carbon=INFO
+#log4j.category.org.apache.synapse.transport.nhttp.util=DEBUG
+#log4j.category.org.apache.http.impl.nio.reactor=DEBUG
+#log4j.logger.org.wso2.carbon.utils.deployment.ComponentBuilder=DEBUG
+#log4j.logger.org.wso2.carbon.utils.deployment.OSGiBundleDeployer=DEBUG
+log4j.logger.org.apache.catalina=WARN
+log4j.logger.org.apache.coyote=WARN
+log4j.logger.org.apache.axis2.enterprise=FATAL
+log4j.logger.de.hunsicker.jalopy.io=FATAL
+
+# uncomment the following logs to see HTTP headers and messages
+#log4j.logger.org.apache.synapse.transport.http.headers=DEBUG
+#log4j.logger.org.apache.synapse.transport.http.wire=DEBUG
+
+#only WARN allowed for access loggers in http transport by default
+log4j.logger.org.apache.synapse.transport.http.access=WARN
+
+# uncomment the flowing entries to see HTTP headers and messages of Callout mediator/MessageProcessor
+#log4j.logger.httpclient.wire.header=DEBUG
+#log4j.logger.httpclient.wire.content=DEBUG
+
+# qpid related logs for the message broker
+log4j.logger.qpid=WARN
+log4j.logger.org.apache.qpid=WARN
+log4j.logger.org.apache.qpid.server.Main=INFO
+log4j.logger.qpid.message=WARN
+log4j.logger.qpid.message.broker.listening=INFO
+
+#spark log components
+log4j.logger.org.apache.spark=WARN
+log4j.logger.org.spark-project=WARN
+log4j.logger.akka=WARN
+log4j.logger.org.apache.spark.util.ClosureCleaner=ERROR
+
+# The console appender is used to display general information at console
+log4j.appender.CARBON_CONSOLE=org.wso2.carbon.utils.logging.appenders.CarbonConsoleAppender
+log4j.appender.CARBON_CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CARBON_CONSOLE.layout.ConversionPattern=[%d{ISO8601}] [${logger.server.name}] %5p - %c{1} %m%n
+
+# LOGEVENT is set to be a LogEventAppender using a PatternLayout to send logs to LOGEVENT
+log4j.appender.LOGEVENT=org.wso2.carbon.logging.service.appender.LogEventAppender
+log4j.appender.LOGEVENT.url=tcp://localhost:7611
+log4j.appender.LOGEVENT.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout
+log4j.appender.LOGEVENT.columnList=%T,%S,%A,%d,%c,%p,%m,%I,%Stacktrace
+log4j.appender.LOGEVENT.userName=admin
+log4j.appender.LOGEVENT.password=admin
+log4j.appender.LOGEVENT.processingLimit=1000
+log4j.appender.LOGEVENT.maxTolerableConsecutiveFailure=20
+
+# Configure the service logger at INFO level. Writes only run-time/mediation-time audit messages
+log4j.category.SERVICE_LOGGER=INFO, SERVICE_APPENDER
+log4j.additivity.SERVICE_LOGGER=false
+log4j.appender.SERVICE_APPENDER=org.apache.log4j.RollingFileAppender
+log4j.appender.SERVICE_APPENDER.File=${carbon.home}/repository/logs/${instance.log}/wso2-esb-service${instance.log}.log
+log4j.appender.SERVICE_APPENDER.MaxFileSize=1000KB
+log4j.appender.SERVICE_APPENDER.MaxBackupIndex=10
+log4j.appender.SERVICE_APPENDER.layout=org.apache.log4j.PatternLayout
+log4j.appender.SERVICE_APPENDER.layout.ConversionPattern=%d{ISO8601} [%X{ip}-%X{host}] [%t] %5p %c{1} %m%n
+
+# The trace logger dumps enough information @INFO level, but maybe pushed upto TRACE.
+# Writes only run-time/mediation time tracing/debug messages for messages passing through trace
+# enabled sequences, mediators and services. Enabling tracing on these has a performance impact
+log4j.category.TRACE_LOGGER=INFO, TRACE_APPENDER, TRACE_MEMORYAPPENDER
+log4j.additivity.TRACE_LOGGER=false
+log4j.appender.TRACE_APPENDER=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.TRACE_APPENDER.File=${carbon.home}/repository/logs/${instance.log}/wso2-esb-trace${instance.log}.log
+log4j.appender.TRACE_APPENDER.Append=true
+log4j.appender.TRACE_APPENDER.layout=org.apache.log4j.PatternLayout
+log4j.appender.TRACE_APPENDER.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%X{ip}-%X{host}] [%t] %5p %c{1} %m%n
+
+# The memory appender for trace logger
+log4j.appender.TRACE_MEMORYAPPENDER=org.wso2.carbon.utils.logging.appenders.MemoryAppender
+log4j.appender.TRACE_MEMORYAPPENDER.bufferSize=2000
+log4j.appender.TRACE_MEMORYAPPENDER.layout=org.apache.log4j.PatternLayout
+log4j.appender.TRACE_MEMORYAPPENDER.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%X{ip}-%X{host}] [%t] %5p %m%n
+
+# CARBON_LOGFILE is set to be a DailyRollingFileAppender using a PatternLayout.
+log4j.appender.CARBON_LOGFILE=org.wso2.carbon.utils.logging.appenders.CarbonDailyRollingFileAppender
+# Log file will be overridden by the configuration setting in the DB
+# This path should be relative to WSO2 Carbon Home
+log4j.appender.CARBON_LOGFILE.File=${carbon.home}/repository/logs/${instance.log}/wso2carbon${instance.log}.log
+log4j.appender.CARBON_LOGFILE.Append=true
+log4j.appender.CARBON_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout
+# ConversionPattern will be overridden by the configuration setting in the DB
+log4j.appender.CARBON_LOGFILE.layout.ConversionPattern=TID: [%T] [%S] [%d] %P%5p {%c} - %x %m {%c}%n
+log4j.appender.CARBON_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S]
+log4j.appender.CARBON_LOGFILE.threshold=DEBUG
+
+# The standard error log where all the warnings, errors and fatal errors will be logged
+log4j.appender.ERROR_LOGFILE=org.apache.log4j.FileAppender
+log4j.appender.ERROR_LOGFILE.File=${carbon.home}/repository/logs/${instance.log}/wso2-esb-errors.log
+log4j.appender.ERROR_LOGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.ERROR_LOGFILE.layout.ConversionPattern=%d{ISO8601} [%X{ip}-%X{host}] [%t] %5p %c{1} %m%n
+log4j.appender.ERROR_LOGFILE.threshold=WARN
+
+# The memory appender for logging
+log4j.appender.CARBON_MEMORY=org.wso2.carbon.logging.service.appender.CarbonMemoryAppender
+log4j.appender.CARBON_MEMORY.bufferSize=2000
+log4j.appender.CARBON_MEMORY.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout
+# ConversionPattern will be overridden by the configuration setting in the DB
+log4j.appender.CARBON_MEMORY.layout.ConversionPattern=TID: [%T] [%S] [%d] %P%5p {%c} - %x %m {%c}%n
+log4j.appender.CARBON_MEMORY.layout.TenantPattern=%U%@%D [%T] [%S]
+log4j.appender.CARBON_MEMORY.columnList=%T,%S,%A,%d,%c,%p,%m,%H,%I,%Stacktrace
+log4j.appender.CARBON_MEMORY.threshold=DEBUG
+
+log4j.appender.CARBON_SYS_LOG = org.apache.log4j.net.SyslogAppender
+log4j.appender.CARBON_SYS_LOG.layout=org.apache.log4j.PatternLayout
+log4j.appender.CARBON_SYS_LOG.layout.ConversionPattern=[%d] %5p - %x %m {%c}%n
+log4j.appender.CARBON_SYS_LOG.SyslogHost=localhost
+log4j.appender.CARBON_SYS_LOG.Facility=USER
+log4j.appender.CARBON_SYS_LOG.threshold=DEBUG
+
+log4j.logger.org.apache.directory.shared.ldap=WARN, CARBON_CONSOLE
+log4j.logger.org.apache.directory.server.ldap.handlers=WARN, CARBON_CONSOLE
+log4j.logger.org.apache.directory.shared.ldap.entry.DefaultServerAttribute=FATAL, CARBON_CONSOLE
+log4j.logger.org.apache.directory.shared.ldap.ldif.LdifReader=ERROR, CARBON_CONSOLE
+log4j.logger.org.apache.directory.server.ldap.LdapProtocolHandler=ERROR, CARBON_CONSOLE
+
+## Trace Logger configuration which will append to a XMPP chatroom or JID ##
+#log4j.appender.XMPP_APPENDER=org.wso2.carbon.utils.logging.IMAppender
+#log4j.appender.XMPP_APPENDER.host=jabber.org
+#log4j.appender.XMPP_APPENDER.username=wso2esb
+#log4j.appender.XMPP_APPENDER.password=wso2esb
+#log4j.appender.XMPP_APPENDER.recipient=ruwan@jabber.org
+#log4j.appender.XMPP_APPENDER.layout=org.apache.log4j.PatternLayout
+#log4j.appender.XMPP_APPENDER.layout.ConversionPattern=[%X{host}] [%t] %-5p [%d{HH:mm:ss,SSS}] %C{1} - %m%n
+
+
+# Appender config to AUDIT_LOGFILE
+log4j.appender.AUDIT_LOGFILE=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.AUDIT_LOGFILE.File=${carbon.home}/repository/logs/audit.log
+log4j.appender.AUDIT_LOGFILE.Append=true
+log4j.appender.AUDIT_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout
+log4j.appender.AUDIT_LOGFILE.layout.ConversionPattern=[%d] %P%5p - %x %m %n
+log4j.appender.AUDIT_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S]
+log4j.appender.AUDIT_LOGFILE.threshold=INFO
+log4j.additivity.AUDIT_LOG=false
+
+
+# Appender config to send Atomikos transaction logs to new log file tm.out.
+log4j.appender.ATOMIKOS = org.apache.log4j.RollingFileAppender
+log4j.appender.ATOMIKOS.File = repository/logs/tm.out
+log4j.appender.ATOMIKOS.Append = true
+log4j.appender.ATOMIKOS.layout = org.apache.log4j.PatternLayout
+log4j.appender.ATOMIKOS.layout.ConversionPattern=%p %t %c - %m%n
+log4j.additivity.com.atomikos=false
+
+
+#andes specific
+log4j.logger.org.wso2.andes.server.handler.ConnectionStartOkMethodHandler=WARN
+log4j.logger.org.wso2.andes.server.handler.ChannelOpenHandler=WARN
+log4j.logger.org.wso2.andes.server.handler.ChannelCloseHandler=WARN
+log4j.logger.org.wso2.andes.server.AMQChannel=WARN
+log4j.logger.org.wso2.andes.server.handler.ConnectionCloseMethodHandler=WARN
+log4j.logger.org.wso2.andes.server.handler.QueueDeclareHandler=WARN
+log4j.logger.org.wso2.andes.server.handler.QueueBindHandler=WARN
+log4j.logger.org.wso2.andes.server.virtualhost.VirtualHostConfigRecoveryHandler=WARN
+log4j.logger.org.wso2.andes.amqp.QpidAndesBridge=WARN
+
+# moquette-log properties
+log4j.logger.org.dna.mqtt=INFO
+log4j.logger.org.dna.mqtt.moquette.messaging.spi.impl.ProtocolProcessor=INFO
+log4j.logger.org.dna.mqtt.moquette.messaging.spi.impl.SimpleMessaging=WARN
+
+#Protocol parsing
+log4j.logger.org.dna.mqtt.moquette.server.netty.NettyMQTTHandler=WARN
+#log4j.logger.org.dna.mqtt.moquette.server.netty.NettyMQTTHandler=DEBUG
+log4j.logger.org.dna.mqtt.moquette.parser.netty=WARN
+
+# The event trace logger dumps enough information @INFO level, but maybe pushed upto TRACE.
+# Writes only run-time/event processing time tracing/debug messages for event passing through trace
+# enabled transport adapters event formatters, builders and processors. Enabling event tracing on these has a performance impact
+log4j.category.EVENT_TRACE_LOGGER=INFO, EVENT_TRACE_APPENDER, EVENT_TRACE_MEMORYAPPENDER
+log4j.additivity.EVENT_TRACE_LOGGER=false
+log4j.appender.EVENT_TRACE_APPENDER=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.EVENT_TRACE_APPENDER.File=${carbon.home}/repository/logs/${instance.log}/wso2-das-trace${instance.log}.log
+log4j.appender.EVENT_TRACE_APPENDER.Append=true
+log4j.appender.EVENT_TRACE_APPENDER.layout=org.apache.log4j.PatternLayout
+log4j.appender.EVENT_TRACE_APPENDER.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%X{ip}-%X{host}] [%t] %5p %c{1} %m%n
+
+# The memory appender for trace logger
+log4j.appender.EVENT_TRACE_MEMORYAPPENDER=org.wso2.carbon.utils.logging.appenders.MemoryAppender
+log4j.appender.EVENT_TRACE_MEMORYAPPENDER.bufferSize=2000
+log4j.appender.EVENT_TRACE_MEMORYAPPENDER.layout=org.apache.log4j.PatternLayout
+log4j.appender.EVENT_TRACE_MEMORYAPPENDER.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%X{ip}-%X{host}] [%t] %5p %m%n
+
+# Changing events specific info logs to warn
+log4j.logger.org.wso2.carbon.application.deployer.internal.ApplicationManager=WARN
+log4j.logger.org.wso2.carbon.event.stream.core.EventStreamDeployer=WARN
+log4j.logger.org.wso2.carbon.event.input.adapter.core.internal.InputAdapterRuntime=WARN
+log4j.logger.org.wso2.carbon.event.stream.core.internal.EventJunction=WARN
+log4j.logger.org.wso2.carbon.event.receiver.core.EventReceiverDeployer=WARN
+log4j.logger.org.wso2.carbon.analytics.spark.core.SparkScriptCAppDeployer=WARN
+log4j.logger.org.wso2.carbon.analytics.eventsink.AnalyticsEventStoreDeployer=WARN
+log4j.logger.org.wso2.carbon.event.processor.core.EventProcessorDeployer=WARN
+log4j.logger.org.wso2.carbon.core.services.util.CarbonAuthenticationUtil=WARN
+log4j.logger.net.sf.ehcache=ERROR
+log4j.logger.org.wso2.carbon.apimgt.gateway.handlers.throttling=ERROR
--- a/modules/distribution/src/core/conf/nhttp.properties
+++ b/modules/distribution/src/core/conf/nhttp.properties
@ -0,0 +1,46 @@
+#
+#  Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
+#
+#  Licensed 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.
+#
+
+# This file contains the configuration parameters used by the Non-blocking HTTP transport
+
+#http.socket.timeout=60000
+#http.socket.buffer-size=8192
+#http.tcp.nodelay=1
+#http.connection.stalecheck=0
+
+# Uncomment the following property for an AIX based deployment
+#http.nio.interest-ops-queueing=true
+
+# HTTP Sender thread pool parameters
+#snd_t_core=20
+#snd_t_max=100
+#snd_alive_sec=5
+#snd_qlen=-1
+#snd_io_threads=2
+
+# HTTP Listener thread pool parameters
+#lst_t_core=20
+#lst_t_max=100
+#lst_alive_sec=5
+#lst_qlen=-1
+#lst_io_threads=2
+nhttp.rest.dispatcher.service=__MultitenantDispatcherService
+
+rest_uri_api_regex=\\w+://.+:\\d+/t/.*|\\w+://.+\\w+/t/.*|^(/t/).*
+rest_uri_proxy_regex=\\w+://.+:\\d+/services/t/.*|\\w+://.+\\w+/services/t/.*|^(/services/t/)
+
+# This property is crucial for automated tests
+http.socket.reuseaddr=true
--- a/Show More
+++ b/Show More