From d9701885b9a69760021a0092f4cabe76cf6dcfb3 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Sun, 13 Sep 2015 19:30:52 +0530
Subject: [PATCH 1/4] added das features

---
 modules/distribution/src/assembly/bin.xml     | 129 +++++--
 .../data-bridge/cassandra-datasink-config.xml |  24 --
 .../conf/data-bridge/data-bridge-config.xml   |  72 ----
 .../conf/data-bridge/stream-definitions.xml   |  23 ++
 .../src/repository/conf/identity.xml          | 318 +++++++++-------
 .../src/repository/conf/tomcat/context.xml    |  43 ++-
 .../pom.xml                                   | 144 ++++++++
 modules/p2-profile-gen/pom.xml                | 339 +++++++++++++++---
 .../impl/ArduinoControllerService.java        |  19 +
 pom.xml                                       |   6 +-
 10 files changed, 793 insertions(+), 324 deletions(-)
 delete mode 100755 modules/distribution/src/repository/conf/data-bridge/cassandra-datasink-config.xml
 delete mode 100755 modules/distribution/src/repository/conf/data-bridge/data-bridge-config.xml
 create mode 100644 modules/distribution/src/repository/conf/data-bridge/stream-definitions.xml
 create mode 100644 modules/feature/org.wso2.carbon.device.mgt.iot.util.feature/pom.xml

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 0f0e732f..15ff35fa 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -197,12 +197,12 @@
             </includes>
         </fileSet>
         <!--data-bridge configuration-->
-        <fileSet>
-            <directory>src/repository/conf/data-bridge</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge
-            </outputDirectory>
-            <fileMode>755</fileMode>
-        </fileSet>
+        <!--<fileSet>-->
+            <!--<directory>src/repository/conf/data-bridge</directory>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge-->
+            <!--</outputDirectory>-->
+            <!--<fileMode>755</fileMode>-->
+        <!--</fileSet>-->
         <fileSet>
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider
@@ -718,9 +718,9 @@
         <!-- Copying application-authentication.xml -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/application-authentication.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/application-authentication.xml
             </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
@@ -729,9 +729,9 @@
         <!-- Copying thrift-authentication.xml -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/thrift-authentication.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/thrift-authentication.xml
             </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
@@ -749,7 +749,7 @@
         </file>
         <file>
             <source>src/repository/conf/identity.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
             <fileMode>644</fileMode>
         </file>
         <file>
@@ -792,16 +792,16 @@
             <fileMode>644</fileMode>
         </file>
 
-        <!-- TODO: Verify this feature is needed -->
+
         <!--Webapp Authenticator Config file-->
-        <!--<file>-->
-            <!--<source>-->
-                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/webapp-authenticator-config.xml-->
-            <!--</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>-->
-            <!--<filtered>true</filtered>-->
-            <!--<fileMode>644</fileMode>-->
-        <!--</file>-->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/webapp-authenticator-config.xml
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
 
         <!--notifications config file-->
         <file>
@@ -1020,14 +1020,14 @@
         <!-- End of Enterprise Store Features -->
 
         <!-- Copying apim feature - bam.xml -->
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/bam.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
+        <!--<file>-->
+            <!--<source>-->
+                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/bam.xml-->
+            <!--</source>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>-->
+            <!--<filtered>true</filtered>-->
+            <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
 
         <!-- Analytics datasources -->
         <file>
@@ -1040,6 +1040,79 @@
         </file>
 
 
+        <!--DAS Files-->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-processor.xml
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/
+            </outputDirectory>
+            <filtered>true</filtered>
+        </file>
+
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/output-event-adapters.xml
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf
+            </outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
+
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/input-event-adapters.xml
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf
+            </outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
+
+        <!-- ************* Data bridge related files ********** -->
+        <file>
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge/data-bridge-config.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
+        <file>
+            <source>src/repository/conf/data-bridge/stream-definitions.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge</outputDirectory>
+        </file>
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge/data-agent-config.xml
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge
+            </outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
+        <!-- ************* Data bridge related files end ********** -->
+        <!--spark udf conf file-->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/spark/spark-udf-config.xml
+            </source>
+
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/spark/
+            </outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
+        <!--spark defaults file-->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/spark/spark-defaults.conf
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/spark/
+            </outputDirectory>
+            <fileMode>755</fileMode>
+        </file>
+
+
+
 
     </files>
 </assembly>
diff --git a/modules/distribution/src/repository/conf/data-bridge/cassandra-datasink-config.xml b/modules/distribution/src/repository/conf/data-bridge/cassandra-datasink-config.xml
deleted file mode 100755
index 4c0845dd..00000000
--- a/modules/distribution/src/repository/conf/data-bridge/cassandra-datasink-config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-  ~ 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.
-  -->
-
-<CassandraDataSinkConfiguration xmlns="http://wso2.org/carbon/cassandraDataSink">
-    <PersistedStreams>
-        <Include>*</Include>
-        <Exclude>rt_*</Exclude>
-    </PersistedStreams>
-</CassandraDataSinkConfiguration>
diff --git a/modules/distribution/src/repository/conf/data-bridge/data-bridge-config.xml b/modules/distribution/src/repository/conf/data-bridge/data-bridge-config.xml
deleted file mode 100755
index d4b81aad..00000000
--- a/modules/distribution/src/repository/conf/data-bridge/data-bridge-config.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
-  ~ 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.
-  -->
-
-<dataBridgeConfiguration xmlns="http://wso2.org/carbon/databridge">
-
-    <StreamDefinitionStore>org.wso2.carbon.databridge.streamdefn.cassandra.datastore.CassandraStreamDefinitionStore</StreamDefinitionStore>
-
-    <workerThreads>10</workerThreads>
-    <eventBufferCapacity>10000</eventBufferCapacity>
-    <clientTimeoutMS>30000</clientTimeoutMS>
-    <keySpaceName>EVENT_KS</keySpaceName>
-
-<!-- Default configuration for thriftDataReceiver -->
-    <thriftDataReceiver>
-    <!--<hostName>localhost</hostName>-->
-        <port>7611</port>
-        <securePort>7711</securePort>
-    </thriftDataReceiver>
-
-    <!--<streamDefinitions>
-        <streamDefinition>
-            {
-             'name':'org.wso2.esb.MediatorStatistics',
-             'version':'1.3.0',
-             'nickName': 'Stock Quote Information',
-             'description': 'Some Desc',
-             'metaData':[
-             {'name':'ipAdd','type':'STRING'}
-             ],
-             'payloadData':[
-             {'name':'symbol','type':'STRING'},
-             {'name':'price','type':'DOUBLE'},
-             {'name':'volume','type':'INT'},
-             {'name':'max','type':'DOUBLE'},
-             {'name':'min','type':'Double'}
-             ]
-            }
-        </streamDefinition>
-        <streamDefinition domainName="wso2">
-            {
-             'name':'org.wso2.esb.MediatorStatistics',
-             'version':'1.3.4',
-             'nickName': 'Stock Quote Information',
-             'description': 'Some Other Desc',
-             'metaData':[
-             {'name':'ipAdd','type':'STRING'}
-             ],
-             'payloadData':[
-             {'name':'symbol','type':'STRING'},
-             {'name':'price','type':'DOUBLE'},
-             {'name':'volume','type':'INT'}
-             ]
-            }
-        </streamDefinition>
-    </streamDefinitions>-->
-
-</dataBridgeConfiguration>
diff --git a/modules/distribution/src/repository/conf/data-bridge/stream-definitions.xml b/modules/distribution/src/repository/conf/data-bridge/stream-definitions.xml
new file mode 100644
index 00000000..5be0fb28
--- /dev/null
+++ b/modules/distribution/src/repository/conf/data-bridge/stream-definitions.xml
@@ -0,0 +1,23 @@
+<!--
+~ Copyright (c) 2005-2014, 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.
+-->
+
+
+<streamDefinitions xmlns="http://wso2.org/carbon/databridge">
+
+
+</streamDefinitions>
\ No newline at end of file
diff --git a/modules/distribution/src/repository/conf/identity.xml b/modules/distribution/src/repository/conf/identity.xml
index 929d6ea6..e9af104a 100755
--- a/modules/distribution/src/repository/conf/identity.xml
+++ b/modules/distribution/src/repository/conf/identity.xml
@@ -1,66 +1,44 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- ~ Copyright (c) 2005-2011, 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-2011, 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. -->
 
 <Server xmlns="http://wso2.org/projects/carbon/carbon.xml">
 
-    <OpenIDServerUrl>https://localhost:9443/openidserver</OpenIDServerUrl>
-
-    <OpenIDUserPattern>https://localhost:9443/openid/</OpenIDUserPattern>
-    <!-- If the users must be prompted for approval -->
-    <OpenIDSkipUserConsent>false</OpenIDSkipUserConsent>
-    <!-- Expiry time of the OpenID RememberMe token in minutes -->
-    <OpenIDRememberMeExpiry>7200</OpenIDRememberMeExpiry>
-
     <JDBCPersistenceManager>
         <DataSource>
-            <!-- Include a data source name (jndiConfigName) from the set of data sources defined in master-datasources.xml -->
+            <!-- Include a data source name (jndiConfigName) from the set of data
+                sources defined in master-datasources.xml -->
             <Name>jdbc/WSO2AM_DB</Name>
         </DataSource>
-        <!-- If the identity database is created from another place and if it is required to skip schema initialization during the server start up, set the following
-           property to "true". -->
-        <SkipDBSchemaCreation>true</SkipDBSchemaCreation>
+        <!-- If the identity database is created from another place and if it is
+            required to skip schema initialization during the server start up, set the
+            following property to "true". -->
+        <!-- <SkipDBSchemaCreation>false</SkipDBSchemaCreation> -->
+        <!--SessionDataPersist>
+            <Enable>true</Enable>
+            <EnableCleanUp>true</EnableCleanUp>
+            <Temporary>false</Temporary-->
+        <!--/SessionDataPersist-->
     </JDBCPersistenceManager>
 
+    <!-- Time configurations are in minutes -->
     <TimeConfig>
-        <SessionIdleTimeout>120</SessionIdleTimeout><!-- Minutes -->
-        <RememberMeTimeout>20160</RememberMeTimeout><!-- Minutes -->
-        <PersistanceCleanUpTimeout>20160</PersistanceCleanUpTimeout><!-- Minutes -->
-        <PersistanceCleanUpPeriod>1140</PersistanceCleanUpPeriod><!-- Minutes -->
+        <SessionIdleTimeout>120</SessionIdleTimeout>
+        <RememberMeTimeout>20160</RememberMeTimeout>
+        <PersistanceCleanUpTimeout>20160</PersistanceCleanUpTimeout>
+        <PersistanceCleanUpPeriod>1140</PersistanceCleanUpPeriod>
     </TimeConfig>
 
-    <!--
-      Security configurations
-    -->
+    <!-- Security configurations -->
     <Security>
-        <UserTrustedRPStore>
-            <Location>${carbon.home}/repository/resources/security/userRP.jks</Location>
-            <!-- Keystore type (JKS/PKCS12 etc.)-->
-            <Type>JKS</Type>
-            <!-- Keystore password-->
-            <Password>wso2carbon</Password>
-            <!-- Private Key password-->
-            <KeyPassword>wso2carbon</KeyPassword>
-        </UserTrustedRPStore>
-
-        <!--
-              The directory under which all other KeyStore files will be stored
-          -->
+        <!-- The directory under which all other KeyStore files will be stored -->
         <KeyStoresDir>${carbon.home}/conf/keystores</KeyStoresDir>
     </Security>
 
@@ -76,8 +54,14 @@
     </Identity>
 
     <OpenID>
-        <OpenIDServerUrl>https://localhost:9443/openidserver</OpenIDServerUrl>
-        <OpenIDUserPattern>https://localhost:9443/openid/</OpenIDUserPattern>
+        <!--
+            Default values for OpenIDServerUrl and OpenIDUSerPattern are built in following format
+            https://<HostName>:<MgtTrpProxyPort except 443>/<ProxyContextPath>/<context>
+            If above format doesn't satisfy uncomment the following configs and explicitly configure the values
+         -->
+        <!--OpenIDServerUrl>https://localhost:9443/openidserver</OpenIDServerUrl-->
+        <!--OpenIDUserPattern>https://localhost:9443/openid/</OpenIDUserPattern-->
+
         <!-- If the users must be prompted for approval -->
         <OpenIDSkipUserConsent>false</OpenIDSkipUserConsent>
         <!-- Expiry time of the OpenID RememberMe token in minutes -->
@@ -90,7 +74,42 @@
         <SessionTimeout>36000</SessionTimeout>
         <!-- skips authentication if valid SAML2 Web SSO browser session available -->
         <AcceptSAMLSSOLogin>false</AcceptSAMLSSOLogin>
-        <ClaimsRetrieverImplClass>org.wso2.carbon.identity.provider.openid.claims.DefaultClaimsRetriever</ClaimsRetrieverImplClass>
+        <ClaimsRetrieverImplClass>org.wso2.carbon.identity.provider.openid.claims.DefaultClaimsRetriever
+        </ClaimsRetrieverImplClass>
+
+        <!--
+               OpenID private association store is configurable from following configs.
+               It includes two new replication stores,
+                       i.   OpenIDServerAssociationStore (Default association store)
+                       ii.  PrivateAssociationCryptoStore
+                       iii. PrivateAssociationReplicationStore
+        -->
+
+        <!-- Specify full qualified class name of the class which going to use as private association store -->
+        <!-- 
+		<OpenIDPrivateAssociationStoreClass>org.wso2.carbon.identity.provider.openid.PrivateAssociationCryptoStore</OpenIDPrivateAssociationStoreClass>
+	-->
+
+        <!-- The exiration time (in minutes) for the OpenID association -->
+        <!--
+		<OpenIDAssociationExpiryTime>15</OpenIDAssociationExpiryTime>
+	-->
+
+        <!-- Configs specific to PrivateAssociationCryptoStore -->
+        <!-- Server secret. This value should be the same in all nodes in the cluster -->
+        <!--
+		<OpenIDPrivateAssociationServerKey>qewlj324lmasc</OpenIDPrivateAssociationServerKey>
+	-->
+
+        <!-- Configs specific to PrivateAssociationCryptoStore -->
+        <!-- This enable private association cleanup task which cleans expired private associations -->
+        <!--
+		<EnableOpenIDAssociationCleanupTask>true</EnableOpenIDAssociationCleanupTask>
+	-->
+        <!-- Time Period (in minutes) that cleanup task would run -->
+        <!--
+		<OpenIDAssociationCleanupPeriod>15</OpenIDAssociationCleanupPeriod>
+	-->
     </OpenID>
 
     <OAuth>
@@ -98,46 +117,42 @@
         <AuthorizationGrantCacheTimeout>-1</AuthorizationGrantCacheTimeout>
         <SessionDataCacheTimeout>-1</SessionDataCacheTimeout>
         <ClaimCacheTimeout>-1</ClaimCacheTimeout>
-        <RequestTokenUrl>https://localhost:9443/oauth/request-token</RequestTokenUrl>
-        <AccessTokenUrl>https://localhost:9443/oauth/access-token</AccessTokenUrl>
-        <AuthorizeUrl>https://localhost:9443/oauth/authorize-url</AuthorizeUrl>
-
-        <!--         Commented whilst adding ES Features -->
-        <!-- 
-<RequestTokenUrl>https://10.100.5.3:9443/oauth/request-token</RequestTokenUrl>
-        <AccessTokenUrl>https://10.100.5.3:9443/oauth/access-token</AccessTokenUrl>
-        <AuthorizeUrl>https://10.100.5.3:9443/oauth/authorize-url</AuthorizeUrl>
- -->
-
 
+        <!--
+            Default values for OAuth1RequestTokenUrl, OAuth1AccessTokenUrl, OAuth1AuthorizeUrl
+            OAuth2AuthzEPUrl, OAuth2TokenEPUrl and OAuth2UserInfoEPUrl are built in following format
+            https://<HostName>:<MgtTrpProxyPort except 443>/<ProxyContextPath>/<context>/<path>
+            If above format doesn't satisfy uncomment the following configs and explicitly configure the values
+         -->
+        <OAuth1RequestTokenUrl>https://localhost:9443/oauth/request-token</OAuth1RequestTokenUrl>
+        <OAuth1AuthorizeUrl>https://localhost:9443/oauth/authorize-url</OAuth1AuthorizeUrl>
+        <OAuth1AccessTokenUrl>https://localhost:9443/oauth/access-token</OAuth1AccessTokenUrl>
+        <!--OAuth2AuthzEPUrl>https://localhost:9443/oauth2/authorize</OAuth2AuthzEPUrl-->
+        <!--OAuth2TokenEPUrl>https://localhost:9443/oauth2/token</OAuth2TokenEPUrl-->
+        <!--OAuth2UserInfoEPUrl>https://localhost:9443/oauth2/userinfo</OAuth2UserInfoEPUrl-->
 
         <!-- Default validity period for Authorization Code in seconds -->
         <AuthorizationCodeDefaultValidityPeriod>300</AuthorizationCodeDefaultValidityPeriod>
-        <!-- Default validity period for Access Token in seconds -->
+        <!-- Default validity period for application access tokens in seconds -->
         <AccessTokenDefaultValidityPeriod>3600</AccessTokenDefaultValidityPeriod>
-        <!-- Default validity period for Application Access Token in seconds-If want to set this as never expired,set the value as <0   -->
-        <ApplicationAccessTokenDefaultValidityPeriod>3600</ApplicationAccessTokenDefaultValidityPeriod>
-        <!-- Default validity period for User Access Token in seconds-->
+        <!-- Default validity period for user access tokens in seconds -->
         <UserAccessTokenDefaultValidityPeriod>3600</UserAccessTokenDefaultValidityPeriod>
         <!-- Validity period for refresh token -->
         <RefreshTokenValidityPeriod>84600</RefreshTokenValidityPeriod>
         <!-- Timestamp skew in seconds -->
         <TimestampSkew>300</TimestampSkew>
-        <!-- Enable OAuth caching. This cache has the replication support. -->
+        <!-- Enable OAuth caching -->
         <EnableOAuthCache>true</EnableOAuthCache>
         <!-- Enable renewal of refresh token for refresh_token grant -->
         <RenewRefreshTokenForRefreshGrant>true</RenewRefreshTokenForRefreshGrant>
         <!-- Process the token before storing it in database, e.g. encrypting -->
         <TokenPersistenceProcessor>org.wso2.carbon.identity.oauth.tokenprocessor.PlainTextPersistenceProcessor</TokenPersistenceProcessor>
-        <!-- Supported Client Autnetication Methods -->
+        <!-- Supported Client Authentication Methods -->
         <ClientAuthHandlers>
             <ClientAuthHandler Class="org.wso2.carbon.identity.oauth2.token.handlers.clientauth.BasicAuthClientAuthHandler">
                 <Property Name="StrictClientCredentialValidation">false</Property>
             </ClientAuthHandler>
         </ClientAuthHandlers>
-	<!--TokenPersistenceProcessor>
-            org.wso2.carbon.identity.oauth.tokenprocessor.EncryptionDecryptionPersistenceProcessor
-        </TokenPersistenceProcessor-->
         <!-- Supported Response Types -->
         <SupportedResponseTypes>
             <SupportedResponseType>
@@ -157,8 +172,7 @@
             </SupportedGrantType>
             <SupportedGrantType>
                 <GrantTypeName>password</GrantTypeName>
-                <!-- Was found in file whilst adding ES Features -->
-                <!--                 <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.PasswordGrantHandler</GrantTypeHandlerImplClass> -->
+                <!-- <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.PasswordGrantHandler</GrantTypeHandlerImplClass> -->
                 <GrantTypeHandlerImplClass>org.wso2.carbon.apimgt.keymgt.handlers.ExtendedPasswordGrantHandler</GrantTypeHandlerImplClass>
             </SupportedGrantType>
             <SupportedGrantType>
@@ -184,48 +198,39 @@
         <!--TokenValidators>
             <TokenValidator type="bearer" class="org.wso2.carbon.identity.oauth2.validators.DefaultOAuth2TokenValidator"/>
         </TokenValidators-->
+        <!-- Assertions can be used to embedd parameters into access token. -->
+        <EnableAssertions>
+            <UserName>false</UserName>
+        </EnableAssertions>
 
-        <!-- Add custom user headers to the response-->
-        <!--<RequiredRespHeaderClaimUris>
-            <ClaimUri>http://wso2.org/claims/emailaddress</ClaimUri>
-            <ClaimUri>http://wso2.org/claims/gender</ClaimUri>
-        </RequiredRespHeaderClaimUris>-->
-
-        <!-- Enable/Disable OAuth Caching-->
-        <!--<EnableCache>true</EnableCache>-->
-
-	<!-- Assertions can be used to embedd parameters into access token.-->
-	<EnableAssertions>
-		<UserName>false</UserName>
-	</EnableAssertions>
-
-	<!-- This should be set to true when using multiple user stores and keys should saved
-			into different tables according to the user store. By default all the application keys are saved in to the same table.
-			UserName Assertion should be 'true' to use this.-->
-	<EnableAccessTokenPartitioning>false</EnableAccessTokenPartitioning>
-
-	<!-- user store domain names and mappings to new table names.
-				eg: if you provide 'A:foo.com', foo.com should be the user store domain name and 'A' represent the relavant mapping of
-				token storing table, i.e. tokens relevant to the users comming from foo.com user store will be added to a table called
-				IDN_OAUTH2_ACCESS_TOKEN_A. -->
-	<AccessTokenPartitioningDomains><!-- A:foo.com, B:bar.com --></AccessTokenPartitioningDomains>
-
-	<AuthorizationContextTokenGeneration>
-		<Enabled>false</Enabled>
-		<TokenGeneratorImplClass>org.wso2.carbon.identity.oauth2.authcontext.JWTTokenGenerator</TokenGeneratorImplClass>
-		<ClaimsRetrieverImplClass>org.wso2.carbon.identity.oauth2.authcontext.DefaultClaimsRetriever</ClaimsRetrieverImplClass>
-		<ConsumerDialectURI>http://wso2.org/claims</ConsumerDialectURI>
-		<SignatureAlgorithm>SHA256withRSA</SignatureAlgorithm>
-		<AuthorizationContextTTL>15</AuthorizationContextTTL>
-	</AuthorizationContextTokenGeneration>
-
+        <!-- This should be set to true when using multiple user stores and keys
+            should saved into different tables according to the user store. By default
+            all the application keys are saved in to the same table. UserName Assertion
+            should be 'true' to use this. -->
+        <EnableAccessTokenPartitioning>false</EnableAccessTokenPartitioning>
+        <!-- user store domain names and mapping to new table name. eg: if you
+            provide 'A:foo.com', foo.com should be the user store domain name and 'A'
+            represent the relavant mapping of token store table, i.e. tokens will be
+            added to a table called IDN_OAUTH2_ACCESS_TOKEN_A. -->
+        <AccessTokenPartitioningDomains><!-- A:foo.com, B:bar.com --></AccessTokenPartitioningDomains>
+        <AuthorizationContextTokenGeneration>
+            <Enabled>false</Enabled>
+            <TokenGeneratorImplClass>org.wso2.carbon.identity.oauth2.authcontext.JWTTokenGenerator</TokenGeneratorImplClass>
+            <ClaimsRetrieverImplClass>org.wso2.carbon.identity.oauth2.authcontext.DefaultClaimsRetriever</ClaimsRetrieverImplClass>
+            <ConsumerDialectURI>http://wso2.org/claims</ConsumerDialectURI>
+            <SignatureAlgorithm>SHA256withRSA</SignatureAlgorithm>
+            <AuthorizationContextTTL>15</AuthorizationContextTTL>
+        </AuthorizationContextTokenGeneration>
         <SAML2Grant>
-        <!--SAML2TokenHandler></SAML2TokenHandler-->
-    </SAML2Grant>
-
-       <OpenIDConnect>
+            <!--SAML2TokenHandler></SAML2TokenHandler-->
+        </SAML2Grant>
+        <OpenIDConnect>
             <IDTokenBuilder>org.wso2.carbon.identity.openidconnect.DefaultIDTokenBuilder</IDTokenBuilder>
-            <IDTokenIssuerID>https://localhost:9443/oauth2endpoints/token</IDTokenIssuerID>
+            <!--
+                Default value for IDTokenIssuerID, is OAuth2TokenEPUrl.
+                If that doesn't satisfy uncomment the following config and explicitly configure the value
+            -->
+            <!--IDTokenIssuerID>https://localhost:9443/oauth2/token</IDTokenIssuerID-->
             <IDTokenSubjectClaim>http://wso2.org/claims/givenname</IDTokenSubjectClaim>
             <IDTokenCustomClaimsCallBackHandler>org.wso2.carbon.identity.openidconnect.SAMLAssertionClaimsCallback</IDTokenCustomClaimsCallBackHandler>
             <IDTokenExpiration>3600</IDTokenExpiration>
@@ -239,6 +244,7 @@
     </OAuth>
 
     <MultifactorAuthentication>
+        <!--Enable>false</Enable-->
         <XMPPSettings>
             <XMPPConfig>
                 <XMPPProvider>gtalk</XMPPProvider>
@@ -255,11 +261,18 @@
         <PersistanceCacheTimeout>157680000</PersistanceCacheTimeout>
         <SessionIndexCacheTimeout>157680000</SessionIndexCacheTimeout>
         <EntityId>localhost</EntityId>
-        <IdentityProviderURL>https://localhost:9443/samlsso</IdentityProviderURL>
+        <!--
+            Default value for IdentityProviderURL is  built in following format
+            https://<HostName>:<MgtTrpProxyPort except 443>/<ProxyContextPath>/samlsso
+            If that doesn't satisfy uncomment the following config and explicitly configure the value
+        -->
+        <!--IdentityProviderURL>https://localhost:9443/samlsso</IdentityProviderURL-->
         <SingleLogoutRetryCount>5</SingleLogoutRetryCount>
-        <SingleLogoutRetryInterval>60000</SingleLogoutRetryInterval> <!-- in milli seconds -->
+        <SingleLogoutRetryInterval>60000</SingleLogoutRetryInterval>
+        <!-- in milli seconds -->
         <TenantPartitioningEnabled>false</TenantPartitioningEnabled>
-        <SessionTimeout>36000</SessionTimeout> <!-- remember me session timeout in seconds -->
+        <SessionTimeout>36000</SessionTimeout>
+        <!-- remember me session timeout in seconds -->
         <!-- skips authentication if valid SAML2 Web SSO browser session available -->
         <AttributeStatementBuilder>org.wso2.carbon.identity.sso.saml.attributes.UserAttributeStatementBuilder</AttributeStatementBuilder>
         <AttributesClaimDialect>http://wso2.org/claims</AttributesClaimDialect>
@@ -276,12 +289,28 @@
         <UseAuthenticatedUserDomainCrypto>false</UseAuthenticatedUserDomainCrypto>
     </SSOService>
 
+    <SecurityTokenService>
+        <!--
+            Default value for IdentityProviderURL is  built in following format
+            https://<HostName>:<MgtTrpProxyPort except 443>/<ProxyContextPath>/services/wso2carbon-sts
+            If that doesn't satisfy uncomment the following config and explicitly configure the value
+        -->
+        <!--IdentityProviderURL>https://localhost:9443/services/wso2carbon-sts</IdentityProviderURL-->
+    </SecurityTokenService>
+
+    <PassiveSTS>
+        <!--
+            Default value for IdentityProviderURL is  built in following format
+            https://<HostName>:<MgtTrpProxyPort except 443>/<ProxyContextPath>/passivests
+            If that doesn't satisfy uncomment the following config and explicitly configure the value
+        -->
+        <!--IdentityProviderURL>https://localhost:9443/passivests</IdentityProviderURL-->
+    </PassiveSTS>
+
     <EntitlementSettings>
         <!-- Uncomment this to enable on-demand policy loading -->
-        <!--OnDemandPolicyLoading>
-                <Enable>true</Enable>
-                <MaxInMemoryPolicies>100</MaxInMemoryPolicies>
-        </OnDemandPolicyLoading-->
+        <!--OnDemandPolicyLoading> <Enable>true</Enable> <MaxInMemoryPolicies>100</MaxInMemoryPolicies>
+            </OnDemandPolicyLoading -->
         <DecisionCaching>
             <Enable>true</Enable>
             <CachingInterval>36000</CachingInterval>
@@ -290,7 +319,7 @@
             <Enable>true</Enable>
         </AttributeCaching>
         <ThirftBasedEntitlementConfig>
-            <EnableThriftService>true</EnableThriftService>
+            <EnableThriftService>false</EnableThriftService>
             <ReceivePort>${Ports.ThriftEntitlementReceivePort}</ReceivePort>
             <ClientTimeout>10000</ClientTimeout>
             <KeyStore>
@@ -302,23 +331,42 @@
         </ThirftBasedEntitlementConfig>
     </EntitlementSettings>
 
-    <SCIMAuthenticators>
-        <Authenticator class="org.wso2.carbon.identity.scim.provider.auth.BasicAuthHandler">
-            <Property name="Priority">5</Property>
-        </Authenticator>
-        <Authenticator class="org.wso2.carbon.identity.scim.provider.auth.OAuthHandler">
-            <Property name="Priority">10</Property>
-            <Property name="AuthorizationServer">local://services</Property>
-            <!--Property name="AuthorizationServer">https://localhost:9443/services</Property>
-            <Property name="UserName">admin</Property>
-            <Property name="Password">admin</Property-->
-        </Authenticator>
-    </SCIMAuthenticators>
+    <SCIM>
+        <!--
+            Default value for UserEPUrl and GroupEPUrl are built in following format
+            https://<HostName>:<MgtTrpProxyPort except 443>/<ProxyContextPath>/<context>/<path>
+            If that doesn't satisfy uncomment the following config and explicitly configure the value
+        -->
+        <!--UserEPUrl>https://localhost:9443/wso2/scim/Users</UserEPUrl-->
+        <!--GroupEPUrl>https://localhost:9443/wso2/scim/Groups</GroupEPUrl-->
+        <SCIMAuthenticators>
+            <Authenticator class="org.wso2.carbon.identity.scim.provider.auth.BasicAuthHandler">
+                <Property name="Priority">5</Property>
+            </Authenticator>
+            <Authenticator class="org.wso2.carbon.identity.scim.provider.auth.OAuthHandler">
+                <Property name="Priority">10</Property>
+                <Property name="AuthorizationServer">local://services</Property>
+                <!--Property name="AuthorizationServer">https://localhost:9443/services</Property>
+                <Property name="UserName">admin</Property>
+                <Property name="Password">admin</Property-->
+            </Authenticator>
+        </SCIMAuthenticators>
+    </SCIM>
+
     <!--SessionContextCache>
         <Enable>true</Enable>
         <Capacity>100000</Capacity>
     </SessionContextCache-->
 
-    <!--To do OSGI invocations to OAuth2Service,when the entire server is in one JVM -->
-    <SeparateBackEnd>false</SeparateBackEnd>
+    <EventListeners>
+        <EventListener type="org.wso2.carbon.user.core.listener.UserOperationEventListener"
+                       name="org.wso2.carbon.identity.workflow.mgt.impl.userstore.UserStoreActionListener"
+                       orderId="10" enable="false"/>
+        <EventListener type="org.wso2.carbon.user.core.listener.UserOperationEventListener" name="org.wso2.carbon.identity.mgt.IdentityMgtEventListener"
+                       orderId="50" enable="false"/>
+        <EventListener type="org.wso2.carbon.user.core.listener.UserOperationEventListener" name="org.wso2.carbon.identity.oauth.listener.IdentityOathEventListener"
+                       orderId="60" enable="false"/>
+        <EventListener type="org.wso2.carbon.user.core.listener.UserOperationEventListener" name="org.wso2.carbon.identity.provider.openid.listener.IdentityOpenIDUserEventListener"
+                       orderId="70" enable="false"/>
+    </EventListeners>
 </Server>
\ No newline at end of file
diff --git a/modules/distribution/src/repository/conf/tomcat/context.xml b/modules/distribution/src/repository/conf/tomcat/context.xml
index 96452af2..a41e5b6f 100644
--- a/modules/distribution/src/repository/conf/tomcat/context.xml
+++ b/modules/distribution/src/repository/conf/tomcat/context.xml
@@ -17,7 +17,7 @@
 -->
 <!-- The contents of this file will be loaded for each web application -->
 <Context crossContext="true">
-	
+
 
 
     <!-- Default set of monitored resources -->
@@ -34,17 +34,40 @@
     <!--
     <Valve className="org.apache.catalina.valves.CometConnectionManagerValve" />
     -->
-
     <!-- APIPublisherLifecycleListener listens to webapp deployment events and publish JAX-RS services packaged into each of the aforesaid
-         web applications that are configured to be made available as 'Managed APIs'. Given below are the parameters that need to be congigured
+         web applications that are configured to be made available as 'Managed APIs'. Given below are the parameters that need to be congigured 
          in the form of 'context-param's in web.xml of each applicable web application.
-
+         
          'managed-api-enabled'    - Indicates that the web application being processed needs to be published as a 'Managed API'.
-         'managed-api-context'    - Context of the 'Managed API'.
-         'managed-api-version'    - Version of the 'Managed API'.
-         'managed-api-owner'      - Owner of the 'Managed API'.
-         'managed-api-isSecured'  - Indicates if the 'Managed API' needs to be exposed over a secured channel.
-         'managed-api-transports' - Transports through which the 'Managed API' is exposed.
+ 	 'managed-api-context'    - Context of the 'Managed API'.
+	 'managed-api-version'    - Version of the 'Managed API'.
+	 'managed-api-owner'      - Owner of the 'Managed API'.
+	 'managed-api-isSecured'  - Indicates if the 'Managed API' needs to be exposed over a secured channel.
+	 'managed-api-transports' - Transports through which the 'Managed API' is exposed.
      -->
     <Listener className="org.wso2.carbon.apimgt.webapp.publisher.lifecycle.listener.APIPublisherLifecycleListener"/>
-</Context>
+
+    <!-- WebAppDeploymentLifecycleListener listens to webapp deployment events and adds the custom permissions defined in webapps'
+        META-INF/permissions.xml to the permissions/admin section of registry. Given below is a sample of permissions.xml file.
+
+    <PermissionConfiguration>
+            <Permission>
+                <name>Device Management</name>
+                <path>/device-mgt</path>
+            </Permission>
+            <Permission>
+                <name>Administrator</name>
+                <path>/device-mgt/admin</path>
+            </Permission>
+            <Permission>
+                <name>Dashboard</name>
+                <path>/device-mgt/admin/dashboard</path>
+            </Permission>
+            <Permission>
+                <name>Lock</name>
+                <path>/device-mgt/admin/operation/lock</path>
+            </Permission>
+    </PermissionConfiguration>
+     -->
+    <Listener className="org.wso2.carbon.device.mgt.core.config.permission.lifecycle.WebAppDeploymentLifecycleListener"/>
+</Context>
\ No newline at end of file
diff --git a/modules/feature/org.wso2.carbon.device.mgt.iot.util.feature/pom.xml b/modules/feature/org.wso2.carbon.device.mgt.iot.util.feature/pom.xml
new file mode 100644
index 00000000..b136896d
--- /dev/null
+++ b/modules/feature/org.wso2.carbon.device.mgt.iot.util.feature/pom.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+~ Copyright (c) 2014, 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>1.0.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.device.mgt.iot.util.feature</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>WSO2 IoT Server - Util Featue</name>
+    <description>WSO2 IoT Server Util Feature</description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.wso2.carbon.device.mgt.iot</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.wso2.carbon.device.mgt.iot</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.iot.common.api</artifactId>
+            <type>war</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.json.wso2</groupId>
+            <artifactId>json</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>src/main/resources</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>resources</directory>
+                                    <includes>
+                                        <include>build.properties</include>
+                                        <include>p2.inf</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.wso2.carbon.device.mgt.iot</groupId>
+                                    <artifactId>org.wso2.carbon.device.mgt.iot.common.api</artifactId>
+                                    <type>war</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${basedir}/src/main/resources/webapps/</outputDirectory>
+                                    <destFileName>common.war</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>org.wso2.carbon.device.mgt.iot</id>
+                            <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
+                            <adviceFile>
+                                <properties>
+                                    <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
+                                    <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
+                                </properties>
+                            </adviceFile>
+                            <bundles>
+                                <bundleDef>
+                                    org.wso2.carbon.device.mgt.iot:org.wso2.carbon.device.mgt.iot.common:${carbon.iot.device.mgt.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.common:${carbon.device.mgt.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.json.wso2:json:${commons-json.version}
+                                </bundleDef>
+                            </bundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 91feb5e8..b9c940df 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -125,10 +125,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.group.server.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
-                                <!-- TODO: Verify this feature is needed -->
-                                <!--<featureArtifactDef>-->
-                                    <!--org.wso2.carbon.devicemgt:org.wso2.carbon.webapp.authenticator.framework.server.feature:${carbon.device.mgt.version}-->
-                                <!--</featureArtifactDef>-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.webapp.authenticator.framework.server.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
                                 <!-- End of Device Management Features -->
 
                                 <!-- Jaggery Features -->
@@ -150,10 +149,9 @@
                                 <featureArtifactDef>
                                     org.jaggeryjs.modules:jaggery-test.feature:${jaggery.extensions.test.version}
                                 </featureArtifactDef>
-                                <!-- TODO: Verify this feature is needed -->
-                                <!--<featureArtifactDef>-->
-                                    <!--org.jaggeryjs.modules:i18n.feature:${jaggery.extensions.version}-->
-                                <!--</featureArtifactDef>-->
+                                <featureArtifactDef>
+                                    org.jaggeryjs.modules:i18n.feature:${jaggery.extensions.version}
+                                </featureArtifactDef>
                                 <!-- End of Jaggery Features -->
 
                                 <!-- Carbon Deployment Features -->
@@ -245,9 +243,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature:${carbon.identity.version}
                                 </featureArtifactDef>
-                                <feaureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.sso.saml.feature:${carbon.identity.version}
-                                </feaureArtifactDef>
                                 <!--<feaureArtifactDef>-->
                                     <!--org.wso2.carbon:org.wso2.stratos.identity.saml2.sso.mgt.feature:${carbon.identity.version}-->
                                 <!--</feaureArtifactDef>-->
@@ -257,6 +252,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.claim.mgt.feature:${carbon.identity.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.notification.mgt.feature:${carbon.identity.version}
+                                </featureArtifactDef>
                                 <!--<featureArtifactDef>-->
                                     <!--org.wso2.carbon:org.wso2.carbon.identity.user.profile.server.feature:${carbon.identity.version}-->
                                 <!--</featureArtifactDef>-->
@@ -285,6 +283,10 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.application.mgt.feature:${carbon.identity.version}
                                 </featureArtifactDef>
+                                <!-- Directory server related features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.directory.service.mgr.feature:${carbon.identity.version}
+                                </featureArtifactDef>
                                 <!-- TODO: Verify this feature is needed -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.claim.mgt.server.feature:${carbon.identity.version}
@@ -294,7 +296,7 @@
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.core.feature:${carbon.identity.version}
                                 </feaureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.self.registration.server.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.user.registration.server.feature:${carbon.identity.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.server.feature:${carbon.identity.version}
@@ -305,9 +307,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.provider.server.feature:${carbon.identity.version}
                                 </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.relying.party.server.feature:${carbon.identity.version}
-                                </featureArtifactDef>
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.identity:org.wso2.carbon.identity.relying.party.server.feature:${carbon.identity.version}-->
+                                <!--</featureArtifactDef>-->
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.client.feature:${carbon.identity.version}
                                 </featureArtifactDef>
@@ -428,9 +430,9 @@
 								<featureArtifactDef>
 									org.wso2.carbon.deployment:org.wso2.carbon.module.mgt.server.feature:${carbon.deployment.version}
 								</featureArtifactDef>
-								<featureArtifactDef>
-									org.wso2.carbon.deployment:org.wso2.carbon.webapp.mgt.server.feature:${carbon.deployment.version}
-								</featureArtifactDef>
+								<!--<featureArtifactDef>-->
+									<!--org.wso2.carbon.deployment:org.wso2.carbon.webapp.mgt.server.feature:${carbon.deployment.version}-->
+								<!--</featureArtifactDef>-->
 								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
 								<!-- End of Carbon Deployment Features -->
 
@@ -585,9 +587,9 @@
                                 </featureArtifactDef>
 
                                 <!--added das features-->
-                                <featureArtifactDef>
-                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.lite.feature:${carbon.analytics.version}
-                                </featureArtifactDef>
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.analytics:org.wso2.carbon.analytics.lite.feature:${carbon.analytics.version}-->
+                                <!--</featureArtifactDef>-->
 
                                 <!--APIM feature-->
                                 <featureArtifactDef>
@@ -600,6 +602,108 @@
                                     <!--org.wso2.carbon.mediation:org.wso2.carbon.mediation.initializer.feature:${carbon.mediation.version}-->
                                 <!--</featureArtifactDef>-->
                                 <!--End of APIM Feature-->
+
+                                <!--DAS Feature-->
+
+                                <!--START - Analytics Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.core.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.datasource.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.spark.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.api.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.spark.commons.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.messageconsole.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
+                                <!-- END - Analytics features -->
+
+                                <!-- ************** START - Capp Management ********* -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.application.mgt.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <!-- ************** END - Capp Management ********* -->
+
+                                <!-- ************** START - Data Bridge ************ -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.datareceiver.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.streamdefn.filesystem.server.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.datapublisher.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.eventsink.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.eventtable.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
+                                <!-- ************** END - Data Bridge ************ -->
+
+                                <!-- ************** START - EVENT PROCESSING FEATURES *********** -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.receiver.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.publisher.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.event-processing:org.wso2.carbon.event.processor.feature:${carbon.event-processing.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.tracer.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.event-processing:org.wso2.carbon.event.flow.feature:${carbon.event-processing.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.statistics.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.stream.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.event-processing:org.wso2.carbon.event.simulator.feature:${carbon.event-processing.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.application.deployer.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.processor.manager.core.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.processor.manager.commons.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.stream.persistence.server.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.event-processing:org.wso2.carbon.event.execution.manager.feature:${carbon.event-processing.version}
+                                </featureArtifactDef>
+                                <!-- START - Tools -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.tryit.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.event-processing:org.wso2.carbon.siddhi.tryit.feature:${carbon.event-processing.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.ciphertool:org.wso2.ciphertool.feature:${cipher.tool.version}
+                                </featureArtifactDef>
+                                <!-- END - Tools -->
+
+
+                                <!--End of DAS Feature-->
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -647,11 +751,10 @@
                                     <id>org.wso2.carbon.device.mgt.group.server.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
-                                <!-- TODO: Verify this feature is needed -->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.webapp.authenticator.framework.server.feature.group</id>-->
-                                    <!--<version>${carbon.device.mgt.version}</version>-->
-                                <!--</feature>-->
+                                <feature>
+                                    <id>org.wso2.carbon.webapp.authenticator.framework.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
                                 <!-- End of Device Management Features -->
 
                                 <!-- Jaggery Features -->
@@ -679,11 +782,10 @@
                                     <id>org.jaggeryjs.modules.jaggery-test.feature.group</id>
                                     <version>${jaggery.extensions.test.version}</version>
                                 </feature>
-                                <!-- TODO: Verify this feature is needed -->
-                                <!--<feature>-->
-                                    <!--<id>org.jaggeryjs.modules.i18n.feature.group</id>-->
-                                    <!--<version>${jaggery.extensions.version}</version>-->
-                                <!--</feature>-->
+                                <feature>
+                                    <id>org.jaggeryjs.modules.i18n.feature.group</id>
+                                    <version>${jaggery.extensions.version}</version>
+                                </feature>
                                 <!-- End of Jaggery Features -->
 
                                 <!-- Carbon Deployment Features -->
@@ -709,10 +811,10 @@
                                 <!-- End of Carbon Utils Features -->
 
                                 <!-- Carbon Commons Features -->
-                                <feature>
-                                    <id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
-                                    <version>${carbon.commons.version}</version>
-                                </feature>
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.databridge.datapublisher.feature.group</id>-->
+                                    <!--<version>${carbon.commons.version}</version>-->
+                                <!--</feature>-->
                                 <feature>
                                     <id>org.wso2.carbon.event.server.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -841,6 +943,10 @@
                                     <id>org.wso2.carbon.identity.application.mgt.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.directory.service.mgr.feature.group</id>
+                                    <version>${carbon.identity.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.idp.mgt.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
@@ -859,6 +965,10 @@
                                     <id>org.wso2.carbon.claim.mgt.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.notification.mgt.feature.group</id>
+                                    <version>${carbon.identity.version}</version>
+                                </feature>
                                 <!-- TODO: Verify this feature is needed -->
                                 <feature>
                                     <id>org.wso2.carbon.claim.mgt.feature.group</id>
@@ -866,18 +976,18 @@
                                 </feature>
                                 <!-- End of SSO Fix -->
                                 <!--Commented to remove SAML SSO menu item-->
-                                <!--<feature>
-                                    <id>org.wso2.carbon.identity.sso.saml.feature.group</id>
-                                    <version>${carbon.platform.version}</version>
-                                </feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.identity.sso.saml.feature.group</id>-->
+                                    <!--<version>${carbon.identity.version}</version>-->
+                                <!--</feature>-->
                                 <feature>
                                     <id>org.wso2.carbon.identity.core.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.identity.self.registration.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
-                                </feature>
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.identity.self.registration.server.feature.group</id>-->
+                                    <!--<version>${carbon.identity.version}</version>-->
+                                <!--</feature>-->
                                 <feature>
                                     <id>org.wso2.carbon.identity.oauth.feature.group</id>
                                     <version>${carbon.identity.version}</version>
@@ -886,10 +996,10 @@
                                     <id>org.wso2.carbon.identity.provider.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.identity.relying.party.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
-                                </feature>
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.identity.relying.party.server.feature.group</id>-->
+                                    <!--<version>${carbon.identity.version}</version>-->
+                                <!--</feature>-->
                                 <feature>
                                     <id>org.wso2.carbon.um.ws.service.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
@@ -1134,20 +1244,145 @@
                                     <id>org.wso2.carbon.system.statistics.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.bam.service.agent.feature.group</id>
-                                    <version>${carbon.deployment.version}</version>
-                                </feature>
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.bam.service.agent.feature.group</id>-->
+                                    <!--<version>${carbon.deployment.version}</version>-->
+                                <!--</feature>-->
                                 <!--<feature>-->
                                     <!--<id>org.wso2.carbon.mediation.initializer.feature.group</id>-->
                                     <!--<version>${carbon.mediation.version}</version>-->
                                 <!--</feature>-->
                                 <!--End of APIM Feature-->
                                 <!--DAS Feature-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.analytics.lite.feature.group</id>-->
+                                    <!--<version>${carbon.analytics.version}</version>-->
+                                <!--</feature>-->
+
+                                <!-- START - Analytics Features -->
                                 <feature>
-                                    <id>org.wso2.carbon.analytics.lite.feature.group</id>
+                                    <id>org.wso2.carbon.analytics.core.feature.group</id>
                                     <version>${carbon.analytics.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.datasource.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.spark.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.api.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.spark.commons.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <!-- END - Analytics features -->
+
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.messageconsole.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+
+                                <!-- ************** START - Capp Management ********* -->
+                                <feature>
+                                    <id>org.wso2.carbon.application.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <!-- ************** END - Capp Management ********* -->
+
+                                <!-- ************** START - Data Bridge ************ -->
+                                <feature>
+                                    <id>org.wso2.carbon.databridge.datareceiver.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.databridge.streamdefn.filesystem.server.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.eventsink.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.eventtable.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                                <!-- ************** END - Data Bridge ************ -->
+
+
+                                <!-- ************** START - EVENT PROCESSING FEATURES ************ -->
+                                <feature>
+                                    <id>org.wso2.carbon.event.receiver.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.publisher.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.processor.feature.group</id>
+                                    <version>${carbon.event-processing.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.tracer.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.flow.feature.group</id>
+                                    <version>${carbon.event-processing.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.statistics.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.stream.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.simulator.feature.group</id>
+                                    <version>${carbon.event-processing.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.application.deployer.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.processor.manager.core.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.processor.manager.commons.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.stream.persistence.server.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.execution.manager.feature.group</id>
+                                    <version>${carbon.event-processing.version}</version>
+                                </feature>
+
+                                <!-- ************** END - EVENT PROCESSING FEATURES ************ -->
+                                <!--START - Tools-->
+                                <feature>
+                                    <id>org.wso2.carbon.tryit.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.siddhi.tryit.feature.group</id>
+                                    <version>${carbon.event-processing.version}</version>
+                                </feature>
+                                <!--END - Tools-->
 							</features>
                         </configuration>
                     </execution>
diff --git a/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/ArduinoControllerService.java b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/ArduinoControllerService.java
index 926113ff..7bbfdbcd 100644
--- a/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/ArduinoControllerService.java
+++ b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/ArduinoControllerService.java
@@ -161,6 +161,25 @@ public class ArduinoControllerService {
 				response.setStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR);
 			}
 
+		} catch (UnauthorizedException e) {
+			response.setStatus(HttpStatus.SC_UNAUTHORIZED);
+
+		}
+	}
+
+	@Path("/test/{value}")
+	@POST
+	public void pushtData( @PathParam("value") String value,@Context HttpServletResponse response) {
+
+
+		try {
+			DeviceController deviceController = new DeviceController();
+			deviceController.pushBamData("ayyoob", "firealarm", "deviceID1",
+										 System.currentTimeMillis(), "DeviceData" ,value, DataStreamDefinitions.StreamTypeLabel
+												 .TEMPERATURE);
+
+
+
 		} catch (UnauthorizedException e) {
 			response.setStatus(HttpStatus.SC_UNAUTHORIZED);
 
diff --git a/pom.xml b/pom.xml
index ecee9a5b..d960fac3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -852,7 +852,7 @@
         <carbon.deployment.version>4.5.2</carbon.deployment.version>
 
         <!-- Carbon Identity -->
-        <carbon.identity.version>4.5.6</carbon.identity.version>
+        <carbon.identity.version>4.5.10-SNAPSHOT</carbon.identity.version>
 
         <!-- Carbon Multi-tenancy -->
         <carbon.multitenancy.version>4.4.1</carbon.multitenancy.version>
@@ -892,13 +892,13 @@
 
         <!--DAS-->
         <carbon.analytics.version>1.0.3-SNAPSHOT</carbon.analytics.version>
-        <carbon.analytics.common.version>5.0.1-SNAPSHOT</carbon.analytics.common.version>
+        <carbon.analytics.common.version>5.0.2-SNAPSHOT</carbon.analytics.common.version>
         <das.release.version>3.0.0-SNAPSHOT</das.release.version>
         <carbon.data.version>4.3.1-SNAPSHOT</carbon.data.version>
         <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
         <shindig.version>1.0.0</shindig.version>
         <carbon.dashboard.version>1.0.1-SNAPSHOT</carbon.dashboard.version>
-        <carbon.event-processing.version>2.0.4-SNAPSHOT</carbon.event-processing.version>
+        <carbon.event-processing.version>2.0.4</carbon.event-processing.version>
 
 
         <orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient>

From d08d7cb048ac42a685e5df4845f9d503bb9812d6 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Tue, 22 Sep 2015 19:23:06 +0530
Subject: [PATCH 2/4] added analytics commons data publisher and used dal layer
 to capture the data

---
 modules/distribution/pom.xml                  | 1099 +++++++++--------
 modules/distribution/src/assembly/bin.xml     |   39 +-
 .../src/assembly/filter.properties            |    8 +-
 .../src/repository/conf/carbon.xml            |  685 ++++++++++
 .../conf/data-bridge/data-bridge-config.xml   |   72 ++
 .../src/statistics/IOT_Sensor_Analytics.car   |  Bin 8596 -> 0 bytes
 .../IOT_Sensor_Analytics.tbox                 |  Bin
 .../carbonapps/Temperature_Sensor.car         |  Bin 0 -> 8525 bytes
 modules/p2-profile-gen/pom.xml                |  194 +--
 .../impl/AndroidSenseManagerService.java      |   15 +
 .../plugin/impl/ArduinoManagerService.java    |   15 +
 .../pom.xml                                   |   10 +
 .../impl/ArduinoControllerService.java        |   29 +-
 .../src/main/webapp/WEB-INF/web.xml           |    4 +-
 .../impl/DigitalDisplayManagerService.java    |   15 +
 .../plugin/impl/FireAlarmManagerService.java  |   16 +
 modules/samples/pom.xml                       |    6 +
 .../impl/RaspberrypiManagerService.java       |   15 +
 .../plugin/impl/SensebotManagerService.java   |   16 +
 pom.xml                                       |   10 +-
 20 files changed, 1553 insertions(+), 695 deletions(-)
 create mode 100644 modules/distribution/src/repository/conf/carbon.xml
 create mode 100644 modules/distribution/src/repository/conf/data-bridge/data-bridge-config.xml
 delete mode 100644 modules/distribution/src/statistics/IOT_Sensor_Analytics.car
 rename modules/distribution/src/statistics/{ => bamtoolbox}/IOT_Sensor_Analytics.tbox (100%)
 create mode 100644 modules/distribution/src/statistics/carbonapps/Temperature_Sensor.car

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index c15b7310..12f59031 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -17,585 +17,620 @@
 ~ 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">
+<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>1.0.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
+	<parent>
+		<groupId>org.wso2.iot</groupId>
+		<artifactId>wso2iot-parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>wso2iot</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>WSO2 IoT Server - Distribution</name>
-    <description>WSO2 IoT Server Distribution</description>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>wso2iot</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<name>WSO2 IoT Server - Distribution</name>
+	<description>WSO2 IoT Server Distribution</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.h2database.wso2</groupId>
-            <artifactId>h2-database-engine</artifactId>
-        </dependency>
-    </dependencies>
+	<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>
+	<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>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>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<inherited>false</inherited>
+				<executions>
+					<execution>
+						<id>2-unpack-wso2carbon</id>
+						<phase>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>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
+			<!--============ Add Server Roles for DAS ===============-->
 
-                    <!--============ Added with ES Features ===============-->
+			<!--<execution>-->
+			<!--<id>add-server-roles</id>-->
+			<!--<phase>prepare-package</phase>-->
+			<!--<configuration>-->
+			<!--<target>-->
+			<!--<echo message="Using xml task to add server roles"/>-->
+			<!--&lt;!&ndash;<taskdef name="xmltask"&ndash;&gt;-->
+			<!--&lt;!&ndash;classname="com.oopsconsultancy.xmltask.ant.XmlTask"&ndash;&gt;-->
+			<!--&lt;!&ndash;classpathref="maven.plugin.classpath"/>&ndash;&gt;-->
+			<!--<xmltask-->
+			<!--source="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"-->
+			<!--dest="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"-->
+			<!--preserveType="true">-->
+			<!--<insert path="/Server/ServerRoles/">-->
+			<!--<![CDATA[-->
+			<!--<Role>DataAnalyticsServer</Role>-->
+			<!--<Role>ComplexEventProcessor</Role>-->
+			<!--]]>-->
+			<!--</insert>-->
+			<!--</xmltask>-->
+			<!--</target>-->
+			<!--</configuration>-->
+			<!--<goals>-->
+			<!--<goal>run</goal>-->
+			<!--</goals>-->
+			<!--</execution>-->
 
-                    <execution>
-                        <id>social-h2-table-gen</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <target>
-                                <echo message="########### Create Social Database ##############"/>
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social"
-                                      overwrite="false">
-                                    <fileset
-                                            dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social/">
-                                    </fileset>
-                                </copy>
-                                <path id="h2.classpath">
-                                    <path refid="maven.compile.classpath"/>
-                                </path>
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                    <!--============ End with ES Features ===============-->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
 
-                    <execution>
-                        <!-- Creating Device Management schema -->
-                        <id>create-device-mgt-schema</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <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"/>
+					<!--============ Added with ES Features ===============-->
 
-                                <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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/h2.sql"/>
-                                </sql>
-                            </tasks>
-                        </configuration>
-                    </execution>
+					<execution>
+						<id>social-h2-table-gen</id>
+						<phase>package</phase>
+						<configuration>
+							<target>
+								<echo message="########### Create Social Database ##############"/>
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social"
+									  overwrite="false">
+									<fileset
+											dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social/">
+									</fileset>
+								</copy>
+								<path id="h2.classpath">
+									<path refid="maven.compile.classpath"/>
+								</path>
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+					<!--============ End with ES Features ===============-->
 
-                    <execution>
-                        <!-- Creating API Management schema -->
-                        <id>create-api-mgt-schema</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <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"/>
+					<execution>
+						<!-- Creating Device Management schema -->
+						<id>create-device-mgt-schema</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/apimgt/h2.sql"/>
-                                </sql>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <!--<execution>-->
-                    <!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
-                    <!--<id>create-firealarm-schema</id>-->
-                    <!--<phase>package</phase>-->
-                    <!--<goals>-->
-                    <!--<goal>run</goal>-->
-                    <!--</goals>-->
-                    <!--<configuration>-->
-                    <!--<tasks>-->
-                    <!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples/firealarm/database"/>-->
-                    <!--<property name="db.dir"-->
-                    <!--value="target/wso2carbon-core-${carbon.kernel.version}/samples/firealarm/database"/>-->
-                    <!--<property name="userid" value="wso2carbon"/>-->
-                    <!--<property name="password" value="wso2carbon"/>-->
-                    <!--<property name="dbURL"-->
-                    <!--value="jdbc:h2:file:${basedir}/${db.dir}/FireAlarmDM_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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/h2.sql"/>
+								</sql>
+							</tasks>
+						</configuration>
+					</execution>
 
-                    <!--<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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_firealarm.sql"/>-->
-                    <!--</sql>-->
-                    <!--</tasks>-->
-                    <!--</configuration>-->
-                    <!--</execution>-->
+					<execution>
+						<!-- Creating API Management schema -->
+						<id>create-api-mgt-schema</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<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"/>
 
-                    <!--<execution>-->
-                    <!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
-                    <!--<id>create-sensebot-schema</id>-->
-                    <!--<phase>package</phase>-->
-                    <!--<goals>-->
-                    <!--<goal>run</goal>-->
-                    <!--</goals>-->
-                    <!--<configuration>-->
-                    <!--<tasks>-->
-                    <!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples/sensebot/database"/>-->
-                    <!--<property name="db.dir"-->
-                    <!--value="target/wso2carbon-core-${carbon.kernel.version}/samples/sensebot/database"/>-->
-                    <!--<property name="userid" value="wso2carbon"/>-->
-                    <!--<property name="password" value="wso2carbon"/>-->
-                    <!--<property name="dbURL"-->
-                    <!--value="jdbc:h2:file:${basedir}/${db.dir}/SensebotDM_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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/apimgt/h2.sql"/>
+								</sql>
+							</tasks>
+						</configuration>
+					</execution>
+					<!--<execution>-->
+					<!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
+					<!--<id>create-firealarm-schema</id>-->
+					<!--<phase>package</phase>-->
+					<!--<goals>-->
+					<!--<goal>run</goal>-->
+					<!--</goals>-->
+					<!--<configuration>-->
+					<!--<tasks>-->
+					<!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples/firealarm/database"/>-->
+					<!--<property name="db.dir"-->
+					<!--value="target/wso2carbon-core-${carbon.kernel.version}/samples/firealarm/database"/>-->
+					<!--<property name="userid" value="wso2carbon"/>-->
+					<!--<property name="password" value="wso2carbon"/>-->
+					<!--<property name="dbURL"-->
+					<!--value="jdbc:h2:file:${basedir}/${db.dir}/FireAlarmDM_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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_sensebot.sql"/>-->
-                    <!--</sql>-->
-                    <!--</tasks>-->
-                    <!--</configuration>-->
-                    <!--</execution>-->
+					<!--<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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_firealarm.sql"/>-->
+					<!--</sql>-->
+					<!--</tasks>-->
+					<!--</configuration>-->
+					<!--</execution>-->
 
-                    <!--<execution>-->
-                    <!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
-                    <!--<id>create-arduino-schema</id>-->
-                    <!--<phase>package</phase>-->
-                    <!--<goals>-->
-                    <!--<goal>run</goal>-->
-                    <!--</goals>-->
-                    <!--<configuration>-->
-                    <!--<tasks>-->
-                    <!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/database"/>-->
-                    <!--<property name="db.dir"-->
-                    <!--value="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/database"/>-->
-                    <!--<property name="userid" value="wso2carbon"/>-->
-                    <!--<property name="password" value="wso2carbon"/>-->
-                    <!--<property name="dbURL"-->
-                    <!--value="jdbc:h2:file:${basedir}/${db.dir}/ArduinoDM_DB;DB_CLOSE_ON_EXIT=FALSE"/>-->
+					<!--<execution>-->
+					<!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
+					<!--<id>create-sensebot-schema</id>-->
+					<!--<phase>package</phase>-->
+					<!--<goals>-->
+					<!--<goal>run</goal>-->
+					<!--</goals>-->
+					<!--<configuration>-->
+					<!--<tasks>-->
+					<!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples/sensebot/database"/>-->
+					<!--<property name="db.dir"-->
+					<!--value="target/wso2carbon-core-${carbon.kernel.version}/samples/sensebot/database"/>-->
+					<!--<property name="userid" value="wso2carbon"/>-->
+					<!--<property name="password" value="wso2carbon"/>-->
+					<!--<property name="dbURL"-->
+					<!--value="jdbc:h2:file:${basedir}/${db.dir}/SensebotDM_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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_arduino.sql"/>-->
-                    <!--</sql>-->
-                    <!--</tasks>-->
-                    <!--</configuration>-->
-                    <!--</execution>-->
+					<!--<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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_sensebot.sql"/>-->
+					<!--</sql>-->
+					<!--</tasks>-->
+					<!--</configuration>-->
+					<!--</execution>-->
 
-                    <!--<execution>-->
-                    <!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
-                    <!--<id>create-android-sense-schema</id>-->
-                    <!--<phase>package</phase>-->
-                    <!--<goals>-->
-                    <!--<goal>run</goal>-->
-                    <!--</goals>-->
-                    <!--<configuration>-->
-                    <!--<tasks>-->
-                    <!--<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}/AndroidSenseDM_DB;DB_CLOSE_ON_EXIT=FALSE"/>-->
+					<!--<execution>-->
+					<!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
+					<!--<id>create-arduino-schema</id>-->
+					<!--<phase>package</phase>-->
+					<!--<goals>-->
+					<!--<goal>run</goal>-->
+					<!--</goals>-->
+					<!--<configuration>-->
+					<!--<tasks>-->
+					<!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/database"/>-->
+					<!--<property name="db.dir"-->
+					<!--value="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/database"/>-->
+					<!--<property name="userid" value="wso2carbon"/>-->
+					<!--<property name="password" value="wso2carbon"/>-->
+					<!--<property name="dbURL"-->
+					<!--value="jdbc:h2:file:${basedir}/${db.dir}/ArduinoDM_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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_android_sense.sql"/>-->
-                    <!--</sql>-->
-                    <!--</tasks>-->
-                    <!--</configuration>-->
-                    <!--</execution>-->
+					<!--<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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_arduino.sql"/>-->
+					<!--</sql>-->
+					<!--</tasks>-->
+					<!--</configuration>-->
+					<!--</execution>-->
 
-                    <!--<execution>-->
-                    <!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
-                    <!--<id>create-raspberrypi-schema</id>-->
-                    <!--<phase>package</phase>-->
-                    <!--<goals>-->
-                    <!--<goal>run</goal>-->
-                    <!--</goals>-->
-                    <!--<configuration>-->
-                    <!--<tasks>-->
-                    <!--<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}/RaspberrypiDM_DB;DB_CLOSE_ON_EXIT=FALSE"/>-->
+					<!--<execution>-->
+					<!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
+					<!--<id>create-android-sense-schema</id>-->
+					<!--<phase>package</phase>-->
+					<!--<goals>-->
+					<!--<goal>run</goal>-->
+					<!--</goals>-->
+					<!--<configuration>-->
+					<!--<tasks>-->
+					<!--<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}/AndroidSenseDM_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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_raspberrypi.sql"/>-->
-                    <!--</sql>-->
-                    <!--</tasks>-->
-                    <!--</configuration>-->
-                    <!--</execution>-->
+					<!--<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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_android_sense.sql"/>-->
+					<!--</sql>-->
+					<!--</tasks>-->
+					<!--</configuration>-->
+					<!--</execution>-->
 
-                    <!--<execution>-->
-                    <!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
-                    <!--<id>create-digitaldisply-schema</id>-->
-                    <!--<phase>package</phase>-->
-                    <!--<goals>-->
-                    <!--<goal>run</goal>-->
-                    <!--</goals>-->
-                    <!--<configuration>-->
-                    <!--<tasks>-->
-                    <!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples/digital_display/database"/>-->
-                    <!--<property name="db.dir"-->
-                    <!--value="target/wso2carbon-core-${carbon.kernel.version}/samples/digital_display/database"/>-->
-                    <!--<property name="userid" value="wso2carbon"/>-->
-                    <!--<property name="password" value="wso2carbon"/>-->
-                    <!--<property name="dbURL"-->
-                    <!--value="jdbc:h2:file:${basedir}/${db.dir}/DigitalDisplayDM_DB;DB_CLOSE_ON_EXIT=FALSE"/>-->
+					<!--<execution>-->
+					<!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
+					<!--<id>create-raspberrypi-schema</id>-->
+					<!--<phase>package</phase>-->
+					<!--<goals>-->
+					<!--<goal>run</goal>-->
+					<!--</goals>-->
+					<!--<configuration>-->
+					<!--<tasks>-->
+					<!--<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}/RaspberrypiDM_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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_digital_display.sql"/>-->
-                    <!--</sql>-->
-                    <!--</tasks>-->
-                    <!--</configuration>-->
-                    <!--</execution>-->
+					<!--<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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_raspberrypi.sql"/>-->
+					<!--</sql>-->
+					<!--</tasks>-->
+					<!--</configuration>-->
+					<!--</execution>-->
+
+					<!--<execution>-->
+					<!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
+					<!--<id>create-digitaldisply-schema</id>-->
+					<!--<phase>package</phase>-->
+					<!--<goals>-->
+					<!--<goal>run</goal>-->
+					<!--</goals>-->
+					<!--<configuration>-->
+					<!--<tasks>-->
+					<!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples/digital_display/database"/>-->
+					<!--<property name="db.dir"-->
+					<!--value="target/wso2carbon-core-${carbon.kernel.version}/samples/digital_display/database"/>-->
+					<!--<property name="userid" value="wso2carbon"/>-->
+					<!--<property name="password" value="wso2carbon"/>-->
+					<!--<property name="dbURL"-->
+					<!--value="jdbc:h2:file:${basedir}/${db.dir}/DigitalDisplayDM_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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_digital_display.sql"/>-->
+					<!--</sql>-->
+					<!--</tasks>-->
+					<!--</configuration>-->
+					<!--</execution>-->
 
 
-                    <execution>
-                        <id>3-extract-apps-from-components</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <property name="tempdir" value="target/apps-temp"/>
-                                <property name="jardir" value="target/jars"/>
-                                <!--<property name="shindig.version" value="2.5.0-beta5" />-->
+					<execution>
+						<id>3-extract-apps-from-components</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<property name="tempdir" value="target/apps-temp"/>
+								<property name="jardir" value="target/jars"/>
+								<!--<property name="shindig.version" value="2.5.0-beta5" />-->
 
-                                <mkdir dir="${tempdir}"/>
-                                <mkdir dir="${tempdir}/wso2iot-${project.version}/repository/components"/>
-                                <mkdir dir="${tempdir}/wso2iot-${project.version}/repository/deployment/server"/>
-                                <mkdir dir="${tempdir}/wso2iot-${project.version}/repository/deployment/server/webapps"/>
-                                <unzip dest="${tempdir}">
-                                    <fileset dir="target">
-                                        <include name="wso2iot-${project.version}.zip"/>
-                                    </fileset>
-                                </unzip>
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components"
-                                      overwrite="true">
-                                    <fileset dir="${tempdir}/wso2iot-${project.version}/repository/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" />
-                                    </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" />-->
+								<mkdir dir="${tempdir}"/>
+								<mkdir dir="${tempdir}/wso2iot-${project.version}/repository/components"/>
+								<mkdir dir="${tempdir}/wso2iot-${project.version}/repository/deployment/server"/>
+								<mkdir dir="${tempdir}/wso2iot-${project.version}/repository/deployment/server/webapps"/>
+								<unzip dest="${tempdir}">
+									<fileset dir="target">
+										<include name="wso2iot-${project.version}.zip"/>
+									</fileset>
+								</unzip>
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components"
+									  overwrite="true">
+									<fileset
+											dir="${tempdir}/wso2iot-${project.version}/repository/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" />
+									</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" />-->
 
-                                <concat destfile="target/wso2carbon-core-${carbon.kernel.version}/repository/log4j.properties">
-                                    og4j.logger.net.sf.ehcache=ERROR
-                                </concat>
+								<concat destfile="target/wso2carbon-core-${carbon.kernel.version}/repository/log4j.properties">
+									og4j.logger.net.sf.ehcache=ERROR
+								</concat>
 
-                                <delete file="target/wso2iot-${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"/>
+								<delete file="target/wso2iot-${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"/>
 
-                                <!--Make samples directory for distribution-->
-                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples"/>
+								<!--Make samples directory for distribution-->
+								<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples"/>
 
-                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/sketches"/>
+								<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/sketches"/>
 
-                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/scripts"/>
+								<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/scripts"/>
 
-                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/statistics"/>
+								<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/statistics"/>
 
-                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/lib"/>
+								<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/lib"/>
 
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps"
-                                      overwrite="true">
-                                    <fileset dir="src/repository/jaggeryapps"/>
-                                </copy>
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps"
+									  overwrite="true">
+									<fileset dir="src/repository/jaggeryapps"/>
+								</copy>
 
-                                <!--Copy samples to distribution-->
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/samples"
-                                      overwrite="true">
-                                    <fileset dir="../samples">
-                                        <exclude name="**/*.iml"/>
-                                        <exclude name="**/.DS_Store"/>
-                                        <exclude name="**/target/"/>
-                                    </fileset>
-                                </copy>
+								<!--Copy samples to distribution-->
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/samples"
+									  overwrite="true">
+									<fileset dir="../samples">
+										<exclude name="**/*.iml"/>
+										<exclude name="**/.DS_Store"/>
+										<exclude name="**/target/"/>
+									</fileset>
+								</copy>
 
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/sketches"
-                                      overwrite="true">
-                                    <fileset dir="src/sketches"/>
-                                </copy>
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/sketches"
+									  overwrite="true">
+									<fileset dir="src/sketches"/>
+								</copy>
 
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/scripts"
-                                      overwrite="true">
-                                    <fileset dir="src/scripts"/>
-                                </copy>
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/scripts"
+									  overwrite="true">
+									<fileset dir="src/scripts"/>
+								</copy>
 
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/statistics"
-                                      overwrite="true">
-                                    <fileset dir="src/statistics"/>
-                                </copy>
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/statistics"
+									  overwrite="true">
+									<fileset dir="src/statistics"/>
+								</copy>
 
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/lib">
-                                    <fileset dir="src/lib"/>
-                                </copy>
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/lib">
+									<fileset dir="src/lib"/>
+								</copy>
 
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources"
-                                      overwrite="true">
-                                    <fileset dir="src/repository/conf/datasources"/>
-                                    <!-- Copy master-datasources.xml and cdm-datasources.xml to target -->
-                                </copy>
-                                <!--<copy todir="target/wso2carbon-core-${carbon.kernel.version}/modules" overwrite="true">
-                                    <fileset dir="src/repository/modules"></fileset>
-                                </copy>
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps" overwrite="true">
-                                    <fileset dir="../apps"></fileset>
-                                </copy>
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources"
+									  overwrite="true">
+									<fileset dir="src/repository/conf/datasources"/>
+									<!-- Copy master-datasources.xml and cdm-datasources.xml to target -->
+								</copy>
+								<!--<copy todir="target/wso2carbon-core-${carbon.kernel.version}/modules" overwrite="true">
+									<fileset dir="src/repository/modules"></fileset>
+								</copy>
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps" overwrite="true">
+									<fileset dir="../apps"></fileset>
+								</copy>
 
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins" overwrite="true">
-                                    <fileset dir="src/repository/components/patches/apimgt"></fileset>
-                                </copy>-->
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins" overwrite="true">
+									<fileset dir="src/repository/components/patches/apimgt"></fileset>
+								</copy>-->
 
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
 
-                    <!--Install default samples-->
-                    <execution>
-                        <id>install_samples</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/conf/iot"/>
+					<!--Install default samples-->
+					<execution>
+						<id>install_samples</id>
+						<phase>package</phase>
+						<configuration>
+							<tasks>
+								<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/conf/iot"/>
 
-                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot"
-                                      overwrite="true">
-                                    <fileset
-                                            file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot-config.xml"/>
-                                </copy>
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot"
+									  overwrite="true">
+									<fileset
+											file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot-config.xml"/>
+								</copy>
 
-                                <subant target="deploy">
-                                    <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino"
-                                             includes="build.xml"/>
-                                </subant>
-                                <subant target="deploy">
-                                    <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi"
-                                             includes="build.xml"/>
-                                </subant>
-                                <copy todir="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/"
-                                      overwrite="true">
-                                    <fileset
-                                            file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot/iot-config.xml"/>
-                                </copy>
-                                <move file="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml"
-                                      toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml.disable"/>
-                                <move file="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml"
-                                      toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml.disable"/>
-                                <move file="target/wso2carbon-core-${carbon.kernel.version}/samples/sample_pom.xml"
-                                      toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/pom.xml"
-                                      overwrite="true"/>
-                            </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 file="target/wso2iot-${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>
-                </executions>
-            </plugin>
+								<subant target="deploy">
+									<fileset
+											dir="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino"
+											includes="build.xml"/>
+								</subant>
+								<subant target="deploy">
+									<fileset
+											dir="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi"
+											includes="build.xml"/>
+								</subant>
+								<copy todir="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/"
+									  overwrite="true">
+									<fileset
+											file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot/iot-config.xml"/>
+								</copy>
+								<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml"
+									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml.disable"/>
+								<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml"
+									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml.disable"/>
+								<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/sample_pom.xml"
+									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/pom.xml"
+									  overwrite="true"/>
+							</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 file="target/wso2iot-${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>
+				</executions>
+			</plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <!--<version>2.5.2</version>-->
-                <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>attached</goal>
-                        </goals>
-                        <configuration>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <filters>
-                                <filter>${basedir}/src/assembly/filter.properties</filter>
-                            </filters>
-                            <descriptors>
-                                <descriptor>${basedir}/src/assembly/dist.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<!--<version>2.5.2</version>-->
+				<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>attached</goal>
+						</goals>
+						<configuration>
+							<appendAssemblyId>false</appendAssemblyId>
+							<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>attached</goal>
-                        </goals>
-                        <configuration>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <filters>
-                                <filter>${basedir}/src/assembly/filter.properties</filter>
-                            </filters>
-                            <descriptors>
-                                <descriptor>${basedir}/src/assembly/bin.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+					<execution>
+						<id>2-dist</id>
+						<phase>package</phase>
+						<goals>
+							<goal>attached</goal>
+						</goals>
+						<configuration>
+							<appendAssemblyId>false</appendAssemblyId>
+							<filters>
+								<filter>${basedir}/src/assembly/filter.properties</filter>
+							</filters>
+							<descriptors>
+								<descriptor>${basedir}/src/assembly/bin.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 
-            <!--   <plugin>
-                   <groupId>org.apache.maven.plugins</groupId>
-                   <artifactId>maven-clean-plugin</artifactId>
-                   <executions>
-                       <execution>
-                           <id>auto-clean</id>
-                           <phase>initialize</phase>
-                           <goals>
-                               <goal>clean</goal>
-                           </goals>
-                       </execution>
-                   </executions>
-               </plugin>-->
-        </plugins>
-    </build>
+			<plugin>
+				   <groupId>org.apache.maven.plugins</groupId>
+				   <artifactId>maven-clean-plugin</artifactId>
+				   <executions>
+					   <execution>
+						   <id>auto-clean</id>
+						   <phase>initialize</phase>
+						   <goals>
+							   <goal>clean</goal>
+						   </goals>
+					   </execution>
+				   </executions>
+			   </plugin>
+		</plugins>
+	</build>
 
 </project>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index eb780e71..9d9b6232 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -278,14 +278,20 @@
 
 
         <!-- Copying Mobile plugin management related dbscripts -->
+        <!--<fileSet>-->
+            <!--<directory>-->
+                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.mobile.device.mgt.version}/dbscripts/cdm/plugins-->
+            <!--</directory>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/cdm/plugins</outputDirectory>-->
+            <!--<includes>-->
+                <!--<include>*/**</include>-->
+            <!--</includes>-->
+        <!--</fileSet>-->
         <fileSet>
-            <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.mobile.device.mgt.version}/dbscripts/cdm/plugins
-            </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/cdm/plugins</outputDirectory>
-            <includes>
-                <include>*/**</include>
-            </includes>
+            <directory>src/statistics/carbonapps/</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps
+            </outputDirectory>
+            <fileMode>755</fileMode>
         </fileSet>
 
         <!-- Copying MDM Jaggery app -->
@@ -885,7 +891,9 @@
 
 
         <file>
-            <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml</source>
+            <!--Added Server Roles-->
+            <!--<source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml</source>-->
+            <source>src/repository/conf/carbon.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
         </file>
@@ -1081,7 +1089,9 @@
 
         <!-- ************* Data bridge related files ********** -->
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge/data-bridge-config.xml</source>
+            <!--<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge/data-bridge-config.xml</source>-->
+            <!--STORE-1101-->
+            <source>src/repository/conf/data-bridge/data-bridge-config.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
@@ -1120,6 +1130,17 @@
             <fileMode>755</fileMode>
         </file>
 
+        <!-- Analytics REST APIs WebApp -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/analytics.war
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
+            <!--commented since this tag causes issues in maven assembly plugin when copying zip formats-->
+            <!--filtered>true</filtered-->
+            <fileMode>644</fileMode>
+        </file>
+
 
 
 
diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties
index 9b5c9e59..c01b40bd 100644
--- a/modules/distribution/src/assembly/filter.properties
+++ b/modules/distribution/src/assembly/filter.properties
@@ -1,7 +1,9 @@
 product.name=WSO2 IoT Server
 product.version=1.0.0-SNAPSHOT
-product.key=DC
+product.key=IOT
 hotdeployment=true
 hotupdate=true
-carbon.version=4.4.0
-default.server.role=DeviceCloud
+carbon.version=4.4.1
+default.server.role=IoTServer
+cep.server.role=ComplexEventProcessor
+das.server.role=DataAnalyticsServer
diff --git a/modules/distribution/src/repository/conf/carbon.xml b/modules/distribution/src/repository/conf/carbon.xml
new file mode 100644
index 00000000..59af020b
--- /dev/null
+++ b/modules/distribution/src/repository/conf/carbon.xml
@@ -0,0 +1,685 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+  ~ Copyright 2005-2011 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.
+  -->
+
+<!--
+    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>www.wso2.org</HostName-->
+
+	<!--
+	Host name to be used for the Carbon management console
+	-->
+	<!--MgtHostName>mgt.wso2.org</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>${das.server.role}</Role>
+		<Role>${cep.server.role}</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>
diff --git a/modules/distribution/src/repository/conf/data-bridge/data-bridge-config.xml b/modules/distribution/src/repository/conf/data-bridge/data-bridge-config.xml
new file mode 100644
index 00000000..067101f7
--- /dev/null
+++ b/modules/distribution/src/repository/conf/data-bridge/data-bridge-config.xml
@@ -0,0 +1,72 @@
+<!--
+  ~ Copyright 2005-2011 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.
+  -->
+
+<dataBridgeConfiguration>
+
+	<workerThreads>10</workerThreads>
+	<eventBufferCapacity>10000</eventBufferCapacity>
+	<clientTimeoutMin>30</clientTimeoutMin>
+
+	<dataReceiver name="Thrift">
+		<config name="tcpPort">7611</config>
+		<config name="sslPort">7711</config>
+	</dataReceiver>
+
+	<dataReceiver name="Binary">
+		<config name="tcpPort">9611</config>
+		<config name="sslPort">9711</config>
+		<config name="sslReceiverThreadPoolSize">100</config>
+		<config name="tcpReceiverThreadPoolSize">100</config>
+	</dataReceiver>
+
+	<!--<streamDefinitions>
+		<streamDefinition>
+			{
+			 'name':'org.wso2.esb.MediatorStatistics',
+			 'version':'1.3.0',
+			 'nickName': 'Stock Quote Information',
+			 'description': 'Some Desc',
+			 'metaData':[
+			 {'name':'ipAdd','type':'STRING'}
+			 ],
+			 'payloadData':[
+			 {'name':'symbol','type':'STRING'},
+			 {'name':'price','type':'DOUBLE'},
+			 {'name':'volume','type':'INT'},
+			 {'name':'max','type':'DOUBLE'},
+			 {'name':'min','type':'Double'}
+			 ]
+			}
+		</streamDefinition>
+		<streamDefinition domainName="wso2">
+			{
+			 'name':'org.wso2.esb.MediatorStatistics',
+			 'version':'1.3.4',
+			 'nickName': 'Stock Quote Information',
+			 'description': 'Some Other Desc',
+			 'metaData':[
+			 {'name':'ipAdd','type':'STRING'}
+			 ],
+			 'payloadData':[
+			 {'name':'symbol','type':'STRING'},
+			 {'name':'price','type':'DOUBLE'},
+			 {'name':'volume','type':'INT'}
+			 ]
+			}
+		</streamDefinition>
+	</streamDefinitions>-->
+
+</dataBridgeConfiguration>
\ No newline at end of file
diff --git a/modules/distribution/src/statistics/IOT_Sensor_Analytics.car b/modules/distribution/src/statistics/IOT_Sensor_Analytics.car
deleted file mode 100644
index 311489daf1dc2aa24ab727f01c0d7466d6bd2a0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8596
zcmb_g2{e@b7am*oB}>_g$WoTZmh4NiZ`t>;O?JcB6|#rW7qZJ*AzP%skdQ2q6xq{i
z`IIG!tp9nNeBPO+^qupWGiS~mXP)2h-uv9=z4y`8ARwfNkf2_cv2-dB&>tm)24aKs
zb~<Nc=j|ov@8)V~LIFY63>Y4F>o@#@M-OSds-@8?PZQPKQ(-b`RUl5SroKqfz@Xo2
zGo}gm6shmlj{UYW{<4;r!z$J*lls*Z+`qJ~{dLc^qje9(#w;wukJRS*Z5XvaS@R4g
zkGpY8x8LoVvol%J>=?`AP-lO#*=t9icnf%vUA<rb!I@|xV&%DH+Xc6?Rs^Yx1%3y_
z*yQaJ4C$*)2lS85RVQ|4$%{$5#)uWuP-Q=-QPWk)yH3;oGBIfK*5!a~s>eCuy-DW{
zEQHt8vbC-!<hgDs?#m0|A~Qv<J6JKU@!gH*o$ri|%MiqqR4SC7nOaSTeXb_Z)gUHe
z<sZs=gUX5*J_MqR$`#r74B5glbH$Fz)fr#7yEhVU2Y2#?BVpcfHxD?{#@h!8hY1Nn
z1)(Q)(ig&yP9K1V&U_pe+Oa=C6I9ZN>3buP@EzEvKVUzlRcW_EX`(`Sn8K_(I>O%n
zRZNSpHate_vJQC`WmJ+(YfyAah`K|nd3cNbj1yOyS#!|UFT-kcNGn?@NVmt5KLI@i
zsl+ldeER82&OCiKR;1>${AT8*`oNI#q}IXUC_MGz&ER`mH!=o#C~VBm@jnQrj<`jx
z`JwoL27jTk8sehyZQYQ>*0RK;YtT6|&IaoQo*2eBKBp%hZ~+9OjZZqd&p??4)*0H3
z=*|+Z&gYHI-=L>Uxz2Wv;>=lXn(d&<nu2=A)^*bCPmkzpiVlsRVUbOJ#+3bn$jwQ`
zuW!SV>98!tM1xF2T3Bt(`am+nhlwl748fahhh(?;Vn0U<nMxdsUX`X<UT`T(`C3T{
zG4@&($5Y!d^^d7ozvk<Gu#5%ojKl#ppuFU?OjXD6AP_=EaCs4N^cbx`iYf>UrloLN
zN8jXo9ZMb#7y@sg4R%?9{WGAB|NQJv=z$H3n;xS7238REOQzUaGuSy;+gdMZX&Nn1
z8(q@9h<}BVfQN<!uZo2xe3e1I8)AIq;YET|Q4xd+=?qZIX&^_$B+E>L4Wg(v@JGFO
zNi2E}vnBZdfW$lU0#+9aL3De#B{Y+@Kxvfbzr|MinKuTg>JiQo8^}DNy+^B>bhW%~
ztI;W!xViD8&1BDIXW8&nk)qDF+&8+P6!a<=XIeB`H+_c><q0X;*bWxJnLOAjKWT>2
znIf5jpp=|k@BKJdJI!ABGl|Ia=^_X_V)V8wmrbQO-yO?^4Gqtj5keIw^&6M$)lFA!
z-tHPTw3JpH7**nY07QQ!?Ri2nD)Ir0=ucrqFY^b{e`kaq4#5DYgYHK<EYE7`v_dHw
zSB#bFUO;#vMzmRn+*qHTGPZgfui6t$d#^GiktMAEFMU_JrWIGedW3ikk$!FS%ICbs
zRQyJ&$7>oV<Pz5FdFog)s17bKCol`xMG{9hUKpQLRy-(#*F##=L1-^xntk5MHR{D9
zHT7Iiy6QVqYdmK!82!x`-F~t#?)eq%=F<GM<Mph}%@tBNUn><iFkXt7@sHQ6`+Ci_
zjloqjl(O&ceSt4y84}t?1bI$nh%cfJW;4A|_{V;jPKti1)uz;?zfw6w{RsV5<7;1R
zdgVK_5xr7Y^gy)j(>Yb1+qaLIQqaim!T9)B#tT%FGyOel(UZhL(q%adGuKcFuSK=$
zZolonj7hmeJ4yEfgz+~LZ03P2!TnfJ+<QU&)KwjxXv|M(z1rdOG|?d%F}BMO``#Uv
z_IJ+Lk!KcNbY_zm*i7OUP4g{193VfT<}eJq8--lxSDw<ih9K#F>S1FFNox+gKvW2!
zC1hdy$o|H0f1k|tv2LM=(~(@<ejn!QsHi5^N!L1xR-!*`mD(B@af&9w=h{-)D79WP
z<-8Y+mbgL7K>KAeim2;)!2iAk2q&cZ^>xc8saKe&T@dKA`1r_9bAiJl(w}QeyWwFq
zYpPzW&8PLhZ!JBQY`<NA(qZ25wA}aJO>Vrg$cw8h;YA|%sZKT=?prj{RyUU{n6++Q
z=a9TXCs`zr-RA>^nMGw%w{~Ur#Hl%HI5Y*?pZO-f9H!T_HQ_zK&2Z*hYuYKcNrDS*
zBxb93Uv~MA9lcm8F~Wv-cGc8BVSe`7(`iW)IYN3k>;gVeVoLRem!f+rF;EvwN&Q`|
zaqB5|t%d#=6Ni}Yl>NUIQ&KEC{xcE$Dq37hs`i8BhP^#hVNeR<h4mcU8B1NA!;de=
ztU-daQqR%fAv}4<F!`R}RqL9;tu;jH*NO*8oNe#JDy;QyD_p&o=lh`Sb+A;0Z{?t(
zjs0LQe5UFqnKoyDHY*3yjo{o%8<z+}6t45;MBVPQ6R)Z+E}UoWP!d|wn7(t0<DJdf
z!8$y%4vP}cLo+nyOPV$=7S{SNrumB|dd_Sqrid_<SR@R*r37lvvP7GegKF;y3{6#w
z!)$Mby?PRXbb$GJA%tO02yd7@+}Ftt?gdtX9bNrgJ7D<69o??u27THsQ2L;#3X`vb
zr>|c=_73l+sc3j*=d9i!`AJiA<S6CWm1|-d@wd`e@xPW$y*eMLJ<2LP9{0QyPs|wk
z7MA$<0r4H(%TIb9g>)V+cMsBGInE@I5)m_T@$1buSCqt5lb9o+`p6z}20goDEqM+H
z)eIwv{ufU`fzKdB&fxwz+elo(nA<^j3E$gY-nE(5fW*(J#Zfb?7f*%Jo2iqQEb_LD
zOdfuVBLkOd&bcMHQrNqEmd<GxQm4gzVZQb~2BxF|)GmT`Npg%7s#4q!pEdB--AxxW
zXAk9+>gNn#kK+n&Y`o#2rQtTK;yB7QON3OY3J9AlsEGDi)#GD1Kwms9;=540p3ALS
z4bPIknmcZiMhG*Nn9=!k^fmQM3Zo{^$&sg>Y3rsuhv!<x+dj$#idbX~X3F$#PnOWR
zA7tbZ3_3sKB+*2=?FZD7_x8A#7OIc6_kpGQ2-fqFZMT+4xQ!dQO2D|x4w{!I1+c{$
zd(`0F8|){!-WfCgk!x~RXyEH<&qQwS_%EcY;oMfA2ySf_6zAERm7vwyFT^l8@Vi>q
zPUxm(ziGJxfrbwhQrkoH2w4ugvVWMS>8sNC>P2z3pauU$9CFD*Dtb1ET894lx?%mc
zv-I)O{TpuS8jF3I?GA@tE0>oDwU#N_#RU2{vwj$q&Z?JY+P{>r`O!~rhDjqvhbtq-
zWsy){y0g!uA^Dw|bbG;uV4-q+%B;rLyha&a!g;wTt@lbQZZlVx00VT5kiyKC@2D<4
zoY=FMSYyhY&edNwKgmd2*<A8wrgiHqhh(0<WPw2T3oR%cTDNC=;yN8Qrkd`<QM&y|
zA>DktH~1BLfL0UY-?utM<L!YOpgkM4Q3JF$3_pLNYJukZ6aZ2AfP}ZJ*8lsXS$`&t
zO=eHs21<mj+rKM3Zso=<yvV;m#i89h9QbdwTONz*e0#GKmwL1P82k(qo}kp5UTJWd
zFJq3#=R>}{W<T{pmAiXaWdE|l2w&F(IU}8AZ@LKQY-;s|hiRG%MMLjhn)_y-F;1ks
z^_3~}%`Z=jP`yE<H5T5g$4b1M%*%1=%yi&o`NT_adqwLVKk~3TG^{R!@m!|!rSes$
zlCNB`RuPu8ye4nJpHx<55;;`tKxPidFWyI7Ahh|k7=E<r=4*JBs4#cj{6K7#IMDRd
z;@TZ~DDi%UA>gczm;$c8cP93daP%%M=<J1X-&uSsp=f=G|4YXOUx=oyH&aLGJ%9dT
z8FCJKavubThU(*!{YN!?E%q<gXUgTXR6Ub8YQNgp-q0P1=fOwuS;AwgDN}#yT)b~T
z@5j53%8!T&1S+T`UZ9^j9CR}~K5WKcIOl!&z-PapmE!BPCM2}!x<hIe=J#EquaMFB
zC*L}6P`UCHvPtO1e591}s;ZUOP?Y$?4??xljx`3?M=v5{jUC<pt{4dHtSG>roU`wf
ztK?xg!rQlj7x@WR&SY79?=hG92*rl1EGPXXOS0kErDjsYNzEy1jW$KACGJy9clb&f
zOBI{tN=k;lKP+M9e)R8Ac_znjB$TjnO^3?0zK0Fc#mf%q<l*fFG9fOZ7T47uN!#7u
zR1uiPV#N*claR8@?##Vt-(g!rgs}O_{+KpSeXdvRCHQ*AT~>~~dPOw~x-@o&ulR*k
zZyqFbiq<ZBE!+8xwaxDVf7Ky~uzy_>1PNivZ}U5OrOHQjI)|D{LfIt0neIkwpjUY~
z%65p5RWA!_unN)F`ukkif*G<*cAF&P7Tws)Ev|F^&#a0XWnV#6HbtoBo8CT!_HT$w
z_8Po{wfeBm9q^|TS+7@@X?^$dwy|vKNgE^79@RQT6w{TkVjg9~NPKBq_SF5{QO7q+
z5!!>c$dNvxab@y$E^l=QZ*3{yAHg*d(bR9cOIzdK*A&EMTMa|EC>w8$Rcxn@_HIYn
zY}gzXQ279X5r<I)m-&pi8{@rpPMG6nkC7wSS=<~0;6{}nLcg~00If2{*>(Kro_Yyn
z{~x{lMICW#Bz7Hn_CUg+i#sL#Z*@@`i=n^>fFm+&EnGnjYqLMtYM3BIj`9Q|S2kij
z>f_z1)MD9*jLjV+Y>zjKlGd?*oyatj^ncRaINx~w&ZcHglN<NJ@UYX>#O~oS)CY6O
z+)v+=QY=k>WHEN>#=^xU!)H9*CxnNK6c-#|_+44Y!|^sPvW_T_Q)aoAzZY9Oo>TSO
ziD1nT(&K+fLK5+Xi>hh1@m{E{<!tqh+7w%^G<x%6J>M+>X-(LdBvePXW2m16mWd>Y
zJ6<(}fj%4wScdv=cP|9$<9oyI%&LIl8vVm*iZ_@*WI}0zrz%c;JC;6lb<RmojU%Iy
zq%4#yOY6KMRoz`xYtB)pCn2!WLZ*=s(aF%I@u~GWscn)2y;_usyoOw>mo0+QY2~eA
zgWBdD>@}J~wv^?a9<SU!!0J$V`pf~Z6C@I)QkE&sbD>NMEzDW%VUxUCwHzwt5#Lho
zIQu|7&z_jR>D9}}B^;ky<rHauhoHw-tc8rNl(u*=-+qnVvrRPI?J$pviEtg=h7!3|
zpvpVZP8IiJF38n$vu}-af(70tA1Ix6Xt?}2OgXcjmwe`AT*oT2G$Q@Xk@$yeFZjEI
z2`CZn1>2oVr(dLvJni@3$BPnMt~vdZW5WGpRP<_Y7qKfN&1NbQG9!IV_T!<D204jG
zbSeQEJ{?CNk$z!m{t{ko-FyGlvy{9CT1jGy=BC3XA=Wo9HcT#C3Qn|WQjaAxiZsOX
zB{N41xAB+`YXzQni5fp^VpnXF+ZDY}j88iwO>#ymD$wWgMC#;ny!wshj!3uSq|zC0
z=Of~aBOR=XWp19_k!~$q9>m_+_X*vsw*u0tEULFv`x?Bg=8I0%RL(wKwi_atIJSN3
z{$gatCV6r&`{Kyq@Ouf$(16B=b6qEjUiW$NogHqsla17AN9@<!ib*dDCw@l+s6+Ss
z_`V60I`|L*(=#4E1ImouG3UWnG$n)rMYivM@`a(m=T6`Ju<A+vvFgz<zw)hjVLmDF
zqYmENrbHtHE;jgrfQJn>Q;%U>Fz^qMK~EO+5rCr&zC5<QN(wq+Q-PcSva6VeCM1v@
zdHfv&_?DXrieQL8Nd)E*yKXJmAr%GPvM@CL-yDG<&Dc3Xp9W0CU`LW4<1{%Gi}s3R
zhc{@!L7xH)#^B-t?k3oRlfgJehG_3o_V7B<#{ym_xLQB^dtkQSK`ofyVSnX`03-n9
z6L9;$(E$Dr*lps*h-Pyy*q?X`SU})wWAhY@zp0Qy0^;eO_s7LB;QnBS31QrS=8y4l
z&}%moG`#>H3T)1R`=v1SGU*-_z{M@Vl>%1-aCyL<fdWP}f1z~iw@KP-Vc4Pdj^_g|
z)X$~_m|vEtFF%g{^`?qu7+_I=V*<JoychFg#8k33@J}4u?MSqcV{;6A!lr^2)z2LJ
zT@1Kb2E+hnnFvM<1^?m%96Z|%2hB5JX9n+(d>DtRQtw#_TucKtXmC}4brifjsbd_X
zN3-W4dvOh8IYl!ASWdx|`*}?RQ|`fj2(FPB5VD=64IB_K>Vww_R*ZnQafAItEnwOQ
zUlE&HVAM^8AUY7WaE$LiKY7s=2JQ-`6A#8++xI}lL80AiqYnVq3-BP$hH-#3J<iNx
x(`IMc0B0GP<H2K@AO^5515V)IPW5PN08_oL1`+CU1A#E3Uhhz9nt2fT_J7gL-HreN

diff --git a/modules/distribution/src/statistics/IOT_Sensor_Analytics.tbox b/modules/distribution/src/statistics/bamtoolbox/IOT_Sensor_Analytics.tbox
similarity index 100%
rename from modules/distribution/src/statistics/IOT_Sensor_Analytics.tbox
rename to modules/distribution/src/statistics/bamtoolbox/IOT_Sensor_Analytics.tbox
diff --git a/modules/distribution/src/statistics/carbonapps/Temperature_Sensor.car b/modules/distribution/src/statistics/carbonapps/Temperature_Sensor.car
new file mode 100644
index 0000000000000000000000000000000000000000..88eab641ab8ed79ae9fa2785bf515089ac9d3e04
GIT binary patch
literal 8525
zcmb_h2{e@b7oI`(Wnv^0m3__DVr`~S*6i7b7+WOEXW#cNWRH-ovV|0tr8In@kV;e-
zMIn)`$e{ncr0<>i6yG_2&YZ)UGtd3qd!OI)-usM}8YvkZLW%!1i(xtm0sYWHU=T}J
zcY7O4D|a_hFDFNRLs|$uKh!|b>81WxC>+v|q@jjEz#_UjDhxlG7aU<wQJo>JXV&eq
z>{my-NY*{ojQPGW@T!LYfO(8t7Q^5u+N-qX@lZz^_q~UQ`c2J3_t)fkE*oH;EV%^G
z#9q6h_0s8?g9CN)L_hoA!46*36KUK}+(lfdlkV4jaM*zjTX-(h;^(AoPMW^Ez;o9j
zPJ~swKD^qfN0)o5I-%_f;*gwU^r2!HefD#hiq^@zT-f7R3H~2%#Cd1a|D6-smF%l$
zDzT)Jt&tm_=eT;DJTH)k+Q=1WYrcC)=*~s{FKscgnW9h`#X`C9(Zv+hY&EHt8U^JZ
z;l3;H@Ktdmfk3qIwW40Dke%OQf?Dmv*GkC)ecs&_ZH2b?K)a&c(M}i8u9oh9xuQ|x
zqGF<A2Z8cI1fT}}d{6_Rd;r>d<zvx=l^56sny8{KO4r@l6%D}N!^3t8uXklKqe>Ga
z28#&fV-2xrZ4DW@RLtmXp)bIA4hMM_VNjC7s8<vv&d@5`^m>&>$(|>}xXC~1>uZ%M
zSM#&7kf#^syhz~?S4DR0>l2-?xbk#4_qeJ*%Wq<vtMduGnT+WTh=8gVuLRVtUd!z1
zptUr%5pE1%2)jX}{-Jo6nsDJ673ZKcWm<s=nDT_=G_fgau6m1jzUbYtLiSHCphcXW
zTZH5yyY-aWQEkCbou6KjsLtn)$zO&urRH+h(kf|d!hZNy-Y%%K!{Dg0C!687i}nsE
zu`8rMW6gfC!^!@nXZNxlD~AFtwqCwIBc$dwt|x{012$2aIbelzufh+ZnAu2iBWZ!i
zMLF2~^ttlXZ<TbAGj8)opeoBoUeOh}G!J){a(1Ya^e#@Iy)=xhRf13mglspsy><SC
z?WMvu1clN-o;a;*xYkEwL8t-n+UVmtD~LY^^zqlnwnGnM*v;u7^<Q8`QNLx1l?Ahv
zt;Jc3X$^IQX$FHRtss)b-K2alc4!qlEOe0>@f31q|HB~CqY+_b$ji)PW@A8&C@AMy
zd+Vj}*T4(^`iI0)HiRS=-Uf*`<Yhx$03OqduJhO_zKQyg7)<fY_n1mglLqfoI%E?R
zdh$;gYZ*@^C*5pWZLq&e(bVwS@?%GwgF<M!WKmno)puHxNS(@=@keTy6_3|@^Tdx^
zp6x9_vtHOoH>n=XWaP@~FGk13Gvaw*vCa5}7po*fNXwb5HCkuYY~DzgYgphas_*r<
zF`3x$kGc(W)~ZGe*UQ@9>YK?O?|G}p)d*ytnDIP51)q5jLH1fG2?9Zo-$wRpjL_Lc
zFu>(tsKBj>t(kV6X0sUV^Bi-UujAF@{B6-BGW^f9xpEskZ3P1C8mRiQ)#A$S@7i&h
zm$N55v6hT97Bd3$vzh~{&~Dz*Vf#c*TzVG8J@z_|T~YJ&yW|#P>_}*5y|ZxKl&sI5
z#qCqtf1)w57M<A1;+An##ZK7qtWCV>F{TeE%O9xTKSOo;4Vzry4I!?>?$RD1sK92p
zV!51jGS!8^HrjiguN)^z8(5iW^3`-rCY0_;pB`i*x$dXukx5fNeNvKn>?>Bi;Drzh
zN0BU<bwK!Z;q(%_Q!VbgVy(35XYvp#XMJ+#8=p!PF1c2E(I}aD*UFRUhPwFpqkr_R
ztT8V6{od&B_<GmiZ|d(wc<)Bd-2h$uPYV1pj*z^(TR{<ADl7a$vDIZme!Db75wOTW
zwdk|+54(ps<h&g6Pb1i*W*j&XA}h(fQW+kl9Nq}5itTIEoe0<Im&&7RY0i{SJ1<xo
zK{A?r{B{&V7|GZ<Kks{Ix3gP5xBsbl*okl+Ue6Cx_vq=dII5-AqJ_xG)zY(i23%4J
z=&6=;PCAWOtT`j1k<!-~nHj&%MC@qK^}hSnTOvNgv-_z+vTB8)il0cg>E~uE_2~n)
z;a)tWn)MH>_oVA!EGKcFZp?McJT5E1%P{{y#?=w`2TuGku0e|np+%DS=?~X)bk7)Q
zs+!0YOjuxW2V|}>$rOoXcmE}ZGLFb%z_e#|#H!e<**@^GR{DNqK1AoiD%SnW4`!wB
zn2e*GA4&b3D2*5IylVIA=ME~Be!~gXUNrKG|1y!*IVNLxj0}!O`H=wEicWR<mDH9(
z4D^LiQUBEI&E=H1*W%m8B+^oF+yB2>N<~D+UjxDKvLzN$Ydj-WF03<BzpH~jM2wbV
z8kci++)V2<$KP?$OOSvo={E3NWQT9*r__2TS={bjU2-n{R?(Qu)iM%NVWC@wOsdWE
zXe=KJkgf2j>^*L2-Fp>1UUi*XlgnFk&jHqJ0av4zqsRi0x%@d1W!+Xss;Y|%zwBvM
z6rWQYyLI%yu%&kIJ*aW3X^G3;ahS=Ry5%`j3*8rE!bR8)rPbr9lFTKh@jdV9fZnsu
zF<!~RUvDgdq&^~=v5;HcNoQAEl&71s1j^po9c7L7u(v|HfmL8bR)HZb3|}DN;XROo
zJpD)v9@I50lr}K%ELps$c}OgljIz{R#f-Dh+DYXt6u00Zv_EuAZmg-&1ck*dH6Hf0
zbB8Hak~-Z@!b~4#3xl?rii;k>OsA@!pTaye6l4`i39~c|raE~yA!+ZaETbaJvXM+@
zRgLl!LjgkyDaAUYLo5mwhqNw9l+E+LVgHN81<ge+n-dx>93^rTQT(py4vbFAPjLF-
zT@6LG)>NC0aY;c4pL1JWnS=z2m%p)po+qr4CGi92KK`i%AG@*`omM_Ww>JM_c@`&X
zGQ;~izEo^2Ia<y<w|EPanwkdaYVMQ4QDj-oFNLL8^v)dA+WVsOxQOvbneZJwdP9dq
zo>KM29C=;%hNQDqB3r)TuF*^CnKSgqV!q2(?C(97e(Rijwdr!jk*v-@+n%LK+4|0<
zF_`SfmFU;jGJ)I!4gtd17nviMZ3F|>E^=y`m6j&{BHQlxlU8&5(@a;ir4zVKpmF);
zrsMK?B4Y4uiAA8+zzQ?^a|WNxXuuE4aOGp`!}8cps^WY(q}~p0gCz(e5TPW1bfS*)
zMhsHjoUDMIV#UwO@=0#ztx-6e=wXOhXip)7HAIJuoyBn<dIHv6rS{E@R=eO4$%|Om
zIaArlQhx?{xDHOgZq-3fuyp6L)n&Dr?ySeQdxw;jdotb`<X0)m<EP`<a~z#!Ik%&{
z9|wGsWnGCYYQE0c(JUGmB9Jq3Uf8_dUnFN(`zDQ1!QbsYJcqs&eF>W!?3$f+>N#_h
z%}rlP8?Iz;74m##GA)n4o&NnGLt5uJZ(rrH{A2@7WfPg}Sr!<Vo!QR>vb%vdG7gGh
zFp=-tCor*Xc50*RvfYfl{Psszz|ZknMO>JC@hHswf^T`MM}sEB)6M-DN&a;8G%R-o
zfLN1lllryws0GzUBEO|<105ok?LV}AbKNFxyTtZEiG&->fd8*>KeZqn0|mFFCb4p_
zovm_x=F^XVf>&<1V(+|A=9I{%cBSBq8=ON{8t2=?U(O@n2(@Erb~BlEU6w2;Nw4;M
zn4vx$-q(6(XzVY$xG&T$bvXvI+NtVD?iV4vQ%#op<4Ju~;X6$=#(d%s2~qF6r0VQG
z^X;*f`!OBD7sup5@1aVMs9dl(DIsH)hDZ_CEw3_+=xej3HnAsZBc~`3Z_B;s!+L1}
zUf-Us{I}j}gR#UnazMRJE4>Hv@yb0&px%N+E0oHXmB7olC?MaWc=;CnDc_?1TBAiB
z+?>w?J1?LOr|>U8#V;l{#o%`Zyc3~I>n4hn_hGVDg6){pkPEXh#hlMfif7)59pDym
zjOFm44-WhCV^NX;8kBk~%ndR6;6u5Kr2QT>jdFqFOX@Ye6^oy!=1$d)un(8)&S;Om
z;$D#|5LnZ2eKGc-PSqz$4UKV)4u22IaY*p>By}~m&OxIgwbpCYW^WivM=~+u{ZI~n
zC->SIxsR<2GUf~|0S#vFBokn9-BYKP$gtl}j~NHT6SNO|488q)03N0L$*dGtq3dHR
zpB>tg;L#rod2qN+DL7g~VFrE~X0&_pvGrvyC{Sdc@%Qh60uK;Oz&D7B%!Dtp?gdNN
zb8c3y_7~jUKvD`k^rS!=>-uV0N(8WHa{vPUtj8nC{6r$s&keHy8l8HJlnz+}&nziq
zwBktg3^|7rf)}M)IP6$B)#(Dqp7WhK4au1KG(*A<8HqaFcq{x08gcx(!qJh8t0!W4
zK26y8-VDVgtWa{LNPMg7n5pf#ZGWBeg~XBfa|?(lnWoU&pTsc9F9nM)PRH0vVTY$b
z4i|FA$zntt>}wN8bq>gu`8nr}vboiV4X&8*<fzn{U9QNGM%w^l`CWil@YvuNF}RX6
zVtL8J{^UY;1eQtWZIpnWn(Y0A!;ZhahJ|j^+q4HcBjhU%9=vu{WHR6o8b9L}YKLQg
z9Q4Gl&$wk*Qmp*UDajWbUa8(gQ3TaVM??m3uL{ex^m+ntuR??JKgTivJ>(qBq7v9r
zD}fgL(#qd7b8~?tZYF{1Zh}Olir~Kfe^s%7h-I9cvy4~@1@R;k_(?SV&L;Xt`)J9B
zWKSb~JYQr{M2L$k1U;R5ZebfmdkQ%`XkKGY;k)vn=7Eeq-@#+euUnoq<-HCqv>3*O
z+fpp7-j{u(LKAM<A63&D#PpX1<E)U0N3r#y35q^NT0a!JVtS>+$y};c-SmUV5}SGD
zkT<Cf9fHQ_<i*b9DSOps!$I}XyhJVr8~@&yjU{FmwI&VJV%H2Lvp07cQ}GwGjX?c^
zh%y%2JYzkONvMlH@8;}^(p|f`8>8wt{;rK}h+J~h`2s-Xp6JH;Ih=7k;aj42T#<<_
zPvh#NP6PS<k?M7650z_Pq}8HMyb(4Qn9K~V3iNFZ{Ooen_nd<l(kU!S*VTI`3}IB9
zo!F&&%hL1MO{(2bKE(H`zE5$tYZab-WH@`jI$z=v#m#V5XE9agf*WSHlk%n7|4Q9e
zPRAGeDLm40q$8HwhN{xqKbOU2hEllEjHmJ;i}rrZHKmS8^WhK^diG2kwG6ig{n=CD
z%Q;2f%3Z?PSACHbNi0uhgFl`@XI8sjT2>vU67f~mX?E1*9$6-D^!`D29e3^BecT(;
zIE_7btsGU3OxziUajJi1XQyvoEqXX0m~fe)4w^d^bn8)-pH>CqR~PGWn#T5Oo*5Gn
zAJnlbNrXbpcZ}-;)W_%Z5wg<Va{K8VXxax}l<wMPS^48Tbaz?REis9y6QOD8C$ar|
z+`Q81S?_)iJ#yo2m2K$rw^vNbk<UtN$0a)Y?%~*z{GOLcYg2U@Pnz_3<o4|@cyM6w
zibDQ{S?!V&E?sw$+DuBj=exM6hj6$fG<-ko&QFZlFRzKTm0!S@9Q*}GkpiPHl!O`Y
zq;5FtU>}(df_H+~e-MSiz#kjb|LL<+{_@$^VSZ;i{{u6L6vhYM+GC{rWkG`v2pG^{
zCscsofIizm20bAtf7#LC!xMX>RG<(mNE&>_eu<vGAthu(;r;{xKIIDXI2d9(g&+*^
zkJSpcH>E(QEDXN<UqTS5D{)QMqXCvF*iIBCh<1!@>xORdW?e7VqW}gfxVeBe2{zE=
z38Kj3*R-vwwf6q+jmq_~fKdtV7V%dkdqH6*kyYeB!~V|E07$U$Z3#FVz`X%`MZ6%`
z!r<ktU<r7-Vc>v|P0Uj;{t7Y$f2dzPT`S9<&c7MMfb)YHCQfkvv2EiM(TgyZb$S6V
z64+V+-<QJRSgI{LK+LTTPYK)&z@q^#{78aq67jnA$0FfJ{%trm>qGz?8*rnD`NaVW
zJ&82KOXJVbzg;vb*LDct>o{;qz?uo(YWYC8g~7#J;u0`yW77m5oS0$Y04qo}`hPR*
z4;gGmF(3ml#UuzaxVrrSL>wbbW}Rce!V6vi1qos)GHlfaVv=pFzu=Alt0Z{;Q6Y$-
z3EL_Lo@Lu#EZ0c^ESBJ&{d>^@KYFWoLN;H!)|m^eUEq9xIUT$U>><c!eseGaT5XK#
z;3E>#3XHmf^kf3jYLi{y-_P9j{sLzOa|uk=!r-PYP>Bdcc<l86z-|DZp*abPVGQ52
zvc#;}*c8B321ao3Kqf{2tj@eC@D>9(C1hhD*HYVof7C!AZ1`U+UP%pEfdBpnGWlG^

literal 0
HcmV?d00001

diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index b9c940df..e123bddb 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -99,9 +99,7 @@
                             <publishArtifactRepository>true</publishArtifactRepository>
 
                             <featureArtifacts>
-                                <!--<featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.ndatasource.feature:${carbon.platform.version}
-                                </featureArtifactDef>-->
+
 
                                 <!--Device Cloud Features -->
                                 <featureArtifactDef>
@@ -128,6 +126,15 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.webapp.authenticator.framework.server.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.server.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.server.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.server.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
                                 <!-- End of Device Management Features -->
 
                                 <!-- Jaggery Features -->
@@ -163,10 +170,6 @@
                                 </featureArtifactDef>
                                 <!-- End of Carbon Deployment Features -->
 
-
-                                <!-- Carbon Utils Features -->
-                                <!-- End of Carbon Utils Features -->
-
                                 <!-- Carbon Commons Features -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.databridge.datapublisher.feature:${carbon.commons.version}
@@ -183,11 +186,7 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.ntask.core.feature:${carbon.commons.version}
                                 </featureArtifactDef>
-                                <!-- TODO: Verify this feature is needed -->
-                                <!--<featureArtifactDef>-->
-                                    <!--org.wso2.carbon.commons:org.wso2.carbon.user.mgt.feature:${carbon.commons.version}-->
-                                <!--</featureArtifactDef>-->
-                                <!-- End of Carbon Commons Features -->
+
 
                                 <!-- Multitenancy Features -->
                                 <featureArtifactDef>
@@ -258,11 +257,9 @@
                                 <!--<featureArtifactDef>-->
                                     <!--org.wso2.carbon:org.wso2.carbon.identity.user.profile.server.feature:${carbon.identity.version}-->
                                 <!--</featureArtifactDef>-->
-                                <!-- TODO: Verify this feature is needed -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.feature:${carbon.identity.version}
                                 </featureArtifactDef>
-                                <!-- TODO: Verify this feature is needed -->
                                 <feaureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.sso.saml.feature:${carbon.identity.version}
                                 </feaureArtifactDef>
@@ -279,7 +276,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.mgt.feature:${carbon.identity.version}
                                 </featureArtifactDef>
-                                <!-- TODO: Verify this feature is needed -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.application.mgt.feature:${carbon.identity.version}
                                 </featureArtifactDef>
@@ -287,7 +283,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.directory.service.mgr.feature:${carbon.identity.version}
                                 </featureArtifactDef>
-                                <!-- TODO: Verify this feature is needed -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.claim.mgt.server.feature:${carbon.identity.version}
                                 </featureArtifactDef>
@@ -409,20 +404,6 @@
 								</featureArtifactDef>
 								<featureArtifactDef>org.jaggeryjs.modules:markdown.feature:${markdown.feature.version}
 								</featureArtifactDef>
-								<!-- **************************************************** -->
-								<!-- Version differences with the ES POM -->
-								<!-- **************************************************** -->
-								<!-- <jaggery.feature.version>0.10.2</jaggery.feature.version> -->
-								<!-- <sso.feature.version>1.3.2</sso.feature.version> -->
-								<!-- <carbon.feature.version>1.3.2</carbon.feature.version> -->
-								<!-- <process.feature.version>1.3.2</process.feature.version> -->
-								<!-- <uuid.feature.version>1.3.2</uuid.feature.version> -->
-								<!-- <jaggery-test.feature.version>1.3.2</jaggery-test.feature.version> -->
-								<!-- **************************************************** -->
-								<!-- End of Version differences -->
-								<!-- **************************************************** -->
-
-								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
 								<!-- End of Jaggery Features -->
 
 								<!-- Carbon Deployment Features -->
@@ -438,11 +419,6 @@
 
 
 								<!-- Store Features -->
-								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
-
-								<!--<featureArtifactDef>-->
-									<!--org.wso2.es:org.wso2.store.styles.feature:${product.es.version}-->
-								<!--</featureArtifactDef>-->
 								<featureArtifactDef>
 									org.wso2.carbon.store:org.wso2.carbon.store.feature:${carbon.store.version}
 								</featureArtifactDef>
@@ -505,69 +481,12 @@
 								<featureArtifactDef>
 									org.wso2.carbon.registry:org.wso2.carbon.registry.contentsearch.server.feature:${carbon.registry.version}
 								</featureArtifactDef>
-								<!--&lt;!&ndash; **************************************************** &ndash;&gt;-->
-								<!--&lt;!&ndash; Version differences with the ES POM &ndash;&gt;-->
-								<!--&lt;!&ndash; **************************************************** &ndash;&gt;-->
-								<!--&lt;!&ndash; <carbon.registry.version>4.4.5</carbon.registry.version> &ndash;&gt;-->
-								<!--&lt;!&ndash; <carbon.governance.version>4.5.2</carbon.governance.version> &ndash;&gt;-->
-								<!--&lt;!&ndash; **************************************************** &ndash;&gt;-->
-								<!--&lt;!&ndash; End of Version differences &ndash;&gt;-->
-								<!--&lt;!&ndash; **************************************************** &ndash;&gt;-->
-
-								<!--&lt;!&ndash;+++++++++++++++++++++++++++++++++++++++++++++++&ndash;&gt;-->
-								<!--&lt;!&ndash; End of Registry Features &ndash;&gt;-->
-
-
-								<!--&lt;!&ndash; Identity Features &ndash;&gt;-->
-								<!--&lt;!&ndash;+++++++++++++++++++++++++++++++++++++++++++++++&ndash;&gt;-->
-								<!--<featureArtifactDef>-->
-									<!--org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.server.feature:${carbon.identity.version}-->
-								<!--</featureArtifactDef>-->
-								<!--<featureArtifactDef>-->
-									<!--org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature:${carbon.identity.version}-->
-								<!--</featureArtifactDef>-->
-								<!--<featureArtifactDef>-->
-									<!--org.wso2.carbon.identity:org.wso2.carbon.identity.application.mgt.server.feature:${carbon.identity.version}-->
-								<!--</featureArtifactDef>-->
-								<!--<featureArtifactDef>-->
-									<!--org.wso2.carbon.identity:org.wso2.carbon.idp.mgt.server.feature:${carbon.identity.version}-->
-								<!--</featureArtifactDef>-->
-
-
-								<!--&lt;!&ndash; **************************************************** &ndash;&gt;-->
-								<!--&lt;!&ndash; Version differences with the ES POM &ndash;&gt;-->
-								<!--&lt;!&ndash; **************************************************** &ndash;&gt;-->
-								<!--&lt;!&ndash;<carbon.identity.version>4.5.4</carbon.identity.version>&ndash;&gt;-->
-								<!--&lt;!&ndash; **************************************************** &ndash;&gt;-->
-								<!--&lt;!&ndash; End of Version differences &ndash;&gt;-->
-								<!--&lt;!&ndash; **************************************************** &ndash;&gt;-->
-
-								<!--&lt;!&ndash;+++++++++++++++++++++++++++++++++++++++++++++++&ndash;&gt;-->
-								<!--&lt;!&ndash; End of Identity Features &ndash;&gt;-->
-
 
 								<!-- Commons Features -->
 								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
 								<featureArtifactDef>
 									org.wso2.carbon.commons:org.wso2.carbon.event.feature:${carbon.commons.version}
 								</featureArtifactDef>
-								<!--<featureArtifactDef>-->
-									<!--org.wso2.carbon.commons:org.wso2.carbon.tenant.mgt.common.feature:${carbon.commons.version}-->
-								<!--</featureArtifactDef>-->
-								<!--<featureArtifactDef>-->
-									<!--org.wso2.carbon.commons:org.wso2.carbon.ntask.feature:${carbon.commons.version}-->
-								<!--</featureArtifactDef>-->
-
-								<!-- **************************************************** -->
-								<!-- Version differences with the ES POM -->
-								<!-- **************************************************** -->
-								<!--<carbon.commons.version>4.4.4</carbon.commons.version>-->
-								<!-- **************************************************** -->
-								<!-- End of Version differences -->
-								<!-- **************************************************** -->
-
-								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
-								<!-- End of Commons Features -->
 
 
 								<feaureArtifactDef>
@@ -586,10 +505,6 @@
                                     org.wso2.carbon.mediation:org.apache.synapse.wso2.feature:${carbon.mediation.version}
                                 </featureArtifactDef>
 
-                                <!--added das features-->
-                                <!--<featureArtifactDef>-->
-                                    <!--org.wso2.carbon.analytics:org.wso2.carbon.analytics.lite.feature:${carbon.analytics.version}-->
-                                <!--</featureArtifactDef>-->
 
                                 <!--APIM feature-->
                                 <featureArtifactDef>
@@ -598,9 +513,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.deployment:org.wso2.carbon.bam.service.agent.feature:${carbon.deployment.version}
                                 </featureArtifactDef>
-                                <!--<featureArtifactDef>-->
-                                    <!--org.wso2.carbon.mediation:org.wso2.carbon.mediation.initializer.feature:${carbon.mediation.version}-->
-                                <!--</featureArtifactDef>-->
                                 <!--End of APIM Feature-->
 
                                 <!--DAS Feature-->
@@ -624,8 +536,25 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics:org.wso2.carbon.analytics.messageconsole.feature:${carbon.analytics.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.dashboard.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.activitydashboard.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.webservice.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.jsservice.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.restapi.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
                                 <!-- END - Analytics features -->
 
+
+
                                 <!-- ************** START - Capp Management ********* -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.application.mgt.feature:${carbon.commons.version}
@@ -701,8 +630,6 @@
                                     org.wso2.ciphertool:org.wso2.ciphertool.feature:${cipher.tool.version}
                                 </featureArtifactDef>
                                 <!-- END - Tools -->
-
-
                                 <!--End of DAS Feature-->
                             </featureArtifacts>
                         </configuration>
@@ -755,6 +682,14 @@
                                     <id>org.wso2.carbon.webapp.authenticator.framework.server.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.analytics.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
                                 <!-- End of Device Management Features -->
 
                                 <!-- Jaggery Features -->
@@ -1051,11 +986,6 @@
                                     <id>org.wso2.carbon.registry.community.features.ui.feature.group</id>
                                     <version>${carbon.registry.version}</version>
                                 </feature>
-                                <!-- TODO: Verify this feature is needed -->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.registry.community.features.feature.group</id>-->
-                                    <!--<version>${carbon.registry.version}</version>-->
-                                <!--</feature>-->
                                 <!-- End of Registry Features -->
 
                                 <!-- Governance features -->
@@ -1111,16 +1041,13 @@
                                     <version>${axis2-transports.wso2.version}</version>
                                 </feature>
 
-
-								<!--========================================================================================================-->
-								<!-- Enterprise Store Features -->
+                                <!-- Device  Store Features -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.enterprise.store.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
 
 								<!-- Jaggery Features -->
-								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
 								<feature>
 									<id>org.jaggeryjs.modules.caramel.feature.group</id>
 									<version>${caramel.feature.version}</version>
@@ -1129,16 +1056,13 @@
 									<id>org.jaggeryjs.modules.handlebars.feature.group</id>
 									<version>${handlebars.feature.version}</version>
 								</feature>
-								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
 								<!-- End of Jaggery Features -->
 
 								<!-- Carbon Deployment Features -->
-								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
 								<feature>
 									<id>org.wso2.carbon.webapp.mgt.server.feature.group</id>
 									<version>${carbon.deployment.version}</version>
 								</feature>
-								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
 								<!-- End of Carbon Deployment Features -->
 
 
@@ -1230,34 +1154,12 @@
 									<id>org.wso2.ciphertool.feature.group</id>
 									<version>${ciphertool.version}</version>
 								</feature>
-
-								<!--========================================================================================================-->
-								<!-- End of Enterprise Store Features -->
-
-                                <!--<feature>-->
-                                    <!--<id>org.apache.synapse.wso2.feature.group</id>-->
-                                    <!--<version>${carbon.mediation.version}</version>-->
-                                <!--</feature>-->
-
+                                <!-- End of Enterprise Store Features -->
                                 <!--APIM feature-->
                                 <feature>
                                     <id>org.wso2.carbon.system.statistics.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.bam.service.agent.feature.group</id>-->
-                                    <!--<version>${carbon.deployment.version}</version>-->
-                                <!--</feature>-->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.mediation.initializer.feature.group</id>-->
-                                    <!--<version>${carbon.mediation.version}</version>-->
-                                <!--</feature>-->
-                                <!--End of APIM Feature-->
-                                <!--DAS Feature-->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.analytics.lite.feature.group</id>-->
-                                    <!--<version>${carbon.analytics.version}</version>-->
-                                <!--</feature>-->
 
                                 <!-- START - Analytics Features -->
                                 <feature>
@@ -1286,6 +1188,26 @@
                                     <id>org.wso2.carbon.analytics.messageconsole.feature.group</id>
                                     <version>${carbon.analytics.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.dashboard.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.activitydashboard.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.webservice.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.jsservice.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.restapi.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
 
                                 <!-- ************** START - Capp Management ********* -->
                                 <feature>
diff --git a/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/AndroidSenseManagerService.java b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/AndroidSenseManagerService.java
index d33dddc7..edeadc48 100644
--- a/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/AndroidSenseManagerService.java
+++ b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/AndroidSenseManagerService.java
@@ -19,6 +19,21 @@ public class AndroidSenseManagerService implements DeviceManagementService {
 		return AndroidSenseConstants.DEVICE_TYPE;
 	}
 
+	@Override
+	public String getProviderTenantDomain() {
+		return "carbon.super";
+	}
+
+	@Override
+	public boolean isSharedWithAllTenants() {
+		return true;
+	}
+
+	@Override
+	public String[] getSharedTenantsDomain() {
+		return new String[0];
+	}
+
 	@Override
 	public void init() throws DeviceManagementException {
 		deviceManager=new AndroidSenseManager();
diff --git a/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/ArduinoManagerService.java b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/ArduinoManagerService.java
index 2bf8ed58..d52390f7 100644
--- a/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/ArduinoManagerService.java
+++ b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/ArduinoManagerService.java
@@ -20,6 +20,21 @@ public class ArduinoManagerService implements DeviceManagementService {
 		return ArduinoConstants.DEVICE_TYPE;
 	}
 
+	@Override
+	public String getProviderTenantDomain() {
+		return "carbon.super";
+	}
+
+	@Override
+	public boolean isSharedWithAllTenants() {
+		return true;
+	}
+
+	@Override
+	public String[] getSharedTenantsDomain() {
+		return new String[0];
+	}
+
 	@Override
 	public void init() throws DeviceManagementException {
 		deviceManager=new ArduinoManager();
diff --git a/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml
index 802b3b46..81fb07ea 100644
--- a/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml
+++ b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml
@@ -17,6 +17,12 @@
   <name>WSO2 Carbon - IoT Server API - Arduino API</name>
 
   <dependencies>
+    <dependency>
+      <groupId>org.wso2.carbon</groupId>
+      <artifactId>org.wso2.carbon.utils</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- CDM -->
     <dependency>
       <groupId>org.wso2.carbon.devicemgt</groupId>
@@ -78,6 +84,10 @@
       <groupId>javax.ws.rs</groupId>
       <artifactId>jsr311-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.wso2.carbon.devicemgt</groupId>
+      <artifactId>org.wso2.carbon.device.mgt.analytics</artifactId>
+    </dependency>
 
   </dependencies>
 
diff --git a/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/ArduinoControllerService.java b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/ArduinoControllerService.java
index 7bbfdbcd..952154c1 100644
--- a/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/ArduinoControllerService.java
+++ b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/ArduinoControllerService.java
@@ -19,6 +19,9 @@ package org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.device.mgt.analytics.exception.DataPublisherConfigurationException;
+import org.wso2.carbon.device.mgt.analytics.service.DeviceAnalyticsService;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl.util.DeviceJSON;
 import org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl.util.MqttArduinoSubscriber;
@@ -169,20 +172,26 @@ public class ArduinoControllerService {
 
 	@Path("/test/{value}")
 	@POST
-	public void pushtData( @PathParam("value") String value,@Context HttpServletResponse response) {
+	public void pushtData(@PathParam("value") double value, @Context HttpServletResponse
+			response) {
 
 
+		PrivilegedCarbonContext.startTenantFlow();
+		PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+		ctx.setTenantDomain("carbon.super", true);
+		DeviceAnalyticsService deviceAnalyticsService = (DeviceAnalyticsService) ctx
+				.getOSGiService(
+						DeviceAnalyticsService.class, null);
+		Object metdaData[] = {"ayyoob", "firealarm", "123", System.currentTimeMillis()};
+		Object payloadData[] = {value};
 		try {
-			DeviceController deviceController = new DeviceController();
-			deviceController.pushBamData("ayyoob", "firealarm", "deviceID1",
-										 System.currentTimeMillis(), "DeviceData" ,value, DataStreamDefinitions.StreamTypeLabel
-												 .TEMPERATURE);
-
-
-
-		} catch (UnauthorizedException e) {
-			response.setStatus(HttpStatus.SC_UNAUTHORIZED);
+			deviceAnalyticsService.publishEvent("org.wso2.iot.devices.temperature", "1.0.0",
+												metdaData, new Object[0], payloadData);
+		} catch (DataPublisherConfigurationException e) {
+			response.setStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR);
 
+		} finally {
+			PrivilegedCarbonContext.endTenantFlow();
 		}
 	}
 }
diff --git a/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/webapp/WEB-INF/web.xml b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/webapp/WEB-INF/web.xml
index 7dbfdaaa..2175bbda 100755
--- a/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/webapp/WEB-INF/web.xml
+++ b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/webapp/WEB-INF/web.xml
@@ -4,8 +4,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
          metadata-complete="true">
-	<display-name>DigitalDisplay </display-name>
-	<description>DigitalDisplay</description>
+	<display-name>Arduino</display-name>
+	<description>Arduino</description>
 
 	<servlet>
 		<servlet-name>CXFServlet</servlet-name>
diff --git a/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/DigitalDisplayManagerService.java b/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/DigitalDisplayManagerService.java
index 9c29010f..d6909054 100644
--- a/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/DigitalDisplayManagerService.java
+++ b/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/DigitalDisplayManagerService.java
@@ -19,6 +19,21 @@ public class DigitalDisplayManagerService implements DeviceManagementService{
 		return DigitalDisplayConstants.DEVICE_TYPE;
 	}
 
+	@Override
+	public String getProviderTenantDomain() {
+		return "carbon.super";
+	}
+
+	@Override
+	public boolean isSharedWithAllTenants() {
+		return true;
+	}
+
+	@Override
+	public String[] getSharedTenantsDomain() {
+		return new String[0];
+	}
+
 	@Override
 	public void init() throws DeviceManagementException {
 		deviceManager= new DigitalDisplayManager();
diff --git a/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/FireAlarmManagerService.java b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/FireAlarmManagerService.java
index 3853a021..22392f1e 100644
--- a/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/FireAlarmManagerService.java
+++ b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/FireAlarmManagerService.java
@@ -19,6 +19,22 @@ public class FireAlarmManagerService implements DeviceManagementService{
 		return FireAlarmConstants.DEVICE_TYPE;
 	}
 
+
+	@Override
+	public String getProviderTenantDomain() {
+		return "carbon.super";
+	}
+
+	@Override
+	public boolean isSharedWithAllTenants() {
+		return true;
+	}
+
+	@Override
+	public String[] getSharedTenantsDomain() {
+		return new String[0];
+	}
+
 	@Override
 	public void init() throws DeviceManagementException {
 		this.deviceManager=new FireAlarmManager();
diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml
index b1683f02..33d20475 100644
--- a/modules/samples/pom.xml
+++ b/modules/samples/pom.xml
@@ -89,6 +89,12 @@
                 <version>${carbon.device.mgt.version}</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.analytics</artifactId>
+                <version>${carbon.device.mgt.version}</version>
+                <scope>provided</scope>
+            </dependency>
 
             <!--IOT dependencies-->
 
diff --git a/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/RaspberrypiManagerService.java b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/RaspberrypiManagerService.java
index 0f0cddaa..41272c9a 100644
--- a/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/RaspberrypiManagerService.java
+++ b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/RaspberrypiManagerService.java
@@ -21,6 +21,21 @@ public class RaspberrypiManagerService implements DeviceManagementService {
 		return RaspberrypiConstants.DEVICE_TYPE;
 	}
 
+	@Override
+	public String getProviderTenantDomain() {
+		return "carbon.super";
+	}
+
+	@Override
+	public boolean isSharedWithAllTenants() {
+		return true;
+	}
+
+	@Override
+	public String[] getSharedTenantsDomain() {
+		return new String[0];
+	}
+
 	@Override
 	public void init() throws DeviceManagementException {
 		deviceManager = new RaspberrypiManager();
diff --git a/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/SensebotManagerService.java b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/SensebotManagerService.java
index 323ecbf7..ebd2568b 100644
--- a/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/SensebotManagerService.java
+++ b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/SensebotManagerService.java
@@ -14,6 +14,22 @@ import java.util.List;
 
 public class SensebotManagerService implements DeviceManagementService {
 	private DeviceManager deviceManager;
+
+	@Override
+	public String getProviderTenantDomain() {
+		return "carbon.super";
+	}
+
+	@Override
+	public boolean isSharedWithAllTenants() {
+		return true;
+	}
+
+	@Override
+	public String[] getSharedTenantsDomain() {
+		return new String[0];
+	}
+
 	@Override
 	public String getType() {
 		return SensebotConstants.DEVICE_TYPE;
diff --git a/pom.xml b/pom.xml
index d960fac3..61c9005d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -407,7 +407,11 @@
                 <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
-
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.analytics</artifactId>
+                <version>${carbon.device.mgt.version}</version>
+            </dependency>
 
 
             <!--IOT dependencies-->
@@ -892,13 +896,13 @@
 
         <!--DAS-->
         <carbon.analytics.version>1.0.3-SNAPSHOT</carbon.analytics.version>
-        <carbon.analytics.common.version>5.0.2-SNAPSHOT</carbon.analytics.common.version>
+        <carbon.analytics.common.version>5.0.2</carbon.analytics.common.version>
         <das.release.version>3.0.0-SNAPSHOT</das.release.version>
         <carbon.data.version>4.3.1-SNAPSHOT</carbon.data.version>
         <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
         <shindig.version>1.0.0</shindig.version>
         <carbon.dashboard.version>1.0.1-SNAPSHOT</carbon.dashboard.version>
-        <carbon.event-processing.version>2.0.4</carbon.event-processing.version>
+        <carbon.event-processing.version>2.0.5</carbon.event-processing.version>
 
 
         <orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient>

From 09285aea5eb5a813ea2daf3a50ae37cdaa8f955b Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Thu, 24 Sep 2015 12:07:25 +0530
Subject: [PATCH 3/4] resolved build issues

---
 modules/distribution/pom.xml                  |  18 +
 modules/distribution/src/assembly/bin.xml     |  60 ++-
 .../src/repository/conf/axis2/axis2.xml       |   8 +-
 .../repository/conf/axis2/axis2_client.xml    |   8 +-
 .../src/repository/conf/etc/bam.xml           |   4 +
 .../src/repository/conf/identity.xml          | 356 ++++++------------
 .../customsequences/fault/json_fault.xml      |   0
 .../in/json_to_xml_in_message.xml             |   0
 .../customsequences/in/log_in_message.xml     |   0
 .../in/preserve_accept_header.xml             |   0
 .../in/xml_to_json_in_message.xml             |   0
 .../out/apply_accept_header.xml               |   0
 .../out/json_to_xml_out_message.xml           |   0
 .../customsequences/out/log_out_message.xml   |   0
 .../out/xml_to_json_out_message.xml           |   0
 .../default/api/_AuthorizeAPI_.xml            |  24 ++
 .../default/api/_RevokeAPI_.xml               |  25 ++
 .../default/api/_TokenAPI_.xml                |  25 ++
 .../WorkflowCallbackService.xml               | 145 +++++++
 .../conf/synapse-configs/default/registry.xml |  25 ++
 .../sequences/_auth_failure_handler_.xml      |   4 +
 .../default/sequences/_build_.xml             |  26 ++
 .../sequences/_cors_request_handler_.xml      |  21 ++
 .../sequences/_production_key_error_.xml      |  24 ++
 .../sequences/_resource_mismatch_handler_.xml |  24 ++
 .../default/sequences/_sandbox_key_error_.xml |  24 ++
 .../sequences/_throttle_out_handler_.xml      |   5 +
 .../default/sequences/_token_fault_.xml       |  40 ++
 .../default/sequences/fault.xml               |  72 ++++
 .../default/sequences/main.xml                |  98 +++++
 .../conf/synapse-configs/default/synapse.xml  |  25 ++
 modules/p2-profile-gen/pom.xml                |  98 ++++-
 pom.xml                                       |  15 +-
 33 files changed, 882 insertions(+), 292 deletions(-)
 create mode 100644 modules/distribution/src/repository/conf/etc/bam.xml
 rename modules/distribution/{apim-resources => src/repository/conf/resources}/customsequences/fault/json_fault.xml (100%)
 rename modules/distribution/{apim-resources => src/repository/conf/resources}/customsequences/in/json_to_xml_in_message.xml (100%)
 rename modules/distribution/{apim-resources => src/repository/conf/resources}/customsequences/in/log_in_message.xml (100%)
 rename modules/distribution/{apim-resources => src/repository/conf/resources}/customsequences/in/preserve_accept_header.xml (100%)
 rename modules/distribution/{apim-resources => src/repository/conf/resources}/customsequences/in/xml_to_json_in_message.xml (100%)
 rename modules/distribution/{apim-resources => src/repository/conf/resources}/customsequences/out/apply_accept_header.xml (100%)
 rename modules/distribution/{apim-resources => src/repository/conf/resources}/customsequences/out/json_to_xml_out_message.xml (100%)
 rename modules/distribution/{apim-resources => src/repository/conf/resources}/customsequences/out/log_out_message.xml (100%)
 rename modules/distribution/{apim-resources => src/repository/conf/resources}/customsequences/out/xml_to_json_out_message.xml (100%)
 create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/api/_AuthorizeAPI_.xml
 create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/api/_RevokeAPI_.xml
 create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/api/_TokenAPI_.xml
 create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/proxy-services/WorkflowCallbackService.xml
 create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/registry.xml
 create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/sequences/_auth_failure_handler_.xml
 create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/sequences/_build_.xml
 create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/sequences/_cors_request_handler_.xml
 create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/sequences/_production_key_error_.xml
 create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/sequences/_resource_mismatch_handler_.xml
 create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/sequences/_sandbox_key_error_.xml
 create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/sequences/_throttle_out_handler_.xml
 create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/sequences/_token_fault_.xml
 create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/sequences/fault.xml
 create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/sequences/main.xml
 create mode 100644 modules/distribution/src/repository/conf/synapse-configs/default/synapse.xml

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 12f59031..31a17cc7 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -127,6 +127,24 @@
 				<artifactId>maven-antrun-plugin</artifactId>
 				<executions>
 
+					<execution>
+						<id>1-replace-datasource-property-thrift-authentication</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<echo message="Replace DataSource to WSO2AM_DB"/>
+								<replace
+										file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/thrift-authentication.xml"
+										token="jdbc/WSO2CarbonDB"
+										value="jdbc/WSO2AM_DB"
+										/>
+							</tasks>
+						</configuration>
+					</execution>
+
 					<!--============ Added with ES Features ===============-->
 
 					<execution>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 9d9b6232..07167f2c 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -501,7 +501,7 @@
 
         <!--============ Added with API Features ===============-->
         <fileSet>
-            <directory>apim-resources/customsequences</directory>
+            <directory>src/repository/conf/resources/customsequences</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/customsequences</outputDirectory>
             <includes>
                 <include>**/**.xml</include>
@@ -539,6 +539,18 @@
             </excludes>
         </fileSet-->
 
+        <fileSet>
+            <directory>src/repository/conf/synapse-configs</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/synapse-configs</outputDirectory>
+            <excludes>
+                <exclude>**/empty.txt</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>src/repository/conf/synapse-configs/default/sequences</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/apim-synapse-config/</outputDirectory>
+        </fileSet>
+
         <!-- Analytics related config -->
         <fileSet>
             <directory>
@@ -740,13 +752,21 @@
             <fileMode>644</fileMode>
         </file>
 
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/msg-mgt.properties
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
+
 
         <!-- Copying thrift-authentication.xml -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/thrift-authentication.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/thrift-authentication.xml
             </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
@@ -764,7 +784,7 @@
         </file>
         <file>
             <source>src/repository/conf/identity.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
             <fileMode>644</fileMode>
         </file>
         <file>
@@ -906,6 +926,13 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>src/repository/conf/axis2/axis2.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/axis2/</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
+
         <file>
             <!--<source>src/repository/conf/etc/launch.ini</source>-->
             <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/launch.ini</source>
@@ -951,14 +978,6 @@
             </outputDirectory>
         </file>
 
-        <!--============ Added with ES Features ===============-->
-        <file>
-            <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/axis2/axis2.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/axis2/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
-
         <file>
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity-mgt.properties
@@ -1037,14 +1056,15 @@
         <!-- End of Enterprise Store Features -->
 
         <!-- Copying apim feature - bam.xml -->
-        <!--<file>-->
-            <!--<source>-->
-                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/bam.xml-->
-            <!--</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>-->
-            <!--<filtered>true</filtered>-->
-            <!--<fileMode>644</fileMode>-->
-        <!--</file>-->
+        <file>
+            <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/bam.xml-->
+            <source>
+                src/repository/conf/etc/bam.xml
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
 
         <!-- Analytics datasources -->
         <file>
diff --git a/modules/distribution/src/repository/conf/axis2/axis2.xml b/modules/distribution/src/repository/conf/axis2/axis2.xml
index e6103df9..3b795a2a 100644
--- a/modules/distribution/src/repository/conf/axis2/axis2.xml
+++ b/modules/distribution/src/repository/conf/axis2/axis2.xml
@@ -93,9 +93,7 @@
     <parameter name="manageTransportSession">true</parameter>
 
     <!-- Synapse Configuration file -->
-    <parameter name="SynapseConfig.ConfigurationFile" locked="false">
-        ./repository/deployment/server/synapse-configs
-    </parameter>
+    <parameter name="SynapseConfig.ConfigurationFile" locked="false">repository/deployment/server/synapse-configs</parameter>
 
     <!-- Synapse Home parameter -->
     <parameter name="SynapseConfig.HomeDirectory" locked="false">.</parameter>
@@ -577,7 +575,7 @@
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
         <phase name="Security"/>
-	<phase name="Transport"/>
+        <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
@@ -701,4 +699,4 @@
                                port="2222"/>
         </groupManagement>
     </clustering>
-</axisconfig>
+</axisconfig>
\ No newline at end of file
diff --git a/modules/distribution/src/repository/conf/axis2/axis2_client.xml b/modules/distribution/src/repository/conf/axis2/axis2_client.xml
index deb24c71..5dc3425b 100644
--- a/modules/distribution/src/repository/conf/axis2/axis2_client.xml
+++ b/modules/distribution/src/repository/conf/axis2/axis2_client.xml
@@ -109,7 +109,7 @@
                           class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
         <messageFormatter contentType="application/soap+xml"
                           class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
-	<!--JSON Message Formatters-->
+        <!--JSON Message Formatters-->
         <messageFormatter contentType="application/json"
                           class="org.apache.axis2.json.JSONMessageFormatter"/>
         <messageFormatter contentType="application/json/badgerfish"
@@ -128,7 +128,7 @@
                         class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
         <messageBuilder contentType="application/x-www-form-urlencoded"
                         class="org.apache.axis2.builder.XFormURLEncodedBuilder"/>
-	<!--JSON Message Builders-->
+        <!--JSON Message Builders-->
         <messageBuilder contentType="application/json"
                         class="org.apache.axis2.json.JSONOMBuilder"/>
         <messageBuilder contentType="application/json/badgerfish"
@@ -312,6 +312,6 @@
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
         <phase name="Security"/>
-	<phase name="Transport"/>
+        <phase name="Transport"/>
     </phaseOrder>
-</axisconfig>
+</axisconfig>
\ No newline at end of file
diff --git a/modules/distribution/src/repository/conf/etc/bam.xml b/modules/distribution/src/repository/conf/etc/bam.xml
new file mode 100644
index 00000000..45e47cc3
--- /dev/null
+++ b/modules/distribution/src/repository/conf/etc/bam.xml
@@ -0,0 +1,4 @@
+<BamConfig>
+	<ServiceDataPublishing>disable</ServiceDataPublishing>
+	<WebappDataPublishing>disable</WebappDataPublishing>
+</BamConfig>
\ No newline at end of file
diff --git a/modules/distribution/src/repository/conf/identity.xml b/modules/distribution/src/repository/conf/identity.xml
index e9af104a..ae58884c 100755
--- a/modules/distribution/src/repository/conf/identity.xml
+++ b/modules/distribution/src/repository/conf/identity.xml
@@ -1,44 +1,59 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- ~ Copyright (c) 2005-2011, 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-2011, 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.
+ -->
 
 <Server xmlns="http://wso2.org/projects/carbon/carbon.xml">
 
+    <OpenIDServerUrl>https://localhost:9443/openidserver</OpenIDServerUrl>
+
+    <OpenIDUserPattern>https://localhost:9443/openid/</OpenIDUserPattern>
+    <!-- If the users must be prompted for approval -->
+    <OpenIDSkipUserConsent>false</OpenIDSkipUserConsent>
+    <!-- Expiry time of the OpenID RememberMe token in minutes -->
+    <OpenIDRememberMeExpiry>7200</OpenIDRememberMeExpiry>
+
     <JDBCPersistenceManager>
         <DataSource>
-            <!-- Include a data source name (jndiConfigName) from the set of data
-                sources defined in master-datasources.xml -->
+            <!-- Include a data source name (jndiConfigName) from the set of data sources defined in master-datasources.xml -->
             <Name>jdbc/WSO2AM_DB</Name>
         </DataSource>
-        <!-- If the identity database is created from another place and if it is
-            required to skip schema initialization during the server start up, set the
-            following property to "true". -->
-        <!-- <SkipDBSchemaCreation>false</SkipDBSchemaCreation> -->
-        <!--SessionDataPersist>
-            <Enable>true</Enable>
-            <EnableCleanUp>true</EnableCleanUp>
-            <Temporary>false</Temporary-->
-        <!--/SessionDataPersist-->
+        <!-- If the identity database is created from another place and if it is required to skip schema initialization during the server start up, set the following
+           property to "true". -->
+        <SkipDBSchemaCreation>true</SkipDBSchemaCreation>
     </JDBCPersistenceManager>
 
-    <!-- Time configurations are in minutes -->
-    <TimeConfig>
-        <SessionIdleTimeout>120</SessionIdleTimeout>
-        <RememberMeTimeout>20160</RememberMeTimeout>
-        <PersistanceCleanUpTimeout>20160</PersistanceCleanUpTimeout>
-        <PersistanceCleanUpPeriod>1140</PersistanceCleanUpPeriod>
-    </TimeConfig>
-
-    <!-- Security configurations -->
+    <!--
+      Security configurations
+    -->
     <Security>
-        <!-- The directory under which all other KeyStore files will be stored -->
+        <UserTrustedRPStore>
+            <Location>${carbon.home}/repository/resources/security/userRP.jks</Location>
+            <!-- Keystore type (JKS/PKCS12 etc.)-->
+            <Type>JKS</Type>
+            <!-- Keystore password-->
+            <Password>wso2carbon</Password>
+            <!-- Private Key password-->
+            <KeyPassword>wso2carbon</KeyPassword>
+        </UserTrustedRPStore>
+
+        <!--
+              The directory under which all other KeyStore files will be stored
+          -->
         <KeyStoresDir>${carbon.home}/conf/keystores</KeyStoresDir>
     </Security>
 
@@ -53,106 +68,39 @@
         </System>
     </Identity>
 
-    <OpenID>
-        <!--
-            Default values for OpenIDServerUrl and OpenIDUSerPattern are built in following format
-            https://<HostName>:<MgtTrpProxyPort except 443>/<ProxyContextPath>/<context>
-            If above format doesn't satisfy uncomment the following configs and explicitly configure the values
-         -->
-        <!--OpenIDServerUrl>https://localhost:9443/openidserver</OpenIDServerUrl-->
-        <!--OpenIDUserPattern>https://localhost:9443/openid/</OpenIDUserPattern-->
-
-        <!-- If the users must be prompted for approval -->
-        <OpenIDSkipUserConsent>false</OpenIDSkipUserConsent>
-        <!-- Expiry time of the OpenID RememberMe token in minutes -->
-        <OpenIDRememberMeExpiry>7200</OpenIDRememberMeExpiry>
-        <!-- Multifactor Authentication configuration -->
-        <UseMultifactorAuthentication>false</UseMultifactorAuthentication>
-        <!-- To enable or disable openid dumb mode -->
-        <DisableOpenIDDumbMode>false</DisableOpenIDDumbMode>
-        <!-- remember me session timeout in seconds -->
-        <SessionTimeout>36000</SessionTimeout>
-        <!-- skips authentication if valid SAML2 Web SSO browser session available -->
-        <AcceptSAMLSSOLogin>false</AcceptSAMLSSOLogin>
-        <ClaimsRetrieverImplClass>org.wso2.carbon.identity.provider.openid.claims.DefaultClaimsRetriever
-        </ClaimsRetrieverImplClass>
-
-        <!--
-               OpenID private association store is configurable from following configs.
-               It includes two new replication stores,
-                       i.   OpenIDServerAssociationStore (Default association store)
-                       ii.  PrivateAssociationCryptoStore
-                       iii. PrivateAssociationReplicationStore
-        -->
-
-        <!-- Specify full qualified class name of the class which going to use as private association store -->
-        <!-- 
-		<OpenIDPrivateAssociationStoreClass>org.wso2.carbon.identity.provider.openid.PrivateAssociationCryptoStore</OpenIDPrivateAssociationStoreClass>
-	-->
-
-        <!-- The exiration time (in minutes) for the OpenID association -->
-        <!--
-		<OpenIDAssociationExpiryTime>15</OpenIDAssociationExpiryTime>
-	-->
-
-        <!-- Configs specific to PrivateAssociationCryptoStore -->
-        <!-- Server secret. This value should be the same in all nodes in the cluster -->
-        <!--
-		<OpenIDPrivateAssociationServerKey>qewlj324lmasc</OpenIDPrivateAssociationServerKey>
-	-->
-
-        <!-- Configs specific to PrivateAssociationCryptoStore -->
-        <!-- This enable private association cleanup task which cleans expired private associations -->
-        <!--
-		<EnableOpenIDAssociationCleanupTask>true</EnableOpenIDAssociationCleanupTask>
-	-->
-        <!-- Time Period (in minutes) that cleanup task would run -->
-        <!--
-		<OpenIDAssociationCleanupPeriod>15</OpenIDAssociationCleanupPeriod>
-	-->
-    </OpenID>
-
     <OAuth>
-        <AppInfoCacheTimeout>-1</AppInfoCacheTimeout>
-        <AuthorizationGrantCacheTimeout>-1</AuthorizationGrantCacheTimeout>
-        <SessionDataCacheTimeout>-1</SessionDataCacheTimeout>
-        <ClaimCacheTimeout>-1</ClaimCacheTimeout>
-
-        <!--
-            Default values for OAuth1RequestTokenUrl, OAuth1AccessTokenUrl, OAuth1AuthorizeUrl
-            OAuth2AuthzEPUrl, OAuth2TokenEPUrl and OAuth2UserInfoEPUrl are built in following format
-            https://<HostName>:<MgtTrpProxyPort except 443>/<ProxyContextPath>/<context>/<path>
-            If above format doesn't satisfy uncomment the following configs and explicitly configure the values
-         -->
-        <OAuth1RequestTokenUrl>https://localhost:9443/oauth/request-token</OAuth1RequestTokenUrl>
-        <OAuth1AuthorizeUrl>https://localhost:9443/oauth/authorize-url</OAuth1AuthorizeUrl>
-        <OAuth1AccessTokenUrl>https://localhost:9443/oauth/access-token</OAuth1AccessTokenUrl>
-        <!--OAuth2AuthzEPUrl>https://localhost:9443/oauth2/authorize</OAuth2AuthzEPUrl-->
-        <!--OAuth2TokenEPUrl>https://localhost:9443/oauth2/token</OAuth2TokenEPUrl-->
-        <!--OAuth2UserInfoEPUrl>https://localhost:9443/oauth2/userinfo</OAuth2UserInfoEPUrl-->
-
+        <RequestTokenUrl>https://localhost:9443/oauth/request-token</RequestTokenUrl>
+        <AccessTokenUrl>https://localhost:9443/oauth/access-token</AccessTokenUrl>
+        <AuthorizeUrl>https://localhost:9443/oauth/authorize-url</AuthorizeUrl>
         <!-- Default validity period for Authorization Code in seconds -->
         <AuthorizationCodeDefaultValidityPeriod>300</AuthorizationCodeDefaultValidityPeriod>
-        <!-- Default validity period for application access tokens in seconds -->
+        <!-- Default validity period for Access Token in seconds -->
         <AccessTokenDefaultValidityPeriod>3600</AccessTokenDefaultValidityPeriod>
-        <!-- Default validity period for user access tokens in seconds -->
+        <!-- Default validity period for Application Access Token in seconds-If want to set this as never expired,set the value as <0   -->
+        <ApplicationAccessTokenDefaultValidityPeriod>3600</ApplicationAccessTokenDefaultValidityPeriod>
+        <!-- Default validity period for User Access Token in seconds-->
         <UserAccessTokenDefaultValidityPeriod>3600</UserAccessTokenDefaultValidityPeriod>
-        <!-- Validity period for refresh token -->
-        <RefreshTokenValidityPeriod>84600</RefreshTokenValidityPeriod>
         <!-- Timestamp skew in seconds -->
         <TimestampSkew>300</TimestampSkew>
-        <!-- Enable OAuth caching -->
+        <!-- Enable OAuth caching. This cache has the replication support. -->
         <EnableOAuthCache>true</EnableOAuthCache>
-        <!-- Enable renewal of refresh token for refresh_token grant -->
-        <RenewRefreshTokenForRefreshGrant>true</RenewRefreshTokenForRefreshGrant>
-        <!-- Process the token before storing it in database, e.g. encrypting -->
-        <TokenPersistenceProcessor>org.wso2.carbon.identity.oauth.tokenprocessor.PlainTextPersistenceProcessor</TokenPersistenceProcessor>
-        <!-- Supported Client Authentication Methods -->
+        <!-- Configure the security measures needs to be done prior to store the token in the database,
+          such as hashing, encrypting, etc.-->
+        <TokenPersistenceProcessor>
+            org.wso2.carbon.identity.oauth.tokenprocessor.PlainTextPersistenceProcessor
+        </TokenPersistenceProcessor>
+        <!--<ClientAuthHandlers>
+            <ClientAuthHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.clientauth.BasicAuthClientAuthHandler</ClientAuthHandlerImplClass>
+        </ClientAuthHandlers>-->
+
         <ClientAuthHandlers>
             <ClientAuthHandler Class="org.wso2.carbon.identity.oauth2.token.handlers.clientauth.BasicAuthClientAuthHandler">
                 <Property Name="StrictClientCredentialValidation">false</Property>
             </ClientAuthHandler>
         </ClientAuthHandlers>
+        <!--TokenPersistenceProcessor>
+                org.wso2.carbon.identity.oauth.tokenprocessor.EncryptionDecryptionPersistenceProcessor
+            </TokenPersistenceProcessor-->
         <!-- Supported Response Types -->
         <SupportedResponseTypes>
             <SupportedResponseType>
@@ -168,20 +116,26 @@
         <SupportedGrantTypes>
             <SupportedGrantType>
                 <GrantTypeName>authorization_code</GrantTypeName>
-                <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.AuthorizationCodeGrantHandler</GrantTypeHandlerImplClass>
+                <GrantTypeHandlerImplClass>org.wso2.carbon.apimgt.keymgt.handlers.ExtendedAuthorizationCodeGrantHandler</GrantTypeHandlerImplClass>
             </SupportedGrantType>
             <SupportedGrantType>
                 <GrantTypeName>password</GrantTypeName>
-                <!-- <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.PasswordGrantHandler</GrantTypeHandlerImplClass> -->
                 <GrantTypeHandlerImplClass>org.wso2.carbon.apimgt.keymgt.handlers.ExtendedPasswordGrantHandler</GrantTypeHandlerImplClass>
             </SupportedGrantType>
+
+            <!-- This is commented out intentionally due to a bug-->
+            <!--<SupportedGrantType>
+                <GrantTypeName>application_token</GrantTypeName>
+                <GrantTypeHandlerImplClass>org.wso2.carbon.apimgt.keymgt.handlers.OpenKeyManagerGrantHandler</GrantTypeHandlerImplClass>
+                <GrantTypeValidatorImplClass>org.wso2.carbon.apimgt.keymgt.handlers.OpenKeyManagerGrantValidator</GrantTypeValidatorImplClass>
+            </SupportedGrantType>-->
             <SupportedGrantType>
                 <GrantTypeName>refresh_token</GrantTypeName>
                 <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.RefreshGrantHandler</GrantTypeHandlerImplClass>
             </SupportedGrantType>
             <SupportedGrantType>
                 <GrantTypeName>client_credentials</GrantTypeName>
-                <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.ClientCredentialsGrantHandler</GrantTypeHandlerImplClass>
+                <GrantTypeHandlerImplClass>org.wso2.carbon.apimgt.keymgt.handlers.ExtendedClientCredentialsGrantHandler</GrantTypeHandlerImplClass>
             </SupportedGrantType>
             <SupportedGrantType>
                 <GrantTypeName>urn:ietf:params:oauth:grant-type:saml2-bearer</GrantTypeName>
@@ -195,24 +149,33 @@
         <OAuthCallbackHandlers>
             <OAuthCallbackHandler Class="org.wso2.carbon.apimgt.keymgt.util.APIManagerOAuthCallbackHandler"/>
         </OAuthCallbackHandlers>
-        <!--TokenValidators>
-            <TokenValidator type="bearer" class="org.wso2.carbon.identity.oauth2.validators.DefaultOAuth2TokenValidator"/>
-        </TokenValidators-->
-        <!-- Assertions can be used to embedd parameters into access token. -->
+        <OAuthScopeValidator class="org.wso2.carbon.identity.oauth2.validators.JDBCScopeValidator"/>
+
+        <!-- Add custom user headers to the response-->
+        <!--<RequiredRespHeaderClaimUris>
+            <ClaimUri>http://wso2.org/claims/emailaddress</ClaimUri>
+            <ClaimUri>http://wso2.org/claims/gender</ClaimUri>
+        </RequiredRespHeaderClaimUris>-->
+
+        <!-- Enable/Disable OAuth Caching-->
+        <!--<EnableCache>true</EnableCache>-->
+
+        <!-- Assertions can be used to embedd parameters into access token.-->
         <EnableAssertions>
             <UserName>false</UserName>
         </EnableAssertions>
 
-        <!-- This should be set to true when using multiple user stores and keys
-            should saved into different tables according to the user store. By default
-            all the application keys are saved in to the same table. UserName Assertion
-            should be 'true' to use this. -->
+        <!-- This should be set to true when using multiple user stores and keys should saved
+                into different tables according to the user store. By default all the application keys are saved in to the same table.
+                UserName Assertion should be 'true' to use this.-->
         <EnableAccessTokenPartitioning>false</EnableAccessTokenPartitioning>
-        <!-- user store domain names and mapping to new table name. eg: if you
-            provide 'A:foo.com', foo.com should be the user store domain name and 'A'
-            represent the relavant mapping of token store table, i.e. tokens will be
-            added to a table called IDN_OAUTH2_ACCESS_TOKEN_A. -->
+
+        <!-- user store domain names and mappings to new table names.
+                    eg: if you provide 'A:foo.com', foo.com should be the user store domain name and 'A' represent the relavant mapping of
+                    token storing table, i.e. tokens relevant to the users comming from foo.com user store will be added to a table called
+                    IDN_OAUTH2_ACCESS_TOKEN_A. -->
         <AccessTokenPartitioningDomains><!-- A:foo.com, B:bar.com --></AccessTokenPartitioningDomains>
+
         <AuthorizationContextTokenGeneration>
             <Enabled>false</Enabled>
             <TokenGeneratorImplClass>org.wso2.carbon.identity.oauth2.authcontext.JWTTokenGenerator</TokenGeneratorImplClass>
@@ -221,30 +184,25 @@
             <SignatureAlgorithm>SHA256withRSA</SignatureAlgorithm>
             <AuthorizationContextTTL>15</AuthorizationContextTTL>
         </AuthorizationContextTokenGeneration>
+
         <SAML2Grant>
             <!--SAML2TokenHandler></SAML2TokenHandler-->
         </SAML2Grant>
-        <OpenIDConnect>
-            <IDTokenBuilder>org.wso2.carbon.identity.openidconnect.DefaultIDTokenBuilder</IDTokenBuilder>
-            <!--
-                Default value for IDTokenIssuerID, is OAuth2TokenEPUrl.
-                If that doesn't satisfy uncomment the following config and explicitly configure the value
-            -->
-            <!--IDTokenIssuerID>https://localhost:9443/oauth2/token</IDTokenIssuerID-->
-            <IDTokenSubjectClaim>http://wso2.org/claims/givenname</IDTokenSubjectClaim>
-            <IDTokenCustomClaimsCallBackHandler>org.wso2.carbon.identity.openidconnect.SAMLAssertionClaimsCallback</IDTokenCustomClaimsCallBackHandler>
-            <IDTokenExpiration>3600</IDTokenExpiration>
-            <UserInfoEndpointClaimDialect>http://wso2.org/claims</UserInfoEndpointClaimDialect>
-            <UserInfoEndpointClaimRetriever>org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoUserStoreClaimRetriever</UserInfoEndpointClaimRetriever>
-            <UserInfoEndpointRequestValidator>org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInforRequestDefaultValidator</UserInfoEndpointRequestValidator>
-            <UserInfoEndpointAccessTokenValidator>org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoISAccessTokenValidator</UserInfoEndpointAccessTokenValidator>
-            <UserInfoEndpointResponseBuilder>org.wso2.carbon.identity.oauth.endpoint.user.impl.UserInfoJSONResponseBuilder</UserInfoEndpointResponseBuilder>
-            <SkipUserConsent>false</SkipUserConsent>
-        </OpenIDConnect>
+
+        <!-- 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>-->
     </OAuth>
 
     <MultifactorAuthentication>
-        <!--Enable>false</Enable-->
         <XMPPSettings>
             <XMPPConfig>
                 <XMPPProvider>gtalk</XMPPProvider>
@@ -258,59 +216,15 @@
     </MultifactorAuthentication>
 
     <SSOService>
-        <PersistanceCacheTimeout>157680000</PersistanceCacheTimeout>
-        <SessionIndexCacheTimeout>157680000</SessionIndexCacheTimeout>
-        <EntityId>localhost</EntityId>
-        <!--
-            Default value for IdentityProviderURL is  built in following format
-            https://<HostName>:<MgtTrpProxyPort except 443>/<ProxyContextPath>/samlsso
-            If that doesn't satisfy uncomment the following config and explicitly configure the value
-        -->
-        <!--IdentityProviderURL>https://localhost:9443/samlsso</IdentityProviderURL-->
-        <SingleLogoutRetryCount>5</SingleLogoutRetryCount>
-        <SingleLogoutRetryInterval>60000</SingleLogoutRetryInterval>
-        <!-- in milli seconds -->
-        <TenantPartitioningEnabled>false</TenantPartitioningEnabled>
-        <SessionTimeout>36000</SessionTimeout>
-        <!-- remember me session timeout in seconds -->
-        <!-- skips authentication if valid SAML2 Web SSO browser session available -->
-        <AttributeStatementBuilder>org.wso2.carbon.identity.sso.saml.attributes.UserAttributeStatementBuilder</AttributeStatementBuilder>
-        <AttributesClaimDialect>http://wso2.org/claims</AttributesClaimDialect>
-        <AcceptOpenIDLogin>false</AcceptOpenIDLogin>
-        <ClaimsRetrieverImplClass>org.wso2.carbon.identity.sso.saml.builders.claims.DefaultClaimsRetriever</ClaimsRetrieverImplClass>
-        <SAMLSSOAssertionBuilder>org.wso2.carbon.identity.sso.saml.builders.assertion.DefaultSAMLAssertionBuilder</SAMLSSOAssertionBuilder>
-        <SAMLSSOEncrypter>org.wso2.carbon.identity.sso.saml.builders.encryption.DefaultSSOEncrypter</SAMLSSOEncrypter>
-        <SAMLSSOSigner>org.wso2.carbon.identity.sso.saml.builders.signature.DefaultSSOSigner</SAMLSSOSigner>
-        <SAML2HTTPRedirectSignatureValidator>org.wso2.carbon.identity.sso.saml.validators.SAML2HTTPRedirectDeflateSignatureValidator</SAML2HTTPRedirectSignatureValidator>
-        <!--SAMLSSOResponseBuilder>org.wso2.carbon.identity.sso.saml.builders.DefaultResponseBuilder</SAMLSSOResponseBuilder-->
-
-        <!-- SAML Token validity period in minutes -->
-        <SAMLResponseValidityPeriod>5</SAMLResponseValidityPeriod>
-        <UseAuthenticatedUserDomainCrypto>false</UseAuthenticatedUserDomainCrypto>
+        <IdentityProviderURL>https://localhost:9443/samlsso</IdentityProviderURL>
     </SSOService>
 
-    <SecurityTokenService>
-        <!--
-            Default value for IdentityProviderURL is  built in following format
-            https://<HostName>:<MgtTrpProxyPort except 443>/<ProxyContextPath>/services/wso2carbon-sts
-            If that doesn't satisfy uncomment the following config and explicitly configure the value
-        -->
-        <!--IdentityProviderURL>https://localhost:9443/services/wso2carbon-sts</IdentityProviderURL-->
-    </SecurityTokenService>
-
-    <PassiveSTS>
-        <!--
-            Default value for IdentityProviderURL is  built in following format
-            https://<HostName>:<MgtTrpProxyPort except 443>/<ProxyContextPath>/passivests
-            If that doesn't satisfy uncomment the following config and explicitly configure the value
-        -->
-        <!--IdentityProviderURL>https://localhost:9443/passivests</IdentityProviderURL-->
-    </PassiveSTS>
-
     <EntitlementSettings>
         <!-- Uncomment this to enable on-demand policy loading -->
-        <!--OnDemandPolicyLoading> <Enable>true</Enable> <MaxInMemoryPolicies>100</MaxInMemoryPolicies>
-            </OnDemandPolicyLoading -->
+        <!--OnDemandPolicyLoading>
+                <Enable>true</Enable>
+                <MaxInMemoryPolicies>100</MaxInMemoryPolicies>
+        </OnDemandPolicyLoading-->
         <DecisionCaching>
             <Enable>true</Enable>
             <CachingInterval>36000</CachingInterval>
@@ -319,54 +233,16 @@
             <Enable>true</Enable>
         </AttributeCaching>
         <ThirftBasedEntitlementConfig>
-            <EnableThriftService>false</EnableThriftService>
+            <EnableThriftService>true</EnableThriftService>
             <ReceivePort>${Ports.ThriftEntitlementReceivePort}</ReceivePort>
             <ClientTimeout>10000</ClientTimeout>
             <KeyStore>
                 <Location>${carbon.home}/repository/resources/security/wso2carbon.jks</Location>
                 <Password>wso2carbon</Password>
             </KeyStore>
-            <!-- Enable this element to mention the host-name of your IS machine -->
-            <ThriftHostName>localhost</ThriftHostName>
         </ThirftBasedEntitlementConfig>
     </EntitlementSettings>
 
-    <SCIM>
-        <!--
-            Default value for UserEPUrl and GroupEPUrl are built in following format
-            https://<HostName>:<MgtTrpProxyPort except 443>/<ProxyContextPath>/<context>/<path>
-            If that doesn't satisfy uncomment the following config and explicitly configure the value
-        -->
-        <!--UserEPUrl>https://localhost:9443/wso2/scim/Users</UserEPUrl-->
-        <!--GroupEPUrl>https://localhost:9443/wso2/scim/Groups</GroupEPUrl-->
-        <SCIMAuthenticators>
-            <Authenticator class="org.wso2.carbon.identity.scim.provider.auth.BasicAuthHandler">
-                <Property name="Priority">5</Property>
-            </Authenticator>
-            <Authenticator class="org.wso2.carbon.identity.scim.provider.auth.OAuthHandler">
-                <Property name="Priority">10</Property>
-                <Property name="AuthorizationServer">local://services</Property>
-                <!--Property name="AuthorizationServer">https://localhost:9443/services</Property>
-                <Property name="UserName">admin</Property>
-                <Property name="Password">admin</Property-->
-            </Authenticator>
-        </SCIMAuthenticators>
-    </SCIM>
-
-    <!--SessionContextCache>
-        <Enable>true</Enable>
-        <Capacity>100000</Capacity>
-    </SessionContextCache-->
-
-    <EventListeners>
-        <EventListener type="org.wso2.carbon.user.core.listener.UserOperationEventListener"
-                       name="org.wso2.carbon.identity.workflow.mgt.impl.userstore.UserStoreActionListener"
-                       orderId="10" enable="false"/>
-        <EventListener type="org.wso2.carbon.user.core.listener.UserOperationEventListener" name="org.wso2.carbon.identity.mgt.IdentityMgtEventListener"
-                       orderId="50" enable="false"/>
-        <EventListener type="org.wso2.carbon.user.core.listener.UserOperationEventListener" name="org.wso2.carbon.identity.oauth.listener.IdentityOathEventListener"
-                       orderId="60" enable="false"/>
-        <EventListener type="org.wso2.carbon.user.core.listener.UserOperationEventListener" name="org.wso2.carbon.identity.provider.openid.listener.IdentityOpenIDUserEventListener"
-                       orderId="70" enable="false"/>
-    </EventListeners>
+    <!--To do OSGI invocations to OAuth2Service,when the entire server is in one JVM -->
+    <SeparateBackEnd>false</SeparateBackEnd>
 </Server>
\ No newline at end of file
diff --git a/modules/distribution/apim-resources/customsequences/fault/json_fault.xml b/modules/distribution/src/repository/conf/resources/customsequences/fault/json_fault.xml
similarity index 100%
rename from modules/distribution/apim-resources/customsequences/fault/json_fault.xml
rename to modules/distribution/src/repository/conf/resources/customsequences/fault/json_fault.xml
diff --git a/modules/distribution/apim-resources/customsequences/in/json_to_xml_in_message.xml b/modules/distribution/src/repository/conf/resources/customsequences/in/json_to_xml_in_message.xml
similarity index 100%
rename from modules/distribution/apim-resources/customsequences/in/json_to_xml_in_message.xml
rename to modules/distribution/src/repository/conf/resources/customsequences/in/json_to_xml_in_message.xml
diff --git a/modules/distribution/apim-resources/customsequences/in/log_in_message.xml b/modules/distribution/src/repository/conf/resources/customsequences/in/log_in_message.xml
similarity index 100%
rename from modules/distribution/apim-resources/customsequences/in/log_in_message.xml
rename to modules/distribution/src/repository/conf/resources/customsequences/in/log_in_message.xml
diff --git a/modules/distribution/apim-resources/customsequences/in/preserve_accept_header.xml b/modules/distribution/src/repository/conf/resources/customsequences/in/preserve_accept_header.xml
similarity index 100%
rename from modules/distribution/apim-resources/customsequences/in/preserve_accept_header.xml
rename to modules/distribution/src/repository/conf/resources/customsequences/in/preserve_accept_header.xml
diff --git a/modules/distribution/apim-resources/customsequences/in/xml_to_json_in_message.xml b/modules/distribution/src/repository/conf/resources/customsequences/in/xml_to_json_in_message.xml
similarity index 100%
rename from modules/distribution/apim-resources/customsequences/in/xml_to_json_in_message.xml
rename to modules/distribution/src/repository/conf/resources/customsequences/in/xml_to_json_in_message.xml
diff --git a/modules/distribution/apim-resources/customsequences/out/apply_accept_header.xml b/modules/distribution/src/repository/conf/resources/customsequences/out/apply_accept_header.xml
similarity index 100%
rename from modules/distribution/apim-resources/customsequences/out/apply_accept_header.xml
rename to modules/distribution/src/repository/conf/resources/customsequences/out/apply_accept_header.xml
diff --git a/modules/distribution/apim-resources/customsequences/out/json_to_xml_out_message.xml b/modules/distribution/src/repository/conf/resources/customsequences/out/json_to_xml_out_message.xml
similarity index 100%
rename from modules/distribution/apim-resources/customsequences/out/json_to_xml_out_message.xml
rename to modules/distribution/src/repository/conf/resources/customsequences/out/json_to_xml_out_message.xml
diff --git a/modules/distribution/apim-resources/customsequences/out/log_out_message.xml b/modules/distribution/src/repository/conf/resources/customsequences/out/log_out_message.xml
similarity index 100%
rename from modules/distribution/apim-resources/customsequences/out/log_out_message.xml
rename to modules/distribution/src/repository/conf/resources/customsequences/out/log_out_message.xml
diff --git a/modules/distribution/apim-resources/customsequences/out/xml_to_json_out_message.xml b/modules/distribution/src/repository/conf/resources/customsequences/out/xml_to_json_out_message.xml
similarity index 100%
rename from modules/distribution/apim-resources/customsequences/out/xml_to_json_out_message.xml
rename to modules/distribution/src/repository/conf/resources/customsequences/out/xml_to_json_out_message.xml
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/api/_AuthorizeAPI_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/api/_AuthorizeAPI_.xml
new file mode 100644
index 00000000..4221f0c2
--- /dev/null
+++ b/modules/distribution/src/repository/conf/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('keyManager.port')"/>
+	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <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>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/api/_RevokeAPI_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/api/_RevokeAPI_.xml
new file mode 100644
index 00000000..8a72d753
--- /dev/null
+++ b/modules/distribution/src/repository/conf/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('keyManager.port')"/>
+	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <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>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/api/_TokenAPI_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/api/_TokenAPI_.xml
new file mode 100644
index 00000000..43268da1
--- /dev/null
+++ b/modules/distribution/src/repository/conf/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('keyManager.port')"/>
+	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <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>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/proxy-services/WorkflowCallbackService.xml b/modules/distribution/src/repository/conf/synapse-configs/default/proxy-services/WorkflowCallbackService.xml
new file mode 100644
index 00000000..722d81b0
--- /dev/null
+++ b/modules/distribution/src/repository/conf/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>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/registry.xml b/modules/distribution/src/repository/conf/synapse-configs/default/registry.xml
new file mode 100644
index 00000000..b19a4c89
--- /dev/null
+++ b/modules/distribution/src/repository/conf/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>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_auth_failure_handler_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_auth_failure_handler_.xml
new file mode 100644
index 00000000..5a5213d8
--- /dev/null
+++ b/modules/distribution/src/repository/conf/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>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_build_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_build_.xml
new file mode 100644
index 00000000..64e8fe39
--- /dev/null
+++ b/modules/distribution/src/repository/conf/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>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_cors_request_handler_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_cors_request_handler_.xml
new file mode 100644
index 00000000..503bc372
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_cors_request_handler_.xml
@@ -0,0 +1,21 @@
+<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>
+      </then>
+   </filter>
+</sequence>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_production_key_error_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_production_key_error_.xml
new file mode 100644
index 00000000..77199419
--- /dev/null
+++ b/modules/distribution/src/repository/conf/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>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_resource_mismatch_handler_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_resource_mismatch_handler_.xml
new file mode 100644
index 00000000..f88ce6b6
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_resource_mismatch_handler_.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="_resource_mismatch_handler_">
+    <property name="ERROR_CODE" value="403"/>
+    <property name="ERROR_MESSAGE" value="No matching resource found in the API for the given request"/>
+    <property name="CUSTOM_HTTP_SC" value="403"/>
+    <sequence key="fault"/>
+</sequence>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_sandbox_key_error_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_sandbox_key_error_.xml
new file mode 100644
index 00000000..12906f2e
--- /dev/null
+++ b/modules/distribution/src/repository/conf/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>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_throttle_out_handler_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_throttle_out_handler_.xml
new file mode 100644
index 00000000..40e81240
--- /dev/null
+++ b/modules/distribution/src/repository/conf/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.usage.publisher.APIMgtThrottleUsageHandler"/>
+    <sequence key="_cors_request_handler_"/>
+</sequence>
\ No newline at end of file
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_token_fault_.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/_token_fault_.xml
new file mode 100644
index 00000000..1e4a9825
--- /dev/null
+++ b/modules/distribution/src/repository/conf/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>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/fault.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/fault.xml
new file mode 100644
index 00000000..3b915492
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/fault.xml
@@ -0,0 +1,72 @@
+<?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)).*$">
+                <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>
+    <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"/>
+    <sequence key="_cors_request_handler_"/>
+    <send/>
+</sequence>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/sequences/main.xml b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/main.xml
new file mode 100644
index 00000000..9063e8ad
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse-configs/default/sequences/main.xml
@@ -0,0 +1,98 @@
+<?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/>
+        </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)).*$">
+            <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>
diff --git a/modules/distribution/src/repository/conf/synapse-configs/default/synapse.xml b/modules/distribution/src/repository/conf/synapse-configs/default/synapse.xml
new file mode 100644
index 00000000..d7f60ec4
--- /dev/null
+++ b/modules/distribution/src/repository/conf/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>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index e123bddb..47a538af 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -135,7 +135,7 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.server.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
-                                <!-- End of Device Management Features -->
+                                 End of Device Management Features
 
                                 <!-- Jaggery Features -->
                                 <featureArtifactDef>
@@ -291,7 +291,7 @@
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.core.feature:${carbon.identity.version}
                                 </feaureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.user.registration.server.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.self.registration.server.feature:${carbon.identity.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.server.feature:${carbon.identity.version}
@@ -302,9 +302,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.provider.server.feature:${carbon.identity.version}
                                 </featureArtifactDef>
-                                <!--<featureArtifactDef>-->
-                                    <!--org.wso2.carbon.identity:org.wso2.carbon.identity.relying.party.server.feature:${carbon.identity.version}-->
-                                <!--</featureArtifactDef>-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.relying.party.server.feature:${carbon.identity.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.client.feature:${carbon.identity.version}
                                 </featureArtifactDef>
@@ -376,6 +376,14 @@
                                     org.apache.axis2.transport:org.apache.axis2.transport.mail.feature:${axis2-transports.wso2.version}
                                 </featureArtifactDef>
 
+
+                                <!--- TCP Transport -->
+                                <featureArtifactDef>
+                                    org.apache.axis2.transport:org.apache.axis2.transport.tcp.feature:${axis2-transports.wso2.version}
+                                </featureArtifactDef>
+
+
+
                                 <!-- Registry task feature and dependencies -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.ntask.feature:${carbon.commons.version}
@@ -497,14 +505,34 @@
 									org.wso2.ciphertool:org.wso2.ciphertool.feature:${ciphertool.version}
 								</feaureArtifactDef>
 
-								<!--<axis2-transports.wso2.version>1.1.0-wso2v12</axis2-transports.wso2.version>-->
 
 								<!-- End of Enterprise Store Features -->
 								<!--=====================================================================================================-->
+
                                 <featureArtifactDef>
                                     org.wso2.carbon.mediation:org.apache.synapse.wso2.feature:${carbon.mediation.version}
                                 </featureArtifactDef>
-
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.mediation.initializer.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.task.server.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.apache.synapse.transport.nhttp.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.inbound.endpoints.server.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.mediation.ntask.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.mediation:org.wso2.carbon.mediation.admin.feature:${carbon.mediation.version}-->
+                                <!--</featureArtifactDef>-->
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.deployment:org.wso2.carbon.service.mgt.server.feature:${carbon.deployment.version}-->
+                                <!--</featureArtifactDef>-->
 
                                 <!--APIM feature-->
                                 <featureArtifactDef>
@@ -919,10 +947,10 @@
                                     <id>org.wso2.carbon.identity.core.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.identity.self.registration.server.feature.group</id>-->
-                                    <!--<version>${carbon.identity.version}</version>-->
-                                <!--</feature>-->
+                                <feature>
+                                    <id>org.wso2.carbon.identity.self.registration.server.feature.group</id>
+                                    <version>${carbon.identity.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.oauth.feature.group</id>
                                     <version>${carbon.identity.version}</version>
@@ -931,10 +959,10 @@
                                     <id>org.wso2.carbon.identity.provider.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.identity.relying.party.server.feature.group</id>-->
-                                    <!--<version>${carbon.identity.version}</version>-->
-                                <!--</feature>-->
+                                <feature>
+                                    <id>org.wso2.carbon.identity.relying.party.server.feature.group</id>
+                                    <version>${carbon.identity.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.um.ws.service.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
@@ -1033,6 +1061,43 @@
                                     <id>org.wso2.carbon.apimgt.store.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.initializer.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.task.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.apache.synapse.transport.nhttp.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.apache.synapse.wso2.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <!-- TCP transport Synapse -->
+                                <feature>
+                                    <id>org.apache.axis2.transport.tcp.feature.group</id>
+                                    <version>${axis2-transports.wso2.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.inbound.endpoints.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.ntask.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.mediation.admin.feature.group</id>-->
+                                    <!--<version>${carbon.mediation.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.service.mgt.server.feature.group</id>-->
+                                    <!--<version>${carbon.deployment.version}</version>-->
+                                <!--</feature>-->
                                 <!-- End of API Management Features -->
 
                                 <!-- Notification Support: Mail -->
@@ -1041,6 +1106,9 @@
                                     <version>${axis2-transports.wso2.version}</version>
                                 </feature>
 
+
+
+
                                 <!-- Device  Store Features -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.enterprise.store.feature.group</id>
diff --git a/pom.xml b/pom.xml
index 61c9005d..23cea62b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -856,7 +856,7 @@
         <carbon.deployment.version>4.5.2</carbon.deployment.version>
 
         <!-- Carbon Identity -->
-        <carbon.identity.version>4.5.10-SNAPSHOT</carbon.identity.version>
+        <carbon.identity.version>4.5.6</carbon.identity.version>
 
         <!-- Carbon Multi-tenancy -->
         <carbon.multitenancy.version>4.4.1</carbon.multitenancy.version>
@@ -879,8 +879,7 @@
         <carbon.mediation.version>4.4.5</carbon.mediation.version>
 
         <!-- API Management -->
-        <carbon.api.mgt.version>1.3.0-SNAPSHOT</carbon.api.mgt.version>
-        <apimserver.version>1.10.0-SNAPSHOT</apimserver.version>
+        <carbon.api.mgt.version>4.3.0-SNAPSHOT</carbon.api.mgt.version>
 
         <!-- Tomcat -->
         <orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
@@ -892,17 +891,17 @@
         <bouncycastle.version>1.49</bouncycastle.version>
         <apache.wss4j.version>2.0.0</apache.wss4j.version>
         <codehaus.plexus.version>3.0.21</codehaus.plexus.version>
-        <axis2-transports.wso2.version>1.1.0-wso2v13</axis2-transports.wso2.version>
+        <axis2-transports.wso2.version>1.1.0-wso2v12</axis2-transports.wso2.version>
 
         <!--DAS-->
-        <carbon.analytics.version>1.0.3-SNAPSHOT</carbon.analytics.version>
+        <carbon.analytics.version>1.0.3</carbon.analytics.version>
         <carbon.analytics.common.version>5.0.2</carbon.analytics.common.version>
-        <das.release.version>3.0.0-SNAPSHOT</das.release.version>
-        <carbon.data.version>4.3.1-SNAPSHOT</carbon.data.version>
         <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
         <shindig.version>1.0.0</shindig.version>
-        <carbon.dashboard.version>1.0.1-SNAPSHOT</carbon.dashboard.version>
         <carbon.event-processing.version>2.0.5</carbon.event-processing.version>
+        <das.release.version>3.0.0-SNAPSHOT</das.release.version>
+        <carbon.data.version>4.3.1-SNAPSHOT</carbon.data.version>
+        <carbon.dashboard.version>1.0.1-SNAPSHOT</carbon.dashboard.version>
 
 
         <orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient>

From ca11c630ad123d620c6a0b8b69ed028dff7d738d Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Thu, 1 Oct 2015 16:10:10 +0530
Subject: [PATCH 4/4] APIM, Store, DAS features merged to one pack

---
 .../distribution/identity_config_change.xml   |   12 +
 modules/distribution/pom.xml                  |  419 +++---
 .../customsequences/fault/json_fault.xml      |    0
 .../in/json_to_xml_in_message.xml             |    0
 .../customsequences/in/log_in_message.xml     |    0
 .../in/preserve_accept_header.xml             |    0
 .../in/xml_to_json_in_message.xml             |    0
 .../out/apply_accept_header.xml               |    0
 .../out/json_to_xml_out_message.xml           |    0
 .../customsequences/out/log_out_message.xml   |    0
 .../out/xml_to_json_out_message.xml           |    0
 .../src/api-resource/sql/h2-sample-data.sql   |   67 +
 .../distribution/src/api-resource/sql/h2.sql  |  735 ++++++++++
 .../src/api-resource/sql/mssql.sql            |  815 ++++++++++++
 .../src/api-resource/sql/mysql.sql            |  752 +++++++++++
 .../src/api-resource/sql/mysql_cluster.sql    |  752 +++++++++++
 .../src/api-resource/sql/oracle.sql           | 1181 +++++++++++++++++
 .../src/api-resource/sql/oracle_rac.sql       | 1180 ++++++++++++++++
 .../src/api-resource/sql/postgresql.sql       |  859 ++++++++++++
 modules/distribution/src/assembly/bin.xml     |  420 +++---
 .../src/repository/conf/axis2/axis2.xml       | 1075 +++++++++------
 .../identity/identity-providers/default.xml   |   24 -
 .../identity/service-providers/default.xml    |   49 -
 .../identity/service-providers/sp_cdm.xml     |   49 -
 .../service-providers/sp_dashboard.xml        |   49 -
 .../identity/service-providers/sp_mdm.xml     |   49 -
 .../src/repository/conf/synapse.properties    |   42 +
 modules/p2-profile-gen/pom.xml                |  395 +++---
 pom.xml                                       |  241 ++--
 29 files changed, 7691 insertions(+), 1474 deletions(-)
 create mode 100644 modules/distribution/identity_config_change.xml
 rename modules/distribution/src/{repository/conf/resources => api-resource}/customsequences/fault/json_fault.xml (100%)
 rename modules/distribution/src/{repository/conf/resources => api-resource}/customsequences/in/json_to_xml_in_message.xml (100%)
 rename modules/distribution/src/{repository/conf/resources => api-resource}/customsequences/in/log_in_message.xml (100%)
 rename modules/distribution/src/{repository/conf/resources => api-resource}/customsequences/in/preserve_accept_header.xml (100%)
 rename modules/distribution/src/{repository/conf/resources => api-resource}/customsequences/in/xml_to_json_in_message.xml (100%)
 rename modules/distribution/src/{repository/conf/resources => api-resource}/customsequences/out/apply_accept_header.xml (100%)
 rename modules/distribution/src/{repository/conf/resources => api-resource}/customsequences/out/json_to_xml_out_message.xml (100%)
 rename modules/distribution/src/{repository/conf/resources => api-resource}/customsequences/out/log_out_message.xml (100%)
 rename modules/distribution/src/{repository/conf/resources => api-resource}/customsequences/out/xml_to_json_out_message.xml (100%)
 create mode 100644 modules/distribution/src/api-resource/sql/h2-sample-data.sql
 create mode 100644 modules/distribution/src/api-resource/sql/h2.sql
 create mode 100644 modules/distribution/src/api-resource/sql/mssql.sql
 create mode 100644 modules/distribution/src/api-resource/sql/mysql.sql
 create mode 100644 modules/distribution/src/api-resource/sql/mysql_cluster.sql
 create mode 100644 modules/distribution/src/api-resource/sql/oracle.sql
 create mode 100644 modules/distribution/src/api-resource/sql/oracle_rac.sql
 create mode 100644 modules/distribution/src/api-resource/sql/postgresql.sql
 delete mode 100644 modules/distribution/src/repository/conf/identity/identity-providers/default.xml
 delete mode 100644 modules/distribution/src/repository/conf/identity/service-providers/default.xml
 delete mode 100644 modules/distribution/src/repository/conf/identity/service-providers/sp_cdm.xml
 delete mode 100644 modules/distribution/src/repository/conf/identity/service-providers/sp_dashboard.xml
 delete mode 100644 modules/distribution/src/repository/conf/identity/service-providers/sp_mdm.xml
 create mode 100644 modules/distribution/src/repository/conf/synapse.properties

diff --git a/modules/distribution/identity_config_change.xml b/modules/distribution/identity_config_change.xml
new file mode 100644
index 00000000..c0c0c6ee
--- /dev/null
+++ b/modules/distribution/identity_config_change.xml
@@ -0,0 +1,12 @@
+<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.identity.oauth2.validators.JDBCScopeValidator"/>]]></value>
+   </add>
+</processor>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 31a17cc7..48fe1c6f 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -93,58 +93,13 @@
 				</executions>
 			</plugin>
 
-			<!--============ Add Server Roles for DAS ===============-->
 
-			<!--<execution>-->
-			<!--<id>add-server-roles</id>-->
-			<!--<phase>prepare-package</phase>-->
-			<!--<configuration>-->
-			<!--<target>-->
-			<!--<echo message="Using xml task to add server roles"/>-->
-			<!--&lt;!&ndash;<taskdef name="xmltask"&ndash;&gt;-->
-			<!--&lt;!&ndash;classname="com.oopsconsultancy.xmltask.ant.XmlTask"&ndash;&gt;-->
-			<!--&lt;!&ndash;classpathref="maven.plugin.classpath"/>&ndash;&gt;-->
-			<!--<xmltask-->
-			<!--source="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"-->
-			<!--dest="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"-->
-			<!--preserveType="true">-->
-			<!--<insert path="/Server/ServerRoles/">-->
-			<!--<![CDATA[-->
-			<!--<Role>DataAnalyticsServer</Role>-->
-			<!--<Role>ComplexEventProcessor</Role>-->
-			<!--]]>-->
-			<!--</insert>-->
-			<!--</xmltask>-->
-			<!--</target>-->
-			<!--</configuration>-->
-			<!--<goals>-->
-			<!--<goal>run</goal>-->
-			<!--</goals>-->
-			<!--</execution>-->
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
 				<executions>
 
-					<execution>
-						<id>1-replace-datasource-property-thrift-authentication</id>
-						<phase>package</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<tasks>
-								<echo message="Replace DataSource to WSO2AM_DB"/>
-								<replace
-										file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/thrift-authentication.xml"
-										token="jdbc/WSO2CarbonDB"
-										value="jdbc/WSO2AM_DB"
-										/>
-							</tasks>
-						</configuration>
-					</execution>
-
 					<!--============ Added with ES Features ===============-->
 
 					<execution>
@@ -227,179 +182,6 @@
 							</tasks>
 						</configuration>
 					</execution>
-					<!--<execution>-->
-					<!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
-					<!--<id>create-firealarm-schema</id>-->
-					<!--<phase>package</phase>-->
-					<!--<goals>-->
-					<!--<goal>run</goal>-->
-					<!--</goals>-->
-					<!--<configuration>-->
-					<!--<tasks>-->
-					<!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples/firealarm/database"/>-->
-					<!--<property name="db.dir"-->
-					<!--value="target/wso2carbon-core-${carbon.kernel.version}/samples/firealarm/database"/>-->
-					<!--<property name="userid" value="wso2carbon"/>-->
-					<!--<property name="password" value="wso2carbon"/>-->
-					<!--<property name="dbURL"-->
-					<!--value="jdbc:h2:file:${basedir}/${db.dir}/FireAlarmDM_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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_firealarm.sql"/>-->
-					<!--</sql>-->
-					<!--</tasks>-->
-					<!--</configuration>-->
-					<!--</execution>-->
-
-					<!--<execution>-->
-					<!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
-					<!--<id>create-sensebot-schema</id>-->
-					<!--<phase>package</phase>-->
-					<!--<goals>-->
-					<!--<goal>run</goal>-->
-					<!--</goals>-->
-					<!--<configuration>-->
-					<!--<tasks>-->
-					<!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples/sensebot/database"/>-->
-					<!--<property name="db.dir"-->
-					<!--value="target/wso2carbon-core-${carbon.kernel.version}/samples/sensebot/database"/>-->
-					<!--<property name="userid" value="wso2carbon"/>-->
-					<!--<property name="password" value="wso2carbon"/>-->
-					<!--<property name="dbURL"-->
-					<!--value="jdbc:h2:file:${basedir}/${db.dir}/SensebotDM_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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_sensebot.sql"/>-->
-					<!--</sql>-->
-					<!--</tasks>-->
-					<!--</configuration>-->
-					<!--</execution>-->
-
-					<!--<execution>-->
-					<!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
-					<!--<id>create-arduino-schema</id>-->
-					<!--<phase>package</phase>-->
-					<!--<goals>-->
-					<!--<goal>run</goal>-->
-					<!--</goals>-->
-					<!--<configuration>-->
-					<!--<tasks>-->
-					<!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/database"/>-->
-					<!--<property name="db.dir"-->
-					<!--value="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/database"/>-->
-					<!--<property name="userid" value="wso2carbon"/>-->
-					<!--<property name="password" value="wso2carbon"/>-->
-					<!--<property name="dbURL"-->
-					<!--value="jdbc:h2:file:${basedir}/${db.dir}/ArduinoDM_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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_arduino.sql"/>-->
-					<!--</sql>-->
-					<!--</tasks>-->
-					<!--</configuration>-->
-					<!--</execution>-->
-
-					<!--<execution>-->
-					<!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
-					<!--<id>create-android-sense-schema</id>-->
-					<!--<phase>package</phase>-->
-					<!--<goals>-->
-					<!--<goal>run</goal>-->
-					<!--</goals>-->
-					<!--<configuration>-->
-					<!--<tasks>-->
-					<!--<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}/AndroidSenseDM_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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_android_sense.sql"/>-->
-					<!--</sql>-->
-					<!--</tasks>-->
-					<!--</configuration>-->
-					<!--</execution>-->
-
-					<!--<execution>-->
-					<!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
-					<!--<id>create-raspberrypi-schema</id>-->
-					<!--<phase>package</phase>-->
-					<!--<goals>-->
-					<!--<goal>run</goal>-->
-					<!--</goals>-->
-					<!--<configuration>-->
-					<!--<tasks>-->
-					<!--<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}/RaspberrypiDM_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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_raspberrypi.sql"/>-->
-					<!--</sql>-->
-					<!--</tasks>-->
-					<!--</configuration>-->
-					<!--</execution>-->
-
-					<!--<execution>-->
-					<!--&lt;!&ndash; Creating IOT Management schema &ndash;&gt;-->
-					<!--<id>create-digitaldisply-schema</id>-->
-					<!--<phase>package</phase>-->
-					<!--<goals>-->
-					<!--<goal>run</goal>-->
-					<!--</goals>-->
-					<!--<configuration>-->
-					<!--<tasks>-->
-					<!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/samples/digital_display/database"/>-->
-					<!--<property name="db.dir"-->
-					<!--value="target/wso2carbon-core-${carbon.kernel.version}/samples/digital_display/database"/>-->
-					<!--<property name="userid" value="wso2carbon"/>-->
-					<!--<property name="password" value="wso2carbon"/>-->
-					<!--<property name="dbURL"-->
-					<!--value="jdbc:h2:file:${basedir}/${db.dir}/DigitalDisplayDM_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-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/plugins/h2_digital_display.sql"/>-->
-					<!--</sql>-->
-					<!--</tasks>-->
-					<!--</configuration>-->
-					<!--</execution>-->
-
-
 					<execution>
 						<id>3-extract-apps-from-components</id>
 						<phase>package</phase>
@@ -525,65 +307,75 @@
 					</execution>
 
 					<!--Install default samples-->
-					<execution>
-						<id>install_samples</id>
-						<phase>package</phase>
-						<configuration>
-							<tasks>
-								<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/conf/iot"/>
+					<!--<execution>-->
+						<!--<id>install_samples</id>-->
+						<!--<phase>package</phase>-->
+						<!--<configuration>-->
+							<!--<tasks>-->
+								<!--<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/resources/conf/iot"/>-->
 
-								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot"
-									  overwrite="true">
-									<fileset
-											file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot-config.xml"/>
-								</copy>
+								<!--<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot"-->
+									  <!--overwrite="true">-->
+									<!--<fileset-->
+											<!--file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot-config.xml"/>-->
+								<!--</copy>-->
 
-								<subant target="deploy">
-									<fileset
-											dir="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino"
-											includes="build.xml"/>
-								</subant>
-								<subant target="deploy">
-									<fileset
-											dir="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi"
-											includes="build.xml"/>
-								</subant>
-								<copy todir="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/"
-									  overwrite="true">
-									<fileset
-											file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot/iot-config.xml"/>
-								</copy>
-								<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml"
-									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml.disable"/>
-								<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml"
-									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml.disable"/>
-								<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/sample_pom.xml"
-									  toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/pom.xml"
-									  overwrite="true"/>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
+								<!--<subant target="deploy">-->
+									<!--<fileset-->
+											<!--dir="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino"-->
+											<!--includes="build.xml"/>-->
+								<!--</subant>-->
+								<!--<subant target="deploy">-->
+									<!--<fileset-->
+											<!--dir="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi"-->
+											<!--includes="build.xml"/>-->
+								<!--</subant>-->
+								<!--<copy todir="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/"-->
+									  <!--overwrite="true">-->
+									<!--<fileset-->
+											<!--file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/iot/iot-config.xml"/>-->
+								<!--</copy>-->
+								<!--<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml"-->
+									  <!--toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/arduino/build.xml.disable"/>-->
+								<!--<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml"-->
+									  <!--toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/raspberrypi/build.xml.disable"/>-->
+								<!--<move file="target/wso2carbon-core-${carbon.kernel.version}/samples/sample_pom.xml"-->
+									  <!--toFile="target/wso2carbon-core-${carbon.kernel.version}/samples/pom.xml"-->
+									  <!--overwrite="true"/>-->
+							<!--</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 file="target/wso2iot-${project.version}.jar"/>-->
+								<!--<delete dir="target/sources"/>-->
+								<!--<delete dir="target/site"/>-->
+								<!--<delete dir="target/antrun"/>-->
+								<!--<delete dir="src/site"/>-->
+								<!--&lt;!&ndash;<delete dir="target/shindig" />&ndash;&gt;-->
+								<!--<delete dir="target/jaxwebapps"/>-->
+							<!--</tasks>-->
+
 							<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 file="target/wso2iot-${project.version}.jar"/>
+								<delete dir="target/wso2carbon-core-${carbon.platform.version}"/>
 								<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>
@@ -635,6 +427,105 @@
 				</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>prepare-package</phase>
+						<goals>
+							<goal>replace</goal>
+						</goals>
+						<configuration>
+							<file>${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.platform.version}/repository/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/OAuthCallbackHandlers</xpath>-->
+									<!--<token>(org.wso2.carbon.identity.oauth.callback.DefaultCallbackHandler)</token>-->
+									<!--<value>org.wso2.carbon.apimgt.keymgt.util.APIManagerOAuthCallbackHandler</value>-->
+								<!--</replacement>-->
+
+							</replacements>
+						</configuration>
+					</execution>
+					<!-- 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-gen/target/wso2carbon-core-${carbon.platform.version}/repository/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 scope validator to the identity.xml file -->
+			<plugin>
+				<groupId>com.google.code.maven-config-processor-plugin</groupId>
+				<artifactId>config-processor-maven-plugin</artifactId>
+				<version>2.6</version>
+				<executions>
+					<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-gen/target/wso2carbon-core-${carbon.platform.version}/repository/conf/identity/identity.xml</input>
+									<output>../../p2-profile-gen/target/wso2carbon-core-${carbon.platform.version}/repository/conf/identity/identity.xml</output>
+									<config>identity_config_change.xml</config>
+								</transformation>
+							</transformations>
+							<namespaceContexts>
+								<s>http://wso2.org/projects/carbon/carbon.xml</s>
+							</namespaceContexts>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
 			<plugin>
 				   <groupId>org.apache.maven.plugins</groupId>
 				   <artifactId>maven-clean-plugin</artifactId>
diff --git a/modules/distribution/src/repository/conf/resources/customsequences/fault/json_fault.xml b/modules/distribution/src/api-resource/customsequences/fault/json_fault.xml
similarity index 100%
rename from modules/distribution/src/repository/conf/resources/customsequences/fault/json_fault.xml
rename to modules/distribution/src/api-resource/customsequences/fault/json_fault.xml
diff --git a/modules/distribution/src/repository/conf/resources/customsequences/in/json_to_xml_in_message.xml b/modules/distribution/src/api-resource/customsequences/in/json_to_xml_in_message.xml
similarity index 100%
rename from modules/distribution/src/repository/conf/resources/customsequences/in/json_to_xml_in_message.xml
rename to modules/distribution/src/api-resource/customsequences/in/json_to_xml_in_message.xml
diff --git a/modules/distribution/src/repository/conf/resources/customsequences/in/log_in_message.xml b/modules/distribution/src/api-resource/customsequences/in/log_in_message.xml
similarity index 100%
rename from modules/distribution/src/repository/conf/resources/customsequences/in/log_in_message.xml
rename to modules/distribution/src/api-resource/customsequences/in/log_in_message.xml
diff --git a/modules/distribution/src/repository/conf/resources/customsequences/in/preserve_accept_header.xml b/modules/distribution/src/api-resource/customsequences/in/preserve_accept_header.xml
similarity index 100%
rename from modules/distribution/src/repository/conf/resources/customsequences/in/preserve_accept_header.xml
rename to modules/distribution/src/api-resource/customsequences/in/preserve_accept_header.xml
diff --git a/modules/distribution/src/repository/conf/resources/customsequences/in/xml_to_json_in_message.xml b/modules/distribution/src/api-resource/customsequences/in/xml_to_json_in_message.xml
similarity index 100%
rename from modules/distribution/src/repository/conf/resources/customsequences/in/xml_to_json_in_message.xml
rename to modules/distribution/src/api-resource/customsequences/in/xml_to_json_in_message.xml
diff --git a/modules/distribution/src/repository/conf/resources/customsequences/out/apply_accept_header.xml b/modules/distribution/src/api-resource/customsequences/out/apply_accept_header.xml
similarity index 100%
rename from modules/distribution/src/repository/conf/resources/customsequences/out/apply_accept_header.xml
rename to modules/distribution/src/api-resource/customsequences/out/apply_accept_header.xml
diff --git a/modules/distribution/src/repository/conf/resources/customsequences/out/json_to_xml_out_message.xml b/modules/distribution/src/api-resource/customsequences/out/json_to_xml_out_message.xml
similarity index 100%
rename from modules/distribution/src/repository/conf/resources/customsequences/out/json_to_xml_out_message.xml
rename to modules/distribution/src/api-resource/customsequences/out/json_to_xml_out_message.xml
diff --git a/modules/distribution/src/repository/conf/resources/customsequences/out/log_out_message.xml b/modules/distribution/src/api-resource/customsequences/out/log_out_message.xml
similarity index 100%
rename from modules/distribution/src/repository/conf/resources/customsequences/out/log_out_message.xml
rename to modules/distribution/src/api-resource/customsequences/out/log_out_message.xml
diff --git a/modules/distribution/src/repository/conf/resources/customsequences/out/xml_to_json_out_message.xml b/modules/distribution/src/api-resource/customsequences/out/xml_to_json_out_message.xml
similarity index 100%
rename from modules/distribution/src/repository/conf/resources/customsequences/out/xml_to_json_out_message.xml
rename to modules/distribution/src/api-resource/customsequences/out/xml_to_json_out_message.xml
diff --git a/modules/distribution/src/api-resource/sql/h2-sample-data.sql b/modules/distribution/src/api-resource/sql/h2-sample-data.sql
new file mode 100644
index 00000000..2f7f2792
--- /dev/null
+++ b/modules/distribution/src/api-resource/sql/h2-sample-data.sql
@@ -0,0 +1,67 @@
+DELETE FROM AM_SUBSCRIPTION_KEY_MAPPING;
+DELETE FROM AM_APPLICATION_KEY_MAPPING;
+DELETE FROM AM_SUBSCRIPTION ;
+DELETE FROM AM_APPLICATION ;
+DELETE FROM AM_SUBSCRIBER;
+DELETE FROM AM_API;
+DELETE FROM IDN_OAUTH2_ACCESS_TOKEN ;
+DELETE FROM IDN_OAUTH_CONSUMER_APPS;
+
+ALTER TABLE AM_SUBSCRIBER ALTER COLUMN SUBSCRIBER_ID RESTART WITH 1;
+ALTER TABLE AM_APPLICATION ALTER COLUMN APPLICATION_ID RESTART WITH 100;
+ALTER TABLE AM_API ALTER COLUMN API_ID RESTART WITH 500;
+ALTER TABLE AM_SUBSCRIPTION ALTER COLUMN SUBSCRIPTION_ID RESTART WITH 1000;
+
+INSERT INTO AM_SUBSCRIBER ( USER_ID , TENANT_ID , EMAIL_ADDRESS , DATE_SUBSCRIBED ) VALUES ('SUMEDHA',-1234,'SUMEDHA@WSO2.COM','2012-03-05 12:10:11');
+INSERT INTO AM_SUBSCRIBER ( USER_ID , TENANT_ID , EMAIL_ADDRESS , DATE_SUBSCRIBED ) VALUES ('PRABATH',-1234,'PRABATH@WSO2.COM','2012-03-05 12:10:11');
+INSERT INTO AM_SUBSCRIBER ( USER_ID , TENANT_ID , EMAIL_ADDRESS , DATE_SUBSCRIBED ) VALUES ('THILINA',-1234,'THILINA@WSO2.COM','2012-03-05 12:10:11');
+INSERT INTO AM_SUBSCRIBER ( USER_ID , TENANT_ID , EMAIL_ADDRESS , DATE_SUBSCRIBED ) VALUES ('UDAYANGA',-1234,'UDAYANGA@WSO2.COM','2012-03-05 12:10:11');
+
+
+INSERT INTO AM_APPLICATION  (NAME,SUBSCRIBER_ID ) VALUES ('APPLICATION1',1);
+INSERT INTO AM_APPLICATION  (NAME,SUBSCRIBER_ID ) VALUES ('APPLICATION2',1);
+INSERT INTO AM_APPLICATION  (NAME,SUBSCRIBER_ID ) VALUES ('APPLICATION3',2);
+INSERT INTO AM_APPLICATION  (NAME,SUBSCRIBER_ID ) VALUES ('APPLICATION4',2);
+INSERT INTO AM_APPLICATION  (NAME,SUBSCRIBER_ID ) VALUES ('APPLICATION5',3);
+INSERT INTO AM_APPLICATION  (NAME,SUBSCRIBER_ID ) VALUES ('DeliciousApp',4);
+
+INSERT INTO AM_API (API_PROVIDER,API_NAME,API_VERSION,CONTEXT) VALUES ('SUMEDHA', 'API1', 'V1.0.0','/context1');
+INSERT INTO AM_API (API_PROVIDER,API_NAME,API_VERSION,CONTEXT) VALUES ('PRABATH', 'API2', 'V1.0.0','/deli2');
+INSERT INTO AM_API (API_PROVIDER,API_NAME,API_VERSION,CONTEXT) VALUES ('ADMIN', 'API3', 'V1.0.0','/test');
+INSERT INTO AM_API (API_PROVIDER,API_NAME,API_VERSION,CONTEXT) VALUES ('DEL', 'Delicious', '1.0.0','/deli');
+
+INSERT INTO AM_SUBSCRIPTION  ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED ) VALUES ('T1',500,100,'2012-03-05 12:10:11');
+INSERT INTO AM_SUBSCRIPTION  ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED ) VALUES ('T1',501,101,'2012-03-05 12:10:11');
+INSERT INTO AM_SUBSCRIPTION  ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED ) VALUES ('T1',500,102,'2012-03-05 12:10:11');
+INSERT INTO AM_SUBSCRIPTION  ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED ) VALUES ('T1',502,103,'2012-03-05 12:10:11');
+INSERT INTO AM_SUBSCRIPTION  ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED ) VALUES ('T1',501,104,'2012-03-05 12:10:11');
+INSERT INTO AM_SUBSCRIPTION  ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED ) VALUES ('T1',503,105,'2012-03-05 12:10:11');
+INSERT INTO AM_SUBSCRIPTION  ( TIER_ID , API_ID , APPLICATION_ID , LAST_ACCESSED ) VALUES ('T1',501,102,'2012-03-05 12:10:11');
+
+INSERT INTO AM_SUBSCRIPTION_KEY_MAPPING (SUBSCRIPTION_ID, ACCESS_TOKEN, KEY_TYPE) VALUES (1000, 'SSDCHEJJ-AWUIS-232', 'PRODUCTION');
+INSERT INTO AM_SUBSCRIPTION_KEY_MAPPING (SUBSCRIPTION_ID, ACCESS_TOKEN, KEY_TYPE) VALUES (1001, 'a1b2c3d4', 'SANDBOX');
+INSERT INTO AM_SUBSCRIPTION_KEY_MAPPING (SUBSCRIPTION_ID, ACCESS_TOKEN, KEY_TYPE) VALUES (1002, 'p1q2r3s4', 'PRODUCTION');
+
+INSERT INTO AM_APPLICATION_KEY_MAPPING (APPLICATION_ID, CONSUMER_KEY, KEY_TYPE) VALUES (100, 'CON1', 'PRODUCTION');
+INSERT INTO AM_APPLICATION_KEY_MAPPING (APPLICATION_ID, CONSUMER_KEY, KEY_TYPE) VALUES (100, 'CON2', 'SANDBOX');
+INSERT INTO AM_APPLICATION_KEY_MAPPING (APPLICATION_ID, CONSUMER_KEY, KEY_TYPE) VALUES (101, 'CON3', 'PRODUCTION');
+
+INSERT INTO IDN_OAUTH_CONSUMER_APPS ( APP_NAME , CALLBACK_URL , CONSUMER_KEY , CONSUMER_SECRET ,OAUTH_VERSION , TENANT_ID , USERNAME ) VALUES (NULL,NULL,'CON1','MY PEN','2.0',0,'PRABATH');
+INSERT INTO IDN_OAUTH_CONSUMER_APPS ( APP_NAME , CALLBACK_URL , CONSUMER_KEY , CONSUMER_SECRET ,OAUTH_VERSION , TENANT_ID , USERNAME ) VALUES (NULL,NULL,'CON2','MY PEN','2.0',0,'PRABATH');
+INSERT INTO IDN_OAUTH_CONSUMER_APPS ( APP_NAME , CALLBACK_URL , CONSUMER_KEY , CONSUMER_SECRET ,OAUTH_VERSION , TENANT_ID , USERNAME ) VALUES (NULL,NULL,'CON3','MY PEN','2.0',0,'admin');
+
+INSERT INTO IDN_OAUTH2_ACCESS_TOKEN ( TOKEN_ID, ACCESS_TOKEN ,AUTHZ_USER , USER_TYPE , CONSUMER_KEY , REFRESH_TOKEN ,TIME_CREATED , TOKEN_SCOPE_HASH , TOKEN_STATE ,VALIDITY_PERIOD ) VALUES ('TI1','a1b2c3d4','UDAYANGA','DEVELOPER','CON1',NULL,'2012-01-01','SANDBOXHASH','ACTIVE',1343714931875);
+INSERT INTO IDN_OAUTH2_ACCESS_TOKEN ( TOKEN_ID, ACCESS_TOKEN ,AUTHZ_USER , USER_TYPE , CONSUMER_KEY , REFRESH_TOKEN ,TIME_CREATED , TOKEN_SCOPE_HASH , TOKEN_STATE ,VALIDITY_PERIOD ) VALUES ('TI2','p1q2r3s4','UDAYANGA','DEVELOPER','CON1',NULL,'2012-01-01','PRODUCTIONHASH','ACTIVE',1343714931875);
+INSERT INTO IDN_OAUTH2_ACCESS_TOKEN ( TOKEN_ID, ACCESS_TOKEN ,AUTHZ_USER , USER_TYPE , CONSUMER_KEY , REFRESH_TOKEN ,TIME_CREATED , TOKEN_SCOPE_HASH , TOKEN_STATE ,VALIDITY_PERIOD ) VALUES ('TI3','test1','UDAYANGA','DEVELOPER','CON1',NULL,'2012-01-01','PRODUCTIONHASH','ACTIVE',1343714931875);
+INSERT INTO IDN_OAUTH2_ACCESS_TOKEN ( TOKEN_ID, ACCESS_TOKEN ,AUTHZ_USER , USER_TYPE , CONSUMER_KEY , REFRESH_TOKEN ,TIME_CREATED , TOKEN_SCOPE_HASH , TOKEN_STATE ,VALIDITY_PERIOD ) VALUES ('TI4','test2','UDAYANGA','DEVELOPER','CON2',NULL,'2012-01-01','SANDBOXHASH','ACTIVE',1343714931875);
+INSERT INTO IDN_OAUTH2_ACCESS_TOKEN ( TOKEN_ID, ACCESS_TOKEN ,AUTHZ_USER , USER_TYPE , CONSUMER_KEY , REFRESH_TOKEN ,TIME_CREATED , TOKEN_SCOPE_HASH , TOKEN_STATE ,VALIDITY_PERIOD ) VALUES ('TI5','test3','UDAYANGA','DEVELOPER','CON3',NULL,'2012-01-01','PRODUCTIONHASH','ACTIVE',3600);
+
+INSERT INTO IDN_OAUTH2_SCOPE_ASSOCIATION (TOKEN_ID, TOKEN_SCOPE ) VALUES ('TI1','SANDBOX')
+INSERT INTO IDN_OAUTH2_SCOPE_ASSOCIATION (TOKEN_ID, TOKEN_SCOPE ) VALUES ('TI2','PRODUCTION')
+INSERT INTO IDN_OAUTH2_SCOPE_ASSOCIATION (TOKEN_ID, TOKEN_SCOPE ) VALUES ('TI3','PRODUCTION')
+INSERT INTO IDN_OAUTH2_SCOPE_ASSOCIATION (TOKEN_ID, TOKEN_SCOPE ) VALUES ('TI4','SANDBOX')
+INSERT INTO IDN_OAUTH2_SCOPE_ASSOCIATION (TOKEN_ID, TOKEN_SCOPE ) VALUES ('TI5','PRODUCTION')
+
+SELECT * FROM AM_SUBSCRIBER;
+SELECT * FROM AM_APPLICATION;
+SELECT * FROM AM_SUBSCRIPTION;
diff --git a/modules/distribution/src/api-resource/sql/h2.sql b/modules/distribution/src/api-resource/sql/h2.sql
new file mode 100644
index 00000000..43ad387d
--- /dev/null
+++ b/modules/distribution/src/api-resource/sql/h2.sql
@@ -0,0 +1,735 @@
+-- Start of IDN Tables --
+CREATE TABLE IF NOT EXISTS IDN_BASE_TABLE (
+            PRODUCT_NAME VARCHAR (20),
+            PRIMARY KEY (PRODUCT_NAME)
+);
+
+INSERT INTO IDN_BASE_TABLE values ('WSO2 Identity Server');
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH_CONSUMER_APPS (
+            ID INTEGER NOT NULL AUTO_INCREMENT,
+            CONSUMER_KEY VARCHAR (255),
+            CONSUMER_SECRET VARCHAR (512),
+            USERNAME VARCHAR (255),
+            TENANT_ID INTEGER DEFAULT 0,
+            APP_NAME VARCHAR (255),
+            OAUTH_VERSION VARCHAR (128),
+            CALLBACK_URL VARCHAR (1024),
+            GRANT_TYPES VARCHAR (1024),
+            CONSTRAINT CONSUMER_KEY_CONSTRAINT UNIQUE (CONSUMER_KEY),
+            PRIMARY KEY (ID)
+);
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH1A_REQUEST_TOKEN (
+            REQUEST_TOKEN VARCHAR (512),
+            REQUEST_TOKEN_SECRET VARCHAR (512),
+            CONSUMER_KEY_ID INTEGER,
+            CALLBACK_URL VARCHAR (1024),
+            SCOPE VARCHAR(2048),
+            AUTHORIZED VARCHAR (128),
+            OAUTH_VERIFIER VARCHAR (512),
+            AUTHZ_USER VARCHAR (512),
+            PRIMARY KEY (REQUEST_TOKEN),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH1A_ACCESS_TOKEN (
+            ACCESS_TOKEN VARCHAR (512),
+            ACCESS_TOKEN_SECRET VARCHAR (512),
+            CONSUMER_KEY_ID INTEGER,
+            SCOPE VARCHAR(2048),
+            AUTHZ_USER VARCHAR (512),
+            PRIMARY KEY (ACCESS_TOKEN),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH2_ACCESS_TOKEN (
+            TOKEN_ID VARCHAR (255),
+            ACCESS_TOKEN VARCHAR (255),
+            REFRESH_TOKEN VARCHAR (255),
+            CONSUMER_KEY_ID INTEGER,
+            AUTHZ_USER VARCHAR (100),
+            TENANT_ID INTEGER,
+            USER_DOMAIN VARCHAR(50),
+            USER_TYPE VARCHAR (25),
+            TIME_CREATED TIMESTAMP DEFAULT 0,
+            REFRESH_TOKEN_TIME_CREATED TIMESTAMP DEFAULT 0,
+            VALIDITY_PERIOD BIGINT,
+            REFRESH_TOKEN_VALIDITY_PERIOD BIGINT,
+            TOKEN_SCOPE_HASH VARCHAR (32),
+            TOKEN_STATE VARCHAR (25) DEFAULT 'ACTIVE',
+            TOKEN_STATE_ID VARCHAR (128) DEFAULT 'NONE',
+            PRIMARY KEY (TOKEN_ID),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE,
+            CONSTRAINT CON_APP_KEY UNIQUE (CONSUMER_KEY_ID,AUTHZ_USER,TENANT_ID,USER_DOMAIN,USER_TYPE,TOKEN_SCOPE_HASH,
+                                           TOKEN_STATE,TOKEN_STATE_ID)
+);
+
+CREATE INDEX IDX_AT_CK_AU ON IDN_OAUTH2_ACCESS_TOKEN(CONSUMER_KEY_ID, AUTHZ_USER, TOKEN_STATE, USER_TYPE);
+
+CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED);
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH2_AUTHORIZATION_CODE (
+            AUTHORIZATION_CODE VARCHAR (512),
+            CONSUMER_KEY_ID INTEGER,
+	          CALLBACK_URL VARCHAR (1024),
+            SCOPE VARCHAR(2048),
+            AUTHZ_USER VARCHAR (100),
+            TENANT_ID INTEGER,
+            USER_DOMAIN VARCHAR(50),
+            TIME_CREATED TIMESTAMP,
+			      VALIDITY_PERIOD BIGINT,
+	          STATE VARCHAR (25) DEFAULT 'ACTIVE',
+            TOKEN_ID VARCHAR(255),
+            PRIMARY KEY (AUTHORIZATION_CODE),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH2_SCOPE_ASSOCIATION (
+            TOKEN_ID VARCHAR (255),
+            TOKEN_SCOPE VARCHAR (60),
+            PRIMARY KEY (TOKEN_ID, TOKEN_SCOPE),
+            FOREIGN KEY (TOKEN_ID) REFERENCES IDN_OAUTH2_ACCESS_TOKEN(TOKEN_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH2_SCOPE (
+            SCOPE_ID INTEGER NOT NULL AUTO_INCREMENT,
+            SCOPE_KEY VARCHAR(100) NOT NULL,
+            NAME VARCHAR(255) NULL,
+            DESCRIPTION VARCHAR(512) NULL,
+            TENANT_ID INTEGER NOT NULL DEFAULT 0,
+	    ROLES VARCHAR (500) NULL,
+            PRIMARY KEY (SCOPE_ID)
+);
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH2_RESOURCE_SCOPE (
+            RESOURCE_PATH VARCHAR(255) NOT NULL,
+            SCOPE_ID INTEGER (11) NOT NULL,
+            PRIMARY KEY (RESOURCE_PATH),
+            FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID)
+);
+
+CREATE TABLE IF NOT EXISTS IDN_SCIM_GROUP (
+            ID INTEGER NOT NULL AUTO_INCREMENT,
+            TENANT_ID INTEGER NOT NULL,
+            ROLE_NAME VARCHAR(255) NOT NULL,
+            ATTR_NAME VARCHAR(1024) NOT NULL,
+			ATTR_VALUE VARCHAR(1024),
+            PRIMARY KEY (ID)
+);
+
+CREATE TABLE IF NOT EXISTS IDN_OPENID_REMEMBER_ME (
+            USER_NAME VARCHAR(255) NOT NULL,
+            TENANT_ID
+
+
+
+            INTEGER DEFAULT 0,
+            COOKIE_VALUE VARCHAR(1024),
+            CREATED_TIME TIMESTAMP,
+            PRIMARY KEY (USER_NAME, TENANT_ID)
+);
+
+CREATE TABLE IF NOT EXISTS IDN_OPENID_USER_RPS (
+			USER_NAME VARCHAR(255) NOT NULL,
+			TENANT_ID INTEGER DEFAULT 0,
+			RP_URL VARCHAR(255) NOT NULL,
+			TRUSTED_ALWAYS VARCHAR(128) DEFAULT 'FALSE',
+			LAST_VISIT DATE NOT NULL,
+			VISIT_COUNT INTEGER DEFAULT 0,
+			DEFAULT_PROFILE_NAME VARCHAR(255) DEFAULT 'DEFAULT',
+			PRIMARY KEY (USER_NAME, TENANT_ID, RP_URL)
+);
+
+CREATE TABLE IF NOT EXISTS IDN_OPENID_ASSOCIATIONS (
+			HANDLE VARCHAR(255) NOT NULL,
+			ASSOC_TYPE VARCHAR(255) NOT NULL,
+			EXPIRE_IN TIMESTAMP NOT NULL,
+			MAC_KEY VARCHAR(255) NOT NULL,
+			ASSOC_STORE VARCHAR(128) DEFAULT 'SHARED',
+			PRIMARY KEY (HANDLE)
+);
+
+CREATE TABLE IDN_STS_STORE (
+            ID INTEGER AUTO_INCREMENT,
+            TOKEN_ID VARCHAR(255) NOT NULL,
+            TOKEN_CONTENT BLOB NOT NULL,
+            CREATE_DATE TIMESTAMP NOT NULL,
+            EXPIRE_DATE TIMESTAMP NOT NULL,
+            STATE INTEGER DEFAULT 0,
+            PRIMARY KEY (ID)
+);
+
+CREATE TABLE IDN_IDENTITY_USER_DATA (
+            TENANT_ID INTEGER DEFAULT -1234,
+            USER_NAME VARCHAR(255) NOT NULL,
+            DATA_KEY VARCHAR(255) NOT NULL,
+            DATA_VALUE VARCHAR(255),
+            PRIMARY KEY (TENANT_ID, USER_NAME, DATA_KEY)
+);
+
+CREATE TABLE IDN_IDENTITY_META_DATA (
+            USER_NAME VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT -1234,
+            METADATA_TYPE VARCHAR(255) NOT NULL,
+            METADATA VARCHAR(255) NOT NULL,
+            VALID VARCHAR(255) NOT NULL,
+            PRIMARY KEY (TENANT_ID, USER_NAME, METADATA_TYPE,METADATA)
+);
+
+CREATE TABLE IF NOT EXISTS IDN_THRIFT_SESSION (
+            SESSION_ID VARCHAR(255) NOT NULL,
+            USER_NAME VARCHAR(255) NOT NULL,
+            CREATED_TIME VARCHAR(255) NOT NULL,
+            LAST_MODIFIED_TIME VARCHAR(255) NOT NULL,
+            PRIMARY KEY (SESSION_ID)
+);
+
+CREATE TABLE IDN_AUTH_SESSION_STORE (
+		        SESSION_ID VARCHAR (100) NOT NULL,
+		        SESSION_TYPE VARCHAR(100) NOT NULL,
+		        SESSION_OBJECT BLOB,
+		        TIME_CREATED TIMESTAMP,
+		        PRIMARY KEY (SESSION_ID, SESSION_TYPE)
+);
+CREATE TABLE IF NOT EXISTS SP_APP (
+        ID INTEGER NOT NULL AUTO_INCREMENT,
+        TENANT_ID INTEGER NOT NULL,
+	    	APP_NAME VARCHAR (255) NOT NULL ,
+	    	USER_STORE VARCHAR (255) NOT NULL,
+        USERNAME VARCHAR (255) NOT NULL ,
+        DESCRIPTION VARCHAR (1024),
+	    	ROLE_CLAIM VARCHAR (512),
+        AUTH_TYPE VARCHAR (255) NOT NULL,
+	    	PROVISIONING_USERSTORE_DOMAIN VARCHAR (512),
+	    	IS_LOCAL_CLAIM_DIALECT CHAR(1) DEFAULT '1',
+	    	IS_SEND_LOCAL_SUBJECT_ID CHAR(1) DEFAULT '0',
+	    	IS_SEND_AUTH_LIST_OF_IDPS CHAR(1) DEFAULT '0',
+        IS_USE_TENANT_DOMAIN_SUBJECT CHAR(1) DEFAULT '1',
+        IS_USE_USER_DOMAIN_SUBJECT CHAR(1) DEFAULT '1',
+	    	SUBJECT_CLAIM_URI VARCHAR (512),
+	    	IS_SAAS_APP CHAR(1) DEFAULT '0',
+        PRIMARY KEY (ID));
+
+ALTER TABLE SP_APP ADD CONSTRAINT APPLICATION_NAME_CONSTRAINT UNIQUE(APP_NAME, TENANT_ID);
+
+CREATE TABLE IF NOT EXISTS SP_INBOUND_AUTH (
+            ID INTEGER NOT NULL AUTO_INCREMENT,
+	     	TENANT_ID INTEGER NOT NULL,
+	     	INBOUND_AUTH_KEY VARCHAR (255) NOT NULL,
+            INBOUND_AUTH_TYPE VARCHAR (255) NOT NULL,
+            PROP_NAME VARCHAR (255),
+            PROP_VALUE VARCHAR (1024) ,
+	     	APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID));
+
+ALTER TABLE SP_INBOUND_AUTH ADD CONSTRAINT APPLICATION_ID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS SP_AUTH_STEP (
+            ID INTEGER NOT NULL AUTO_INCREMENT,
+            TENANT_ID INTEGER NOT NULL,
+	     	STEP_ORDER INTEGER DEFAULT 1,
+            APP_ID INTEGER NOT NULL ,
+            IS_SUBJECT_STEP CHAR(1) DEFAULT '0',
+            IS_ATTRIBUTE_STEP CHAR(1) DEFAULT '0',
+            PRIMARY KEY (ID));
+
+ALTER TABLE SP_AUTH_STEP ADD CONSTRAINT APPLICATION_ID_CONSTRAINT_STEP FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS SP_FEDERATED_IDP (
+            ID INTEGER NOT NULL,
+            TENANT_ID INTEGER NOT NULL,
+            AUTHENTICATOR_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID, AUTHENTICATOR_ID));
+
+ALTER TABLE SP_FEDERATED_IDP ADD CONSTRAINT STEP_ID_CONSTRAINT FOREIGN KEY (ID) REFERENCES SP_AUTH_STEP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS SP_CLAIM_MAPPING (
+	    	ID INTEGER NOT NULL AUTO_INCREMENT,
+	    	TENANT_ID INTEGER NOT NULL,
+	    	IDP_CLAIM VARCHAR (512) NOT NULL ,
+            SP_CLAIM VARCHAR (512) NOT NULL ,
+	   		APP_ID INTEGER NOT NULL,
+	    	IS_REQUESTED VARCHAR(128) DEFAULT '0',
+	    	DEFAULT_VALUE VARCHAR(255),
+            PRIMARY KEY (ID));
+
+ALTER TABLE SP_CLAIM_MAPPING ADD CONSTRAINT CLAIMID_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS SP_ROLE_MAPPING (
+	    	ID INTEGER NOT NULL AUTO_INCREMENT,
+	    	TENANT_ID INTEGER NOT NULL,
+	    	IDP_ROLE VARCHAR (255) NOT NULL ,
+            SP_ROLE VARCHAR (255) NOT NULL ,
+	    	APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID));
+
+ALTER TABLE SP_ROLE_MAPPING ADD CONSTRAINT ROLEID_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS SP_REQ_PATH_AUTHENTICATOR (
+	    	ID INTEGER NOT NULL AUTO_INCREMENT,
+	    	TENANT_ID INTEGER NOT NULL,
+	    	AUTHENTICATOR_NAME VARCHAR (255) NOT NULL ,
+	    	APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID));
+
+ALTER TABLE SP_REQ_PATH_AUTHENTICATOR ADD CONSTRAINT REQ_AUTH_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS SP_PROVISIONING_CONNECTOR (
+	    	ID INTEGER NOT NULL AUTO_INCREMENT,
+	    	TENANT_ID INTEGER NOT NULL,
+            IDP_NAME VARCHAR (255) NOT NULL ,
+	    	CONNECTOR_NAME VARCHAR (255) NOT NULL ,
+	    	APP_ID INTEGER NOT NULL,
+	    	IS_JIT_ENABLED CHAR(1) NOT NULL DEFAULT '0',
+		BLOCKING CHAR(1) NOT NULL DEFAULT '0',
+            PRIMARY KEY (ID));
+
+ALTER TABLE SP_PROVISIONING_CONNECTOR ADD CONSTRAINT PRO_CONNECTOR_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS IDP (
+			ID INTEGER AUTO_INCREMENT,
+			TENANT_ID INTEGER,
+			NAME VARCHAR(254) NOT NULL,
+			IS_ENABLED CHAR(1) NOT NULL DEFAULT '1',
+			IS_PRIMARY CHAR(1) NOT NULL DEFAULT '0',
+			HOME_REALM_ID VARCHAR(254),
+			IMAGE MEDIUMBLOB,
+			CERTIFICATE BLOB,
+			ALIAS VARCHAR(254),
+			INBOUND_PROV_ENABLED CHAR (1) NOT NULL DEFAULT '0',
+			INBOUND_PROV_USER_STORE_ID VARCHAR(254),
+ 			USER_CLAIM_URI VARCHAR(254),
+ 			ROLE_CLAIM_URI VARCHAR(254),
+  			DESCRIPTION VARCHAR (1024),
+ 			DEFAULT_AUTHENTICATOR_NAME VARCHAR(254),
+ 			DEFAULT_PRO_CONNECTOR_NAME VARCHAR(254),
+ 			PROVISIONING_ROLE VARCHAR(128),
+ 			IS_FEDERATION_HUB CHAR(1) NOT NULL DEFAULT '0',
+ 			IS_LOCAL_CLAIM_DIALECT CHAR(1) NOT NULL DEFAULT '0',
+	        DISPLAY_NAME VARCHAR(255),
+			PRIMARY KEY (ID),
+			UNIQUE (TENANT_ID, NAME));
+
+INSERT INTO IDP (TENANT_ID, NAME, HOME_REALM_ID) VALUES (-1234, 'LOCAL', 'localhost');
+
+CREATE TABLE IF NOT EXISTS IDP_ROLE (
+			ID INTEGER AUTO_INCREMENT,
+			IDP_ID INTEGER,
+			TENANT_ID INTEGER,
+			ROLE VARCHAR(254),
+			PRIMARY KEY (ID),
+			UNIQUE (IDP_ID, ROLE),
+			FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE);
+
+CREATE TABLE IF NOT EXISTS IDP_ROLE_MAPPING (
+			ID INTEGER AUTO_INCREMENT,
+			IDP_ROLE_ID INTEGER,
+			TENANT_ID INTEGER,
+			USER_STORE_ID VARCHAR (253),
+			LOCAL_ROLE VARCHAR(253),
+			PRIMARY KEY (ID),
+			UNIQUE (IDP_ROLE_ID, TENANT_ID, USER_STORE_ID, LOCAL_ROLE),
+			FOREIGN KEY (IDP_ROLE_ID) REFERENCES IDP_ROLE(ID) ON DELETE CASCADE);
+
+CREATE TABLE IF NOT EXISTS IDP_CLAIM (
+			ID INTEGER AUTO_INCREMENT,
+			IDP_ID INTEGER,
+			TENANT_ID INTEGER,
+			CLAIM VARCHAR(254),
+			PRIMARY KEY (ID),
+			UNIQUE (IDP_ID, CLAIM),
+			FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE);
+
+CREATE TABLE IF NOT EXISTS IDP_CLAIM_MAPPING (
+			ID INTEGER AUTO_INCREMENT,
+			IDP_CLAIM_ID INTEGER,
+			TENANT_ID INTEGER,
+			LOCAL_CLAIM VARCHAR(253),
+		    DEFAULT_VALUE VARCHAR(255),
+			IS_REQUESTED VARCHAR(128) DEFAULT '0',
+			PRIMARY KEY (ID),
+			UNIQUE (IDP_CLAIM_ID, TENANT_ID, LOCAL_CLAIM),
+			FOREIGN KEY (IDP_CLAIM_ID) REFERENCES IDP_CLAIM(ID) ON DELETE CASCADE);
+
+CREATE TABLE IF NOT EXISTS IDP_AUTHENTICATOR (
+            ID INTEGER AUTO_INCREMENT,
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            NAME VARCHAR(255) NOT NULL,
+            IS_ENABLED CHAR (1) DEFAULT '1',
+            DISPLAY_NAME VARCHAR(255),
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, NAME),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE);
+
+INSERT INTO IDP_AUTHENTICATOR (TENANT_ID, IDP_ID, NAME) VALUES (-1234, 1, 'samlsso');
+INSERT INTO IDP_AUTHENTICATOR (TENANT_ID, IDP_ID, NAME) VALUES (-1234, 1, 'IDPProperties');
+
+CREATE TABLE IF NOT EXISTS IDP_AUTHENTICATOR_PROPERTY (
+            ID INTEGER AUTO_INCREMENT,
+            TENANT_ID INTEGER,
+            AUTHENTICATOR_ID INTEGER,
+            PROPERTY_KEY VARCHAR(255) NOT NULL,
+            PROPERTY_VALUE VARCHAR(2047),
+            IS_SECRET CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, AUTHENTICATOR_ID, PROPERTY_KEY),
+            FOREIGN KEY (AUTHENTICATOR_ID) REFERENCES IDP_AUTHENTICATOR(ID) ON DELETE CASCADE);
+
+INSERT INTO  IDP_AUTHENTICATOR_PROPERTY (TENANT_ID, AUTHENTICATOR_ID, PROPERTY_KEY,PROPERTY_VALUE, IS_SECRET ) VALUES (-1234, 1 , 'IdPEntityId', 'localhost', '0');
+
+CREATE TABLE IF NOT EXISTS IDP_PROVISIONING_CONFIG (
+            ID INTEGER AUTO_INCREMENT,
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            PROVISIONING_CONNECTOR_TYPE VARCHAR(255) NOT NULL,
+            IS_ENABLED CHAR (1) DEFAULT '0',
+            IS_BLOCKING CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, PROVISIONING_CONNECTOR_TYPE),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE);
+
+CREATE TABLE IF NOT EXISTS IDP_PROV_CONFIG_PROPERTY (
+            ID INTEGER AUTO_INCREMENT,
+            TENANT_ID INTEGER,
+            PROVISIONING_CONFIG_ID INTEGER,
+            PROPERTY_KEY VARCHAR(255) NOT NULL,
+            PROPERTY_VALUE VARCHAR(2048),
+            PROPERTY_BLOB_VALUE BLOB,
+            PROPERTY_TYPE CHAR(32) NOT NULL,
+            IS_SECRET CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, PROVISIONING_CONFIG_ID, PROPERTY_KEY),
+            FOREIGN KEY (PROVISIONING_CONFIG_ID) REFERENCES IDP_PROVISIONING_CONFIG(ID) ON DELETE CASCADE);
+
+CREATE TABLE IF NOT EXISTS IDP_PROVISIONING_ENTITY (
+            ID INTEGER AUTO_INCREMENT,
+            PROVISIONING_CONFIG_ID INTEGER,
+            ENTITY_TYPE VARCHAR(255) NOT NULL,
+            ENTITY_LOCAL_USERSTORE VARCHAR(255) NOT NULL,
+            ENTITY_NAME VARCHAR(255) NOT NULL,
+            ENTITY_VALUE VARCHAR(255),
+            TENANT_ID INTEGER,
+            PRIMARY KEY (ID),
+            UNIQUE (ENTITY_TYPE, TENANT_ID, ENTITY_LOCAL_USERSTORE, ENTITY_NAME, PROVISIONING_CONFIG_ID),
+            UNIQUE (PROVISIONING_CONFIG_ID, ENTITY_TYPE, ENTITY_VALUE),
+            FOREIGN KEY (PROVISIONING_CONFIG_ID) REFERENCES IDP_PROVISIONING_CONFIG(ID) ON DELETE CASCADE);
+
+CREATE TABLE IF NOT EXISTS IDP_LOCAL_CLAIM (
+            ID INTEGER AUTO_INCREMENT,
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            CLAIM_URI VARCHAR(255) NOT NULL,
+            DEFAULT_VALUE VARCHAR(255),
+	    IS_REQUESTED VARCHAR(128) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, CLAIM_URI),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE);
+
+CREATE TABLE IF NOT EXISTS IDN_ASSOCIATED_ID (
+            ID INTEGER AUTO_INCREMENT,
+	    IDP_USER_ID VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT -1234,
+	    IDP_ID INTEGER NOT NULL,
+            DOMAIN_NAME VARCHAR(255) NOT NULL,
+ 	    USER_NAME VARCHAR(255) NOT NULL,
+	    PRIMARY KEY (ID),
+            UNIQUE(IDP_USER_ID, TENANT_ID, IDP_ID),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS IDN_USER_ACCOUNT_ASSOCIATION (
+            ASSOCIATION_KEY VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER,
+            DOMAIN_NAME VARCHAR(255) NOT NULL,
+            USER_NAME VARCHAR(255) NOT NULL,
+            PRIMARY KEY (TENANT_ID, DOMAIN_NAME, USER_NAME));
+
+CREATE TABLE IF NOT EXISTS FIDO_DEVICE_STORE (
+        TENANT_ID INTEGER,
+        DOMAIN_NAME VARCHAR(255) NOT NULL,
+        USER_NAME VARCHAR(45) NOT NULL,
+	TIME_REGISTERED TIMESTAMP,
+        KEY_HANDLE VARCHAR(200) NOT NULL,
+        DEVICE_DATA LONGVARCHAR NOT NULL,
+      	PRIMARY KEY (TENANT_ID, DOMAIN_NAME, USER_NAME, KEY_HANDLE));
+      	
+CREATE TABLE IF NOT EXISTS WF_REQUEST (
+    UUID VARCHAR (45),
+    CREATED_BY VARCHAR (255),
+    TENANT_ID INTEGER DEFAULT -1,
+    OPERATION_TYPE VARCHAR (50),
+    CREATED_AT TIMESTAMP,
+    UPDATED_AT TIMESTAMP,
+    STATUS VARCHAR (30),
+    REQUEST BLOB,
+    PRIMARY KEY (UUID)
+);
+
+CREATE TABLE IF NOT EXISTS WF_BPS_PROFILE (
+    PROFILE_NAME VARCHAR(45),
+    HOST_URL VARCHAR(45),
+    USERNAME VARCHAR(45),
+    PASSWORD VARCHAR(255),
+    CALLBACK_HOST VARCHAR (45),
+    CALLBACK_USERNAME VARCHAR (45),
+    CALLBACK_PASSWORD VARCHAR (255),
+    TENANT_ID VARCHAR (45),
+    PRIMARY KEY (PROFILE_NAME, TENANT_ID)
+);
+
+CREATE TABLE IF NOT EXISTS WF_WORKFLOW(
+    ID VARCHAR (45),
+    WF_NAME VARCHAR (45),
+    DESCRIPTION VARCHAR (255),
+    TEMPLATE_ID VARCHAR (45),
+    IMPL_ID VARCHAR (45),
+    TENANT_ID VARCHAR (45),
+    PRIMARY KEY (ID)
+);
+
+CREATE TABLE IF NOT EXISTS WF_WORKFLOW_ASSOCIATION(
+    ID INTEGER NOT NULL AUTO_INCREMENT,
+    ASSOC_NAME VARCHAR (45),
+    EVENT_ID VARCHAR(45),
+    ASSOC_CONDITION VARCHAR (2000),
+    WORKFLOW_ID VARCHAR (45),
+    IS_ENABLED CHAR (1) DEFAULT '1',
+    PRIMARY KEY(ID),
+    FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS WF_WORKFLOW_CONFIG_PARAM(
+    WORKFLOW_ID VARCHAR (45),
+    PARAM_NAME VARCHAR (45),
+    PARAM_VALUE VARCHAR (1000),
+    PRIMARY KEY (WORKFLOW_ID, PARAM_NAME),
+    FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS WF_REQUEST_ENTITY_RELATIONSHIP(
+  REQUEST_ID VARCHAR (45),
+  ENTITY_NAME VARCHAR (255),
+  ENTITY_TYPE VARCHAR (50),
+  TENANT_ID INTEGER DEFAULT -1,
+  PRIMARY KEY(REQUEST_ID, ENTITY_NAME, ENTITY_TYPE, TENANT_ID),
+  FOREIGN KEY (REQUEST_ID) REFERENCES WF_REQUEST(UUID)ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS WORKFLOW_REQUEST_RELATION(
+  RELATIONSHIP_ID VARCHAR (45),
+  WORKFLOW_ID VARCHAR (45),
+  REQUEST_ID VARCHAR (45),
+  UPDATED_AT TIMESTAMP,
+  STATUS VARCHAR (30),
+  PRIMARY KEY (RELATIONSHIP_ID),
+  FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE,
+  FOREIGN KEY (REQUEST_ID) REFERENCES WF_REQUEST(UUID)ON DELETE CASCADE
+);
+
+-- Start of API-MGT Tables --
+
+CREATE TABLE IF NOT EXISTS AM_SUBSCRIBER (
+    SUBSCRIBER_ID INTEGER AUTO_INCREMENT,
+    USER_ID VARCHAR(255) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    EMAIL_ADDRESS VARCHAR(256) NULL,
+    DATE_SUBSCRIBED TIMESTAMP NOT NULL,
+    PRIMARY KEY (SUBSCRIBER_ID),
+    CREATED_BY VARCHAR(100),
+    CREATED_TIME TIMESTAMP,
+    UPDATED_BY VARCHAR(100),
+    UPDATED_TIME TIMESTAMP,
+    UNIQUE (TENANT_ID,USER_ID)
+);
+
+CREATE TABLE IF NOT EXISTS AM_APPLICATION (
+    APPLICATION_ID INTEGER AUTO_INCREMENT,
+    NAME VARCHAR(100),
+    SUBSCRIBER_ID INTEGER,
+    APPLICATION_TIER VARCHAR(50) DEFAULT 'Unlimited',
+    CALLBACK_URL VARCHAR(512),
+    DESCRIPTION VARCHAR(512),
+    APPLICATION_STATUS VARCHAR(50) DEFAULT 'APPROVED',
+    GROUP_ID VARCHAR(100),
+    CREATED_BY VARCHAR(100),
+    CREATED_TIME TIMESTAMP,
+    UPDATED_BY VARCHAR(100),
+    UPDATED_TIME TIMESTAMP,
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY(APPLICATION_ID),
+    UNIQUE (NAME,SUBSCRIBER_ID)
+);
+
+CREATE TABLE IF NOT EXISTS AM_API (
+    API_ID INTEGER AUTO_INCREMENT,
+    API_PROVIDER VARCHAR(256),
+    API_NAME VARCHAR(256),
+    API_VERSION VARCHAR(30),
+    CONTEXT VARCHAR(256),
+    CONTEXT_TEMPLATE VARCHAR(256),
+    PRIMARY KEY(API_ID),
+    CREATED_BY VARCHAR(100),
+    CREATED_TIME TIMESTAMP,
+    UPDATED_BY VARCHAR(100),
+    UPDATED_TIME TIMESTAMP,
+    UNIQUE (API_PROVIDER,API_NAME,API_VERSION)
+);
+
+CREATE TABLE IF NOT EXISTS AM_API_URL_MAPPING (
+    URL_MAPPING_ID INTEGER AUTO_INCREMENT,
+    API_ID INTEGER NOT NULL,
+    HTTP_METHOD VARCHAR(20) NULL,
+    AUTH_SCHEME VARCHAR(50) NULL,
+    URL_PATTERN VARCHAR(512) NULL,
+    THROTTLING_TIER varchar(512) DEFAULT NULL,
+    MEDIATION_SCRIPT BLOB DEFAULT NULL,
+    PRIMARY KEY(URL_MAPPING_ID)
+);
+
+
+CREATE TABLE IF NOT EXISTS AM_SUBSCRIPTION (
+    SUBSCRIPTION_ID INTEGER AUTO_INCREMENT,
+    TIER_ID VARCHAR(50),
+    API_ID INTEGER,
+    LAST_ACCESSED TIMESTAMP NULL,
+    APPLICATION_ID INTEGER,
+    SUB_STATUS VARCHAR(50),
+    SUBS_CREATE_STATE VARCHAR(50) DEFAULT 'SUBSCRIBE',
+    CREATED_BY VARCHAR(100),
+    CREATED_TIME TIMESTAMP,
+    UPDATED_BY VARCHAR(100),
+    UPDATED_TIME TIMESTAMP,
+    FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY (SUBSCRIPTION_ID)
+);
+
+CREATE TABLE IF NOT EXISTS AM_SUBSCRIPTION_KEY_MAPPING (
+    SUBSCRIPTION_ID INTEGER,
+    ACCESS_TOKEN VARCHAR(512),
+    KEY_TYPE VARCHAR(512) NOT NULL,
+    FOREIGN KEY(SUBSCRIPTION_ID) REFERENCES AM_SUBSCRIPTION(SUBSCRIPTION_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY(SUBSCRIPTION_ID,ACCESS_TOKEN)
+);
+
+CREATE TABLE IF NOT EXISTS AM_APPLICATION_KEY_MAPPING (
+    APPLICATION_ID INTEGER,
+    CONSUMER_KEY VARCHAR(512),
+    KEY_TYPE VARCHAR(512) NOT NULL,
+    STATE VARCHAR(30) NOT NULL,
+    CREATE_MODE VARCHAR(30) DEFAULT 'CREATED',
+    FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY(APPLICATION_ID,KEY_TYPE)
+);
+
+CREATE TABLE IF NOT EXISTS AM_API_LC_EVENT (
+    EVENT_ID INTEGER AUTO_INCREMENT,
+    API_ID INTEGER NOT NULL,
+    PREVIOUS_STATE VARCHAR(50),
+    NEW_STATE VARCHAR(50) NOT NULL,
+    USER_ID VARCHAR(255) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    EVENT_DATE TIMESTAMP NOT NULL,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY (EVENT_ID)
+);
+
+CREATE TABLE AM_APP_KEY_DOMAIN_MAPPING (
+    CONSUMER_KEY VARCHAR(255),
+    AUTHZ_DOMAIN VARCHAR(255) DEFAULT 'ALL',
+    PRIMARY KEY (CONSUMER_KEY,AUTHZ_DOMAIN)
+);
+
+CREATE TABLE IF NOT EXISTS AM_API_COMMENTS (
+    COMMENT_ID INTEGER AUTO_INCREMENT,
+    COMMENT_TEXT VARCHAR(512),
+    COMMENTED_USER VARCHAR(255),
+    DATE_COMMENTED TIMESTAMP NOT NULL,
+    API_ID INTEGER NOT NULL,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY (COMMENT_ID)
+);
+
+CREATE TABLE IF NOT EXISTS AM_API_RATINGS(
+    RATING_ID INTEGER AUTO_INCREMENT,
+    API_ID INTEGER,
+    RATING INTEGER,
+    SUBSCRIBER_ID INTEGER,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY (RATING_ID)
+);
+
+CREATE TABLE IF NOT EXISTS AM_TIER_PERMISSIONS (
+    TIER_PERMISSIONS_ID INTEGER AUTO_INCREMENT,
+    TIER VARCHAR(50) NOT NULL,
+    PERMISSIONS_TYPE VARCHAR(50) NOT NULL,
+    ROLES VARCHAR(512) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    PRIMARY KEY(TIER_PERMISSIONS_ID)
+);
+
+CREATE TABLE IF NOT EXISTS AM_EXTERNAL_STORES(
+    APISTORE_ID INTEGER AUTO_INCREMENT,
+    API_ID INTEGER,
+    STORE_ID VARCHAR(255) NOT NULL,
+    STORE_DISPLAY_NAME VARCHAR(255) NOT NULL,
+    STORE_ENDPOINT VARCHAR(255) NOT NULL,
+    STORE_TYPE VARCHAR(255) NOT NULL,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY (APISTORE_ID)
+);
+
+CREATE TABLE IF NOT EXISTS AM_WORKFLOWS(
+    WF_ID INTEGER AUTO_INCREMENT,
+    WF_REFERENCE VARCHAR(255) NOT NULL,
+    WF_TYPE VARCHAR(255) NOT NULL,
+    WF_STATUS VARCHAR(255) NOT NULL,
+    WF_CREATED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    WF_UPDATED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP ,
+    WF_STATUS_DESC VARCHAR(1000),
+    TENANT_ID INTEGER,
+    TENANT_DOMAIN VARCHAR(255),
+    WF_EXTERNAL_REFERENCE VARCHAR(255) NOT NULL,
+    PRIMARY KEY (WF_ID),
+    UNIQUE (WF_EXTERNAL_REFERENCE)
+);
+
+CREATE TABLE IF NOT EXISTS AM_APPLICATION_REGISTRATION (
+    REG_ID INT AUTO_INCREMENT,
+    SUBSCRIBER_ID INT,
+    WF_REF VARCHAR(255) NOT NULL,
+    APP_ID INT,
+    TOKEN_TYPE VARCHAR(30),
+    TOKEN_SCOPE VARCHAR(256) DEFAULT 'default',
+    INPUTS VARCHAR(1000),
+    ALLOWED_DOMAINS VARCHAR(256),
+    VALIDITY_PERIOD BIGINT,
+    UNIQUE (SUBSCRIBER_ID,APP_ID,TOKEN_TYPE),
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    FOREIGN KEY(APP_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY (REG_ID)
+);
+
+CREATE TABLE IF NOT EXISTS AM_API_SCOPES (
+   API_ID  INTEGER NOT NULL,
+   SCOPE_ID  INTEGER NOT NULL,
+   FOREIGN KEY (API_ID) REFERENCES AM_API (API_ID) ON DELETE CASCADE  ON UPDATE CASCADE,
+   FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID) ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS AM_API_DEFAULT_VERSION (
+            DEFAULT_VERSION_ID INT AUTO_INCREMENT, 
+            API_NAME VARCHAR(256) NOT NULL ,
+            API_PROVIDER VARCHAR(256) NOT NULL , 
+            DEFAULT_API_VERSION VARCHAR(30) , 
+            PUBLISHED_DEFAULT_API_VERSION VARCHAR(30) ,
+            PRIMARY KEY (DEFAULT_VERSION_ID)
+);
+
+
+CREATE INDEX IDX_SUB_APP_ID ON AM_SUBSCRIPTION (APPLICATION_ID, SUBSCRIPTION_ID);
+
+-- End of API-MGT Tables --
diff --git a/modules/distribution/src/api-resource/sql/mssql.sql b/modules/distribution/src/api-resource/sql/mssql.sql
new file mode 100644
index 00000000..1f2ed3b6
--- /dev/null
+++ b/modules/distribution/src/api-resource/sql/mssql.sql
@@ -0,0 +1,815 @@
+-- Start of IDENTITY Tables --
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_BASE_TABLE]') AND TYPE IN (N'U'))
+CREATE TABLE IDN_BASE_TABLE (
+            PRODUCT_NAME VARCHAR(20),
+            PRIMARY KEY (PRODUCT_NAME)
+);
+
+INSERT INTO IDN_BASE_TABLE values ('WSO2 Identity Server');
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_OAUTH_CONSUMER_APPS]') AND TYPE IN (N'U'))
+CREATE TABLE IDN_OAUTH_CONSUMER_APPS (
+            ID INTEGER IDENTITY,
+            CONSUMER_KEY VARCHAR(255),
+            CONSUMER_SECRET VARCHAR(512),
+            USERNAME VARCHAR(255),
+            TENANT_ID INTEGER DEFAULT 0,
+            APP_NAME VARCHAR(255),
+            OAUTH_VERSION VARCHAR(128),
+            CALLBACK_URL VARCHAR(1024),
+            GRANT_TYPES VARCHAR(1024),
+            CONSTRAINT CONSUMER_KEY_CONSTRAINT UNIQUE (CONSUMER_KEY),
+            PRIMARY KEY (ID)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_OAUTH1A_REQUEST_TOKEN]') AND TYPE IN (N'U'))
+CREATE TABLE IDN_OAUTH1A_REQUEST_TOKEN (
+            REQUEST_TOKEN VARCHAR(512),
+            REQUEST_TOKEN_SECRET VARCHAR(512),
+            CONSUMER_KEY_ID INTEGER,
+            CALLBACK_URL VARCHAR(1024),
+            SCOPE VARCHAR(2048),
+            AUTHORIZED VARCHAR(128),
+            OAUTH_VERIFIER VARCHAR(512),
+            AUTHZ_USER VARCHAR(512),
+            PRIMARY KEY (REQUEST_TOKEN),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_OAUTH1A_ACCESS_TOKEN]') AND TYPE IN (N'U'))
+CREATE TABLE IDN_OAUTH1A_ACCESS_TOKEN (
+            ACCESS_TOKEN VARCHAR(512),
+            ACCESS_TOKEN_SECRET VARCHAR(512),
+            CONSUMER_KEY_ID INTEGER,
+            SCOPE VARCHAR(2048),
+            AUTHZ_USER VARCHAR(512),
+            PRIMARY KEY (ACCESS_TOKEN),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_OAUTH2_ACCESS_TOKEN]') AND TYPE IN (N'U'))
+CREATE TABLE IDN_OAUTH2_ACCESS_TOKEN (
+            TOKEN_ID VARCHAR (255),
+            ACCESS_TOKEN VARCHAR(255),
+            REFRESH_TOKEN VARCHAR(255),
+            CONSUMER_KEY_ID INTEGER,
+            AUTHZ_USER VARCHAR (100),
+            TENANT_ID INTEGER,
+            USER_DOMAIN VARCHAR(50),
+            USER_TYPE VARCHAR (25),
+            TIME_CREATED DATETIME,
+            REFRESH_TOKEN_TIME_CREATED DATETIME,
+            VALIDITY_PERIOD BIGINT,
+            REFRESH_TOKEN_VALIDITY_PERIOD BIGINT,
+            TOKEN_SCOPE_HASH VARCHAR(32),
+            TOKEN_STATE VARCHAR(25) DEFAULT 'ACTIVE',
+            TOKEN_STATE_ID VARCHAR (128) DEFAULT 'NONE',
+            PRIMARY KEY (TOKEN_ID),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE,
+            CONSTRAINT CON_APP_KEY UNIQUE (CONSUMER_KEY_ID,AUTHZ_USER,TENANT_ID,USER_DOMAIN,USER_TYPE,TOKEN_SCOPE_HASH,
+                                           TOKEN_STATE,TOKEN_STATE_ID)
+);
+
+CREATE INDEX IDX_AT_CK_AU ON IDN_OAUTH2_ACCESS_TOKEN(CONSUMER_KEY_ID, AUTHZ_USER, TOKEN_STATE, USER_TYPE);
+
+CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED);
+
+IF EXISTS (SELECT NAME FROM SYSINDEXES WHERE NAME = 'IDX_AT_CK_AU')
+DROP INDEX IDN_OAUTH2_ACCESS_TOKEN.IDX_AT_CK_AU
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_OAUTH2_AUTHORIZATION_CODE]') AND TYPE IN (N'U'))
+CREATE TABLE IDN_OAUTH2_AUTHORIZATION_CODE (
+            AUTHORIZATION_CODE VARCHAR(512),
+            CONSUMER_KEY_ID INTEGER,
+              CALLBACK_URL VARCHAR(1024),
+            SCOPE VARCHAR(2048),
+            AUTHZ_USER VARCHAR (100),
+            TENANT_ID INTEGER,
+            USER_DOMAIN VARCHAR(50),
+            TIME_CREATED DATETIME,
+            VALIDITY_PERIOD BIGINT,
+            STATE VARCHAR (25) DEFAULT 'ACTIVE',
+            TOKEN_ID VARCHAR(255),
+            PRIMARY KEY (AUTHORIZATION_CODE),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_OAUTH2_SCOPE_ASSOCIATION]') AND TYPE IN (N'U'))
+CREATE TABLE IDN_OAUTH2_SCOPE_ASSOCIATION (
+            TOKEN_ID VARCHAR (255),
+            TOKEN_SCOPE VARCHAR (60),
+            PRIMARY KEY (TOKEN_ID, TOKEN_SCOPE),
+            FOREIGN KEY (TOKEN_ID) REFERENCES IDN_OAUTH2_ACCESS_TOKEN(TOKEN_ID) ON DELETE CASCADE
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_OAUTH2_SCOPE]') AND TYPE IN (N'U'))
+CREATE TABLE IDN_OAUTH2_SCOPE (
+            SCOPE_ID INTEGER IDENTITY,
+            SCOPE_KEY VARCHAR(100) NOT NULL,
+            NAME VARCHAR(255) NULL,
+            DESCRIPTION VARCHAR(512) NULL,
+            TENANT_ID INTEGER NOT NULL DEFAULT 0,
+            ROLES VARCHAR (500) NULL,
+            PRIMARY KEY (SCOPE_ID)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_OAUTH2_RESOURCE_SCOPE]') AND TYPE IN (N'U'))
+CREATE TABLE IDN_OAUTH2_RESOURCE_SCOPE (
+            RESOURCE_PATH VARCHAR(255) NOT NULL,
+            SCOPE_ID INTEGER NOT NULL,
+            PRIMARY KEY (RESOURCE_PATH),
+            FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_SCIM_GROUP]') AND TYPE IN (N'U'))
+CREATE TABLE IDN_SCIM_GROUP (
+            ID INTEGER IDENTITY,
+            TENANT_ID INTEGER NOT NULL,
+            ROLE_NAME VARCHAR(255) NOT NULL,
+            ATTR_NAME VARCHAR(1024) NOT NULL,
+            ATTR_VALUE VARCHAR(1024),
+            PRIMARY KEY (ID)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_OPENID_REMEMBER_ME]') AND TYPE IN (N'U'))
+CREATE TABLE IDN_OPENID_REMEMBER_ME (
+            USER_NAME VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT 0,
+            COOKIE_VALUE VARCHAR(1024),
+            CREATED_TIME DATETIME,
+            PRIMARY KEY (USER_NAME, TENANT_ID)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_OPENID_USER_RPS]') AND TYPE IN (N'U'))
+CREATE TABLE IDN_OPENID_USER_RPS (
+            USER_NAME VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT 0,
+            RP_URL VARCHAR(255) NOT NULL,
+            TRUSTED_ALWAYS VARCHAR(128) DEFAULT 'FALSE',
+            LAST_VISIT DATE NOT NULL,
+            VISIT_COUNT INTEGER DEFAULT 0,
+            DEFAULT_PROFILE_NAME VARCHAR(255) DEFAULT 'DEFAULT',
+            PRIMARY KEY (USER_NAME, TENANT_ID, RP_URL)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_OPENID_ASSOCIATIONS]') AND TYPE IN (N'U'))
+CREATE TABLE IDN_OPENID_ASSOCIATIONS (
+            HANDLE VARCHAR(255) NOT NULL,
+            ASSOC_TYPE VARCHAR(255) NOT NULL,
+            EXPIRE_IN DATETIME NOT NULL,
+            MAC_KEY VARCHAR(255) NOT NULL,
+            ASSOC_STORE VARCHAR(128) DEFAULT 'SHARED',
+            PRIMARY KEY (HANDLE)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_STS_STORE]') AND TYPE IN (N'U'))
+CREATE TABLE IDN_STS_STORE (
+            ID INTEGER IDENTITY,
+            TOKEN_ID VARCHAR(255) NOT NULL,
+            TOKEN_CONTENT VARBINARY(MAX) NOT NULL,
+            CREATE_DATE DATETIME NOT NULL,
+            EXPIRE_DATE DATETIME NOT NULL,
+            STATE INTEGER DEFAULT 0,
+            PRIMARY KEY (ID)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_IDENTITY_USER_DATA]') AND TYPE IN (N'U'))
+CREATE TABLE IDN_IDENTITY_USER_DATA (
+            TENANT_ID INTEGER DEFAULT -1234,
+            USER_NAME VARCHAR(255) NOT NULL,
+            DATA_KEY VARCHAR(255) NOT NULL,
+            DATA_VALUE VARCHAR(255),
+            PRIMARY KEY (TENANT_ID, USER_NAME, DATA_KEY)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_IDENTITY_META_DATA]') AND TYPE IN (N'U'))
+CREATE TABLE IDN_IDENTITY_META_DATA (
+            USER_NAME VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT -1234,
+            METADATA_TYPE VARCHAR(255) NOT NULL,
+            METADATA VARCHAR(255) NOT NULL,
+            VALID VARCHAR(255) NOT NULL,
+            PRIMARY KEY (TENANT_ID, USER_NAME, METADATA_TYPE,METADATA)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_THRIFT_SESSION]') AND TYPE IN (N'U'))
+CREATE TABLE IDN_THRIFT_SESSION (
+            SESSION_ID VARCHAR(255) NOT NULL,
+            USER_NAME VARCHAR(255) NOT NULL,
+            CREATED_TIME VARCHAR(255) NOT NULL,
+            LAST_MODIFIED_TIME VARCHAR(255) NOT NULL,
+            PRIMARY KEY (SESSION_ID)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_AUTH_SESSION_STORE]') AND TYPE IN (N'U'))
+CREATE TABLE IDN_AUTH_SESSION_STORE (
+        SESSION_ID VARCHAR (100) NOT NULL,
+        SESSION_TYPE VARCHAR(100) NOT NULL,
+        SESSION_OBJECT VARBINARY(MAX),
+        TIME_CREATED DATETIME,
+        PRIMARY KEY (SESSION_ID, SESSION_TYPE)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[SP_APP]') AND TYPE IN (N'U'))
+CREATE TABLE SP_APP (
+        ID INTEGER NOT NULL IDENTITY,
+        TENANT_ID INTEGER NOT NULL,
+            APP_NAME VARCHAR (255) NOT NULL ,
+            USER_STORE VARCHAR (255) NOT NULL,
+        USERNAME VARCHAR (255) NOT NULL ,
+        DESCRIPTION VARCHAR (1024),
+            ROLE_CLAIM VARCHAR (512),
+        AUTH_TYPE VARCHAR (255) NOT NULL,
+            PROVISIONING_USERSTORE_DOMAIN VARCHAR (512),
+            IS_LOCAL_CLAIM_DIALECT CHAR(1) DEFAULT '1',
+            IS_SEND_LOCAL_SUBJECT_ID CHAR(1) DEFAULT '0',
+            IS_SEND_AUTH_LIST_OF_IDPS CHAR(1) DEFAULT '0',
+        IS_USE_TENANT_DOMAIN_SUBJECT CHAR(1) DEFAULT '1',
+        IS_USE_USER_DOMAIN_SUBJECT CHAR(1) DEFAULT '1',
+            SUBJECT_CLAIM_URI VARCHAR (512),
+            IS_SAAS_APP CHAR(1) DEFAULT '0',
+        PRIMARY KEY (ID));
+
+ALTER TABLE SP_APP ADD CONSTRAINT APPLICATION_NAME_CONSTRAINT UNIQUE(APP_NAME, TENANT_ID);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[SP_INBOUND_AUTH]') AND TYPE IN (N'U'))
+CREATE TABLE SP_INBOUND_AUTH (
+            ID INTEGER NOT NULL IDENTITY,
+            TENANT_ID INTEGER NOT NULL,
+            INBOUND_AUTH_KEY VARCHAR (255) NOT NULL,
+            INBOUND_AUTH_TYPE VARCHAR (255) NOT NULL,
+            PROP_NAME VARCHAR (255),
+            PROP_VALUE VARCHAR (1024) ,
+            APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID));
+
+ALTER TABLE SP_INBOUND_AUTH ADD CONSTRAINT APPLICATION_ID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[SP_AUTH_STEP]') AND TYPE IN (N'U'))
+CREATE TABLE SP_AUTH_STEP (
+            ID INTEGER NOT NULL IDENTITY,
+            TENANT_ID INTEGER NOT NULL,
+            STEP_ORDER INTEGER DEFAULT 1,
+            APP_ID INTEGER NOT NULL,
+            IS_SUBJECT_STEP CHAR(1) DEFAULT '0',
+            IS_ATTRIBUTE_STEP CHAR(1) DEFAULT '0',
+            PRIMARY KEY (ID));
+
+ALTER TABLE SP_AUTH_STEP ADD CONSTRAINT APPLICATION_ID_CONSTRAINT_STEP FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[SP_FEDERATED_IDP]') AND TYPE IN (N'U'))
+CREATE TABLE SP_FEDERATED_IDP (
+            ID INTEGER NOT NULL,
+            TENANT_ID INTEGER NOT NULL,
+            AUTHENTICATOR_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID, AUTHENTICATOR_ID));
+
+ALTER TABLE SP_FEDERATED_IDP ADD CONSTRAINT STEP_ID_CONSTRAINT FOREIGN KEY (ID) REFERENCES SP_AUTH_STEP (ID) ON DELETE CASCADE;
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[SP_CLAIM_MAPPING]') AND TYPE IN (N'U'))
+CREATE TABLE SP_CLAIM_MAPPING (
+            ID INTEGER NOT NULL IDENTITY,
+            TENANT_ID INTEGER NOT NULL,
+            IDP_CLAIM VARCHAR (512) NOT NULL ,
+            SP_CLAIM VARCHAR (512) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            IS_REQUESTED VARCHAR(128) DEFAULT '0',
+            DEFAULT_VALUE VARCHAR(255),
+            PRIMARY KEY (ID));
+
+ALTER TABLE SP_CLAIM_MAPPING ADD CONSTRAINT CLAIMID_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[SP_ROLE_MAPPING]') AND TYPE IN (N'U'))
+CREATE TABLE SP_ROLE_MAPPING (
+            ID INTEGER NOT NULL IDENTITY,
+            TENANT_ID INTEGER NOT NULL,
+            IDP_ROLE VARCHAR (255) NOT NULL ,
+            SP_ROLE VARCHAR (255) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID));
+
+ALTER TABLE SP_ROLE_MAPPING ADD CONSTRAINT ROLEID_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[SP_REQ_PATH_AUTHENTICATOR]') AND TYPE IN (N'U'))
+CREATE TABLE SP_REQ_PATH_AUTHENTICATOR (
+            ID INTEGER NOT NULL IDENTITY,
+            TENANT_ID INTEGER NOT NULL,
+            AUTHENTICATOR_NAME VARCHAR (255) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID));
+
+ALTER TABLE SP_REQ_PATH_AUTHENTICATOR ADD CONSTRAINT REQ_AUTH_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[SP_PROVISIONING_CONNECTOR]') AND TYPE IN (N'U'))
+CREATE TABLE SP_PROVISIONING_CONNECTOR (
+            ID INTEGER NOT NULL IDENTITY,
+            TENANT_ID INTEGER NOT NULL,
+            IDP_NAME VARCHAR (255) NOT NULL ,
+            CONNECTOR_NAME VARCHAR (255) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            IS_JIT_ENABLED CHAR(1) NOT NULL DEFAULT '0',
+            BLOCKING CHAR(1) NOT NULL DEFAULT '0',
+            PRIMARY KEY (ID));
+
+ALTER TABLE SP_PROVISIONING_CONNECTOR ADD CONSTRAINT PRO_CONNECTOR_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDP]') AND TYPE IN (N'U'))
+CREATE TABLE IDP (
+            ID INTEGER IDENTITY,
+            TENANT_ID INTEGER,
+            NAME VARCHAR(254) NOT NULL,
+            IS_ENABLED CHAR(1) NOT NULL DEFAULT '1',
+            IS_PRIMARY CHAR(1) NOT NULL DEFAULT '0',
+            HOME_REALM_ID VARCHAR(254),
+            IMAGE VARBINARY(MAX),
+            CERTIFICATE VARBINARY(MAX),
+            ALIAS VARCHAR(254),
+            INBOUND_PROV_ENABLED CHAR (1) NOT NULL DEFAULT '0',
+            INBOUND_PROV_USER_STORE_ID VARCHAR(254),
+            USER_CLAIM_URI VARCHAR(254),
+            ROLE_CLAIM_URI VARCHAR(254),
+            DESCRIPTION VARCHAR (1024),
+            DEFAULT_AUTHENTICATOR_NAME VARCHAR(254),
+            DEFAULT_PRO_CONNECTOR_NAME VARCHAR(254),
+            PROVISIONING_ROLE VARCHAR(128),
+            IS_FEDERATION_HUB CHAR(1) NOT NULL DEFAULT '0',
+            IS_LOCAL_CLAIM_DIALECT CHAR(1) NOT NULL DEFAULT '0',
+            PRIMARY KEY (ID),
+            DISPLAY_NAME VARCHAR(255),
+            UNIQUE (TENANT_ID, NAME));
+
+INSERT INTO IDP (TENANT_ID, NAME, HOME_REALM_ID) VALUES (-1234, 'LOCAL', 'localhost');
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDP_ROLE]') AND TYPE IN (N'U'))
+CREATE TABLE IDP_ROLE (
+            ID INTEGER IDENTITY,
+            IDP_ID INTEGER,
+            TENANT_ID INTEGER,
+            ROLE VARCHAR(254),
+            PRIMARY KEY (ID),
+            UNIQUE (IDP_ID, ROLE),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDP_ROLE_MAPPING]') AND TYPE IN (N'U'))
+CREATE TABLE IDP_ROLE_MAPPING (
+            ID INTEGER IDENTITY,
+            IDP_ROLE_ID INTEGER,
+            TENANT_ID INTEGER,
+            USER_STORE_ID VARCHAR (253),
+            LOCAL_ROLE VARCHAR(253),
+            PRIMARY KEY (ID),
+            UNIQUE (IDP_ROLE_ID, TENANT_ID, USER_STORE_ID, LOCAL_ROLE),
+            FOREIGN KEY (IDP_ROLE_ID) REFERENCES IDP_ROLE(ID) ON DELETE CASCADE);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDP_CLAIM]') AND TYPE IN (N'U'))
+CREATE TABLE IDP_CLAIM (
+            ID INTEGER IDENTITY,
+            IDP_ID INTEGER,
+            TENANT_ID INTEGER,
+            CLAIM VARCHAR(254),
+            PRIMARY KEY (ID),
+            UNIQUE (IDP_ID, CLAIM),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDP_CLAIM_MAPPING]') AND TYPE IN (N'U'))
+CREATE TABLE IDP_CLAIM_MAPPING (
+            ID INTEGER IDENTITY,
+            IDP_CLAIM_ID INTEGER,
+            TENANT_ID INTEGER,
+            LOCAL_CLAIM VARCHAR(253),
+            DEFAULT_VALUE VARCHAR(255),
+            IS_REQUESTED VARCHAR(128) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (IDP_CLAIM_ID, TENANT_ID, LOCAL_CLAIM),
+            FOREIGN KEY (IDP_CLAIM_ID) REFERENCES IDP_CLAIM(ID) ON DELETE CASCADE);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDP_AUTHENTICATOR]') AND TYPE IN (N'U'))
+CREATE TABLE IDP_AUTHENTICATOR (
+            ID INTEGER IDENTITY,
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            NAME VARCHAR(255) NOT NULL,
+            IS_ENABLED CHAR (1) DEFAULT '1',
+            DISPLAY_NAME VARCHAR(255),
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, NAME),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE);
+
+INSERT INTO IDP_AUTHENTICATOR (TENANT_ID, IDP_ID, NAME) VALUES (-1234, 1, 'samlsso');
+INSERT INTO IDP_AUTHENTICATOR (TENANT_ID, IDP_ID, NAME) VALUES (-1234, 1, 'IDPProperties');
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDP_AUTHENTICATOR_PROPERTY]') AND TYPE IN (N'U'))
+CREATE TABLE IDP_AUTHENTICATOR_PROPERTY (
+            ID INTEGER IDENTITY,
+            TENANT_ID INTEGER,
+            AUTHENTICATOR_ID INTEGER,
+            PROPERTY_KEY VARCHAR(255) NOT NULL,
+            PROPERTY_VALUE VARCHAR(2047),
+            IS_SECRET CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, AUTHENTICATOR_ID, PROPERTY_KEY),
+            FOREIGN KEY (AUTHENTICATOR_ID) REFERENCES IDP_AUTHENTICATOR(ID) ON DELETE CASCADE);
+
+INSERT INTO  IDP_AUTHENTICATOR_PROPERTY (TENANT_ID, AUTHENTICATOR_ID, PROPERTY_KEY,PROPERTY_VALUE, IS_SECRET ) VALUES (-1234, 1 , 'IdPEntityId', 'localhost', '0');
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDP_PROVISIONING_CONFIG]') AND TYPE IN (N'U'))
+CREATE TABLE IDP_PROVISIONING_CONFIG (
+            ID INTEGER IDENTITY,
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            PROVISIONING_CONNECTOR_TYPE VARCHAR(255) NOT NULL,
+            IS_ENABLED CHAR (1) DEFAULT '0',
+            IS_BLOCKING CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, PROVISIONING_CONNECTOR_TYPE),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDP_PROV_CONFIG_PROPERTY]') AND TYPE IN (N'U'))
+CREATE TABLE IDP_PROV_CONFIG_PROPERTY (
+            ID INTEGER IDENTITY,
+            TENANT_ID INTEGER,
+            PROVISIONING_CONFIG_ID INTEGER,
+            PROPERTY_KEY VARCHAR(255) NOT NULL,
+            PROPERTY_VALUE VARCHAR(2048),
+            PROPERTY_BLOB_VALUE VARBINARY(MAX),
+            PROPERTY_TYPE CHAR(32) NOT NULL,
+            IS_SECRET CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, PROVISIONING_CONFIG_ID, PROPERTY_KEY),
+            FOREIGN KEY (PROVISIONING_CONFIG_ID) REFERENCES IDP_PROVISIONING_CONFIG(ID) ON DELETE CASCADE);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDP_PROVISIONING_ENTITY]') AND TYPE IN (N'U'))
+CREATE TABLE IDP_PROVISIONING_ENTITY (
+            ID INTEGER IDENTITY,
+            PROVISIONING_CONFIG_ID INTEGER,
+            ENTITY_TYPE VARCHAR(255) NOT NULL,
+            ENTITY_LOCAL_USERSTORE VARCHAR(255) NOT NULL,
+            ENTITY_NAME VARCHAR(255) NOT NULL,
+            ENTITY_VALUE VARCHAR(255),
+            TENANT_ID INTEGER,
+            PRIMARY KEY (ID),
+            UNIQUE (ENTITY_TYPE, TENANT_ID, ENTITY_LOCAL_USERSTORE, ENTITY_NAME, PROVISIONING_CONFIG_ID),
+            UNIQUE (PROVISIONING_CONFIG_ID, ENTITY_TYPE, ENTITY_VALUE),
+            FOREIGN KEY (PROVISIONING_CONFIG_ID) REFERENCES IDP_PROVISIONING_CONFIG(ID) ON DELETE CASCADE);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDP_LOCAL_CLAIM]') AND TYPE IN (N'U'))
+CREATE TABLE IDP_LOCAL_CLAIM (
+            ID INTEGER IDENTITY,
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            CLAIM_URI VARCHAR(255) NOT NULL,
+            DEFAULT_VALUE VARCHAR(255),
+            IS_REQUESTED VARCHAR(128) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, CLAIM_URI),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_ASSOCIATED_ID]') AND TYPE IN (N'U'))
+CREATE TABLE IDN_ASSOCIATED_ID (
+            ID INTEGER IDENTITY,
+            IDP_USER_ID VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT -1234,
+            IDP_ID INTEGER NOT NULL,
+            DOMAIN_NAME VARCHAR(255) NOT NULL,
+            USER_NAME VARCHAR(255) NOT NULL,
+            PRIMARY KEY (ID),
+            UNIQUE(IDP_USER_ID, TENANT_ID, IDP_ID),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[IDN_USER_ACCOUNT_ASSOCIATION]') AND TYPE IN (N'U'))
+CREATE TABLE IDN_USER_ACCOUNT_ASSOCIATION (
+            ASSOCIATION_KEY VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER,
+            DOMAIN_NAME VARCHAR(255) NOT NULL,
+            USER_NAME VARCHAR(255) NOT NULL,
+            PRIMARY KEY (TENANT_ID, DOMAIN_NAME, USER_NAME));
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[FIDO_DEVICE_STORE]') AND TYPE IN (N'U'))
+CREATE TABLE FIDO_DEVICE_STORE (
+        TENANT_ID INTEGER,
+        DOMAIN_NAME VARCHAR(255) NOT NULL,
+        USER_NAME VARCHAR(45) NOT NULL,
+    TIME_REGISTERED DATETIME,
+        KEY_HANDLE VARCHAR(200) NOT NULL,
+        DEVICE_DATA VARCHAR(2048) NOT NULL,
+      PRIMARY KEY (TENANT_ID, DOMAIN_NAME, USER_NAME, KEY_HANDLE));
+      
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[WF_REQUEST]') AND TYPE IN (N'U'))
+CREATE TABLE WF_REQUEST (
+    UUID VARCHAR (45),
+    CREATED_BY VARCHAR (255),
+    TENANT_ID INTEGER DEFAULT -1,
+    OPERATION_TYPE VARCHAR (50),
+    CREATED_AT DATETIME,
+    UPDATED_AT DATETIME,
+    STATUS VARCHAR (30),
+    REQUEST VARBINARY(MAX),
+    PRIMARY KEY (UUID)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[WF_BPS_PROFILE]') AND TYPE IN (N'U'))
+CREATE TABLE WF_BPS_PROFILE (
+    PROFILE_NAME VARCHAR(45),
+    HOST_URL VARCHAR(45),
+    USERNAME VARCHAR(45),
+    PASSWORD VARCHAR(255),
+    CALLBACK_HOST VARCHAR (45),
+    CALLBACK_USERNAME VARCHAR (45),
+    CALLBACK_PASSWORD VARCHAR (255),
+    TENANT_ID VARCHAR (45),
+    PRIMARY KEY (PROFILE_NAME, TENANT_ID)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[WF_WORKFLOW]') AND TYPE IN (N'U'))
+CREATE TABLE WF_WORKFLOW(
+    ID VARCHAR (45),
+    WF_NAME VARCHAR (45),
+    DESCRIPTION VARCHAR (255),
+    TEMPLATE_ID VARCHAR (45),
+    IMPL_ID VARCHAR (45),
+    TENANT_ID VARCHAR (45),
+    PRIMARY KEY (ID)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[WF_WORKFLOW_ASSOCIATION]') AND TYPE IN (N'U'))
+CREATE TABLE WF_WORKFLOW_ASSOCIATION(
+    ID INTEGER NOT NULL IDENTITY ,
+    ASSOC_NAME VARCHAR (45),
+    EVENT_ID VARCHAR(45),
+    ASSOC_CONDITION VARCHAR (2000),
+    WORKFLOW_ID VARCHAR (45),
+    IS_ENABLED CHAR (1) DEFAULT '1',
+    PRIMARY KEY(ID),
+    FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[WF_WORKFLOW_CONFIG_PARAM]') AND TYPE IN (N'U'))
+CREATE TABLE WF_WORKFLOW_CONFIG_PARAM(
+    WORKFLOW_ID VARCHAR (45),
+    PARAM_NAME VARCHAR (45),
+    PARAM_VALUE VARCHAR (1000),
+    PRIMARY KEY (WORKFLOW_ID, PARAM_NAME),
+    FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[WF_REQUEST_ENTITY_RELATIONSHIP]') AND TYPE IN (N'U'))
+CREATE TABLE WF_REQUEST_ENTITY_RELATIONSHIP(
+  REQUEST_ID VARCHAR (45),
+  ENTITY_NAME VARCHAR (255),
+  ENTITY_TYPE VARCHAR (50),
+  TENANT_ID INTEGER DEFAULT -1,
+  PRIMARY KEY(REQUEST_ID, ENTITY_NAME, ENTITY_TYPE, TENANT_ID),
+  FOREIGN KEY (REQUEST_ID) REFERENCES WF_REQUEST(UUID)ON DELETE CASCADE
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[WORKFLOW_REQUEST_RELATION]') AND TYPE IN (N'U'))
+CREATE TABLE WORKFLOW_REQUEST_RELATION(
+  RELATIONSHIP_ID VARCHAR (45),
+  WORKFLOW_ID VARCHAR (45),
+  REQUEST_ID VARCHAR (45),
+  UPDATED_AT DATETIME,
+  STATUS VARCHAR (30),
+  PRIMARY KEY (RELATIONSHIP_ID),
+  FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE,
+  FOREIGN KEY (REQUEST_ID) REFERENCES WF_REQUEST(UUID)ON DELETE CASCADE
+);
+
+-- End of IDENTITY Tables--
+
+-- Start of API-Mgt Tables --
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_SUBSCRIBER]') AND TYPE IN (N'U'))
+
+CREATE TABLE AM_SUBSCRIBER (
+    SUBSCRIBER_ID INTEGER IDENTITY(1,1),
+    USER_ID VARCHAR(255) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    EMAIL_ADDRESS VARCHAR(256) NULL,
+    DATE_SUBSCRIBED DATETIME NOT NULL,
+    CREATED_BY VARCHAR(100),
+    CREATED_TIME DATETIME,
+    UPDATED_BY VARCHAR(100),
+    UPDATED_TIME DATETIME,
+    PRIMARY KEY (SUBSCRIBER_ID),
+    UNIQUE (TENANT_ID,USER_ID)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_APPLICATION]') AND TYPE IN (N'U'))
+
+CREATE TABLE AM_APPLICATION (
+    APPLICATION_ID INTEGER IDENTITY(1,1),
+    NAME VARCHAR(100),
+    SUBSCRIBER_ID INTEGER,
+    APPLICATION_TIER VARCHAR(50) DEFAULT 'Unlimited',
+    CALLBACK_URL VARCHAR(512),
+    DESCRIPTION VARCHAR(512),
+    GROUP_ID VARCHAR(100),
+	APPLICATION_STATUS VARCHAR(50) DEFAULT 'APPROVED',
+    CREATED_BY VARCHAR(100),
+    CREATED_TIME DATETIME,
+    UPDATED_BY VARCHAR(100),
+    UPDATED_TIME DATETIME,
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON UPDATE CASCADE,
+    PRIMARY KEY(APPLICATION_ID),
+    UNIQUE (NAME,SUBSCRIBER_ID)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_API]') AND TYPE IN (N'U'))
+
+CREATE TABLE AM_API (
+    API_ID INTEGER IDENTITY(1,1),
+    API_PROVIDER VARCHAR(200),
+    API_NAME VARCHAR(200),
+    API_VERSION VARCHAR(30),
+    CONTEXT VARCHAR(256),
+    CONTEXT_TEMPLATE VARCHAR(256),
+    CREATED_BY VARCHAR(100),
+    CREATED_TIME DATETIME,
+    UPDATED_BY VARCHAR(100),
+    UPDATED_TIME DATETIME,
+    PRIMARY KEY(API_ID),
+    UNIQUE (API_PROVIDER,API_NAME,API_VERSION)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_API_URL_MAPPING]') AND TYPE IN (N'U'))
+
+CREATE TABLE AM_API_URL_MAPPING (
+    URL_MAPPING_ID INTEGER IDENTITY(1,1),
+    API_ID INTEGER NOT NULL,
+    HTTP_METHOD VARCHAR(20) NULL,
+    AUTH_SCHEME VARCHAR(50) NULL,
+    URL_PATTERN VARCHAR(512) NULL,
+    THROTTLING_TIER varchar(512) DEFAULT NULL,
+    MEDIATION_SCRIPT VARBINARY(MAX),
+    PRIMARY KEY (URL_MAPPING_ID)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_SUBSCRIPTION]') AND TYPE IN (N'U'))
+
+CREATE TABLE AM_SUBSCRIPTION (
+    SUBSCRIPTION_ID INTEGER IDENTITY(1,1),
+    TIER_ID VARCHAR(50),
+    API_ID INTEGER,
+    LAST_ACCESSED DATETIME NULL,
+    APPLICATION_ID INTEGER,
+    SUB_STATUS VARCHAR(50),
+    SUBS_CREATE_STATE VARCHAR(50) DEFAULT 'SUBSCRIBE',
+    CREATED_BY VARCHAR(100),
+    CREATED_TIME DATETIME,
+    UPDATED_BY VARCHAR(100),
+    UPDATED_TIME DATETIME,
+    FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE,
+    PRIMARY KEY (SUBSCRIPTION_ID)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_SUBSCRIPTION_KEY_MAPPING]') AND TYPE IN (N'U'))
+
+CREATE TABLE AM_SUBSCRIPTION_KEY_MAPPING (
+    SUBSCRIPTION_ID INTEGER,
+    ACCESS_TOKEN VARCHAR(255),
+    KEY_TYPE VARCHAR(512) NOT NULL,
+    FOREIGN KEY(SUBSCRIPTION_ID) REFERENCES AM_SUBSCRIPTION(SUBSCRIPTION_ID) ON UPDATE CASCADE,
+    PRIMARY KEY(SUBSCRIPTION_ID,ACCESS_TOKEN)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_APPLICATION_KEY_MAPPING]') AND TYPE IN (N'U'))
+
+CREATE TABLE AM_APPLICATION_KEY_MAPPING (
+    APPLICATION_ID INTEGER,
+    CONSUMER_KEY VARCHAR(512),
+    KEY_TYPE VARCHAR(512) NOT NULL,
+    STATE VARCHAR(30) NOT NULL,
+    CREATE_MODE VARCHAR(30) DEFAULT 'CREATED',
+    FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE,
+    PRIMARY KEY(APPLICATION_ID,KEY_TYPE)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_APPLICATION_REGISTRATION]') AND TYPE IN (N'U'))
+
+CREATE TABLE AM_APPLICATION_REGISTRATION (
+    REG_ID INTEGER IDENTITY(1,1),
+    SUBSCRIBER_ID INTEGER,
+    WF_REF VARCHAR(255) NOT NULL,
+    APP_ID INTEGER,
+    TOKEN_TYPE VARCHAR(30),
+    TOKEN_SCOPE VARCHAR(256) DEFAULT 'default',
+    INPUTS VARCHAR(1000),
+    ALLOWED_DOMAINS VARCHAR(256),
+    VALIDITY_PERIOD BIGINT,
+    UNIQUE (SUBSCRIBER_ID,APP_ID,TOKEN_TYPE),
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON DELETE NO ACTION,
+    FOREIGN KEY(APP_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE NO ACTION,
+    PRIMARY KEY (REG_ID)
+);
+
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_API_LC_EVENT]') AND TYPE IN (N'U'))
+
+CREATE TABLE AM_API_LC_EVENT (
+    EVENT_ID INTEGER IDENTITY(1,1),
+    API_ID INTEGER NOT NULL,
+    PREVIOUS_STATE VARCHAR(50),
+    NEW_STATE VARCHAR(50) NOT NULL,
+    USER_ID VARCHAR(255) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    EVENT_DATE DATETIME NOT NULL,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE,
+    PRIMARY KEY (EVENT_ID)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_APP_KEY_DOMAIN_MAPPING]') AND TYPE IN (N'U'))
+
+CREATE TABLE AM_APP_KEY_DOMAIN_MAPPING (
+   CONSUMER_KEY VARCHAR(512),
+   AUTHZ_DOMAIN VARCHAR(255) DEFAULT 'ALL',
+   PRIMARY KEY (CONSUMER_KEY,AUTHZ_DOMAIN)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_API_COMMENTS]') AND TYPE IN (N'U'))
+
+CREATE TABLE AM_API_COMMENTS (
+    COMMENT_ID INTEGER IDENTITY(1,1),
+    COMMENT_TEXT VARCHAR(512),
+    COMMENTED_USER VARCHAR(255),
+    DATE_COMMENTED DATETIME NOT NULL,
+    API_ID INTEGER NOT NULL,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE,
+    PRIMARY KEY (COMMENT_ID)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_API_RATINGS]') AND TYPE IN (N'U'))
+
+CREATE TABLE AM_API_RATINGS (
+    RATING_ID INTEGER IDENTITY(1,1),
+    API_ID INTEGER,
+    RATING INTEGER,
+    SUBSCRIBER_ID INTEGER,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE,
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON UPDATE CASCADE,
+    PRIMARY KEY (RATING_ID)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_TIER_PERMISSIONS]') AND TYPE IN (N'U'))
+
+CREATE TABLE AM_TIER_PERMISSIONS (
+    TIER_PERMISSIONS_ID INTEGER IDENTITY(1,1),
+    TIER VARCHAR(50) NOT NULL,
+    PERMISSIONS_TYPE VARCHAR(50) NOT NULL,
+    ROLES VARCHAR(512) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    PRIMARY KEY(TIER_PERMISSIONS_ID)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_EXTERNAL_STORES]') AND TYPE IN (N'U'))
+
+CREATE TABLE AM_EXTERNAL_STORES (
+    APISTORE_ID INTEGER IDENTITY(1,1),
+    API_ID INTEGER,
+    STORE_ID VARCHAR(255) NOT NULL,
+    STORE_DISPLAY_NAME VARCHAR(255) NOT NULL,
+    STORE_ENDPOINT VARCHAR(255) NOT NULL,
+    STORE_TYPE VARCHAR(255) NOT NULL,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE,
+    PRIMARY KEY (API_ID)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_WORKFLOWS]') AND TYPE IN (N'U'))
+
+CREATE TABLE AM_WORKFLOWS(
+    WF_ID INTEGER IDENTITY(1,1),
+    WF_REFERENCE VARCHAR(255) NOT NULL,
+    WF_TYPE VARCHAR(255) NOT NULL,
+    WF_STATUS VARCHAR(255) NOT NULL,
+    WF_CREATED_TIME DATETIME DEFAULT GETDATE(),
+    WF_UPDATED_TIME DATETIME DEFAULT GETDATE(),
+    WF_STATUS_DESC VARCHAR(1000),
+    TENANT_ID INTEGER,
+    TENANT_DOMAIN VARCHAR(255),
+    WF_EXTERNAL_REFERENCE VARCHAR(255) NOT NULL UNIQUE,
+    PRIMARY KEY (WF_ID)
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_API_SCOPES]') AND TYPE IN (N'U'))
+
+CREATE TABLE AM_API_SCOPES (
+   API_ID  INTEGER NOT NULL,
+   SCOPE_ID  INTEGER NOT NULL,
+   FOREIGN KEY (API_ID) REFERENCES AM_API (API_ID) ON DELETE CASCADE ON UPDATE CASCADE,
+   FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID) ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[AM_API_DEFAULT_VERSION]') AND TYPE IN (N'U'))
+
+CREATE TABLE AM_API_DEFAULT_VERSION (
+            DEFAULT_VERSION_ID INTEGER NOT NULL IDENTITY, 
+            API_NAME VARCHAR(256) NOT NULL ,
+            API_PROVIDER VARCHAR(256) NOT NULL , 
+            DEFAULT_API_VERSION VARCHAR(30) , 
+            PUBLISHED_DEFAULT_API_VERSION VARCHAR(30) ,
+            PRIMARY KEY (DEFAULT_VERSION_ID)
+);
+
+
+CREATE INDEX IDX_SUB_APP_ID ON AM_SUBSCRIPTION (APPLICATION_ID, SUBSCRIPTION_ID);
diff --git a/modules/distribution/src/api-resource/sql/mysql.sql b/modules/distribution/src/api-resource/sql/mysql.sql
new file mode 100644
index 00000000..cc11e337
--- /dev/null
+++ b/modules/distribution/src/api-resource/sql/mysql.sql
@@ -0,0 +1,752 @@
+-- Start of IDENTITY --
+CREATE TABLE IF NOT EXISTS IDN_BASE_TABLE (
+            PRODUCT_NAME VARCHAR(20),
+            PRIMARY KEY (PRODUCT_NAME)
+)ENGINE INNODB;
+
+INSERT INTO IDN_BASE_TABLE values ('WSO2 Identity Server');
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH_CONSUMER_APPS (
+            ID INTEGER NOT NULL AUTO_INCREMENT,
+            CONSUMER_KEY VARCHAR(255),
+            CONSUMER_SECRET VARCHAR(512),
+            USERNAME VARCHAR(255),
+            TENANT_ID INTEGER DEFAULT 0,
+            APP_NAME VARCHAR(255),
+            OAUTH_VERSION VARCHAR(128),
+            CALLBACK_URL VARCHAR(1024),
+            GRANT_TYPES VARCHAR (1024),
+            CONSTRAINT CONSUMER_KEY_CONSTRAINT UNIQUE (CONSUMER_KEY),
+            PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH1A_REQUEST_TOKEN (
+            REQUEST_TOKEN VARCHAR(255),
+            REQUEST_TOKEN_SECRET VARCHAR(512),
+            CONSUMER_KEY_ID INTEGER,
+            CALLBACK_URL VARCHAR(1024),
+            SCOPE VARCHAR(2048),
+            AUTHORIZED VARCHAR(128),
+            OAUTH_VERIFIER VARCHAR(512),
+            AUTHZ_USER VARCHAR(512),
+            PRIMARY KEY (REQUEST_TOKEN),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH1A_ACCESS_TOKEN (
+            ACCESS_TOKEN VARCHAR(255),
+            ACCESS_TOKEN_SECRET VARCHAR(512),
+            CONSUMER_KEY_ID INTEGER,
+            SCOPE VARCHAR(2048),
+            AUTHZ_USER VARCHAR(512),
+            PRIMARY KEY (ACCESS_TOKEN),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH2_ACCESS_TOKEN (
+            TOKEN_ID VARCHAR (255),
+            ACCESS_TOKEN VARCHAR(255),
+            REFRESH_TOKEN VARCHAR(255),
+            CONSUMER_KEY_ID INTEGER,
+            AUTHZ_USER VARCHAR (100),
+            TENANT_ID INTEGER,
+            USER_DOMAIN VARCHAR(50),
+            USER_TYPE VARCHAR (25),
+            TIME_CREATED TIMESTAMP DEFAULT 0,
+            REFRESH_TOKEN_TIME_CREATED TIMESTAMP DEFAULT 0,
+            VALIDITY_PERIOD BIGINT,
+            REFRESH_TOKEN_VALIDITY_PERIOD BIGINT,
+            TOKEN_SCOPE_HASH VARCHAR(32),
+            TOKEN_STATE VARCHAR(25) DEFAULT 'ACTIVE',
+            TOKEN_STATE_ID VARCHAR (128) DEFAULT 'NONE',
+            PRIMARY KEY (TOKEN_ID),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE,
+            CONSTRAINT CON_APP_KEY UNIQUE (CONSUMER_KEY_ID,AUTHZ_USER,TENANT_ID,USER_DOMAIN,USER_TYPE,TOKEN_SCOPE_HASH,
+                                           TOKEN_STATE,TOKEN_STATE_ID)
+)ENGINE INNODB;
+
+CREATE INDEX IDX_AT_CK_AU ON IDN_OAUTH2_ACCESS_TOKEN(CONSUMER_KEY_ID, AUTHZ_USER, TOKEN_STATE, USER_TYPE);
+
+CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED);
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH2_AUTHORIZATION_CODE (
+            AUTHORIZATION_CODE VARCHAR(512),
+            CONSUMER_KEY_ID INTEGER,
+            CALLBACK_URL VARCHAR(1024),
+            SCOPE VARCHAR(2048),
+            AUTHZ_USER VARCHAR (100),
+            TENANT_ID INTEGER,
+            USER_DOMAIN VARCHAR(50),
+            TIME_CREATED TIMESTAMP,
+            VALIDITY_PERIOD BIGINT,
+            STATE VARCHAR (25) DEFAULT 'ACTIVE',
+            TOKEN_ID VARCHAR(255),
+            PRIMARY KEY (AUTHORIZATION_CODE),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH2_SCOPE_ASSOCIATION (
+            TOKEN_ID VARCHAR (255),
+            TOKEN_SCOPE VARCHAR (60),
+            PRIMARY KEY (TOKEN_ID, TOKEN_SCOPE),
+            FOREIGN KEY (TOKEN_ID) REFERENCES IDN_OAUTH2_ACCESS_TOKEN(TOKEN_ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH2_SCOPE (
+            SCOPE_ID INT(11) NOT NULL AUTO_INCREMENT,
+            SCOPE_KEY VARCHAR(100) NOT NULL,
+            NAME VARCHAR(255) NULL,
+            DESCRIPTION VARCHAR(512) NULL,
+            TENANT_ID INT(11) NOT NULL DEFAULT 0,
+            ROLES VARCHAR (500) NULL,
+            PRIMARY KEY (SCOPE_ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH2_RESOURCE_SCOPE (
+            RESOURCE_PATH VARCHAR(255) NOT NULL,
+            SCOPE_ID INTEGER (11) NOT NULL,
+            PRIMARY KEY (RESOURCE_PATH),
+            FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_SCIM_GROUP (
+            ID INTEGER AUTO_INCREMENT,
+            TENANT_ID INTEGER NOT NULL,
+            ROLE_NAME VARCHAR(255) NOT NULL,
+            ATTR_NAME VARCHAR(1024) NOT NULL,
+            ATTR_VALUE VARCHAR(1024),
+            PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_OPENID_REMEMBER_ME (
+            USER_NAME VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT 0,
+            COOKIE_VALUE VARCHAR(1024),
+            CREATED_TIME TIMESTAMP,
+            PRIMARY KEY (USER_NAME, TENANT_ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_OPENID_USER_RPS (
+            USER_NAME VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT 0,
+            RP_URL VARCHAR(255) NOT NULL,
+            TRUSTED_ALWAYS VARCHAR(128) DEFAULT 'FALSE',
+            LAST_VISIT DATE NOT NULL,
+            VISIT_COUNT INTEGER DEFAULT 0,
+            DEFAULT_PROFILE_NAME VARCHAR(255) DEFAULT 'DEFAULT',
+            PRIMARY KEY (USER_NAME, TENANT_ID, RP_URL)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_OPENID_ASSOCIATIONS (
+            HANDLE VARCHAR(255) NOT NULL,
+            ASSOC_TYPE VARCHAR(255) NOT NULL,
+            EXPIRE_IN TIMESTAMP NOT NULL,
+            MAC_KEY VARCHAR(255) NOT NULL,
+            ASSOC_STORE VARCHAR(128) DEFAULT 'SHARED',
+            PRIMARY KEY (HANDLE)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_STS_STORE (
+            ID INTEGER AUTO_INCREMENT,
+            TOKEN_ID VARCHAR(255) NOT NULL,
+            TOKEN_CONTENT BLOB(1024) NOT NULL,
+            CREATE_DATE TIMESTAMP NOT NULL,
+            EXPIRE_DATE TIMESTAMP NOT NULL,
+            STATE INTEGER DEFAULT 0,
+            PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_IDENTITY_USER_DATA (
+            TENANT_ID INTEGER DEFAULT -1234,
+            USER_NAME VARCHAR(255) NOT NULL,
+            DATA_KEY VARCHAR(255) NOT NULL,
+            DATA_VALUE VARCHAR(255),
+            PRIMARY KEY (TENANT_ID, USER_NAME, DATA_KEY)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_IDENTITY_META_DATA (
+            USER_NAME VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT -1234,
+            METADATA_TYPE VARCHAR(255) NOT NULL,
+            METADATA VARCHAR(255) NOT NULL,
+            VALID VARCHAR(255) NOT NULL,
+            PRIMARY KEY (TENANT_ID, USER_NAME, METADATA_TYPE,METADATA)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_THRIFT_SESSION (
+            SESSION_ID VARCHAR(255) NOT NULL,
+            USER_NAME VARCHAR(255) NOT NULL,
+            CREATED_TIME VARCHAR(255) NOT NULL,
+            LAST_MODIFIED_TIME VARCHAR(255) NOT NULL,
+            PRIMARY KEY (SESSION_ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_AUTH_SESSION_STORE (
+            SESSION_ID VARCHAR (100) NOT NULL,
+            SESSION_TYPE VARCHAR(100) NOT NULL,
+            SESSION_OBJECT BLOB,
+            TIME_CREATED TIMESTAMP,
+            PRIMARY KEY (SESSION_ID, SESSION_TYPE)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS SP_APP (
+        ID INTEGER NOT NULL AUTO_INCREMENT,
+        TENANT_ID INTEGER NOT NULL,
+            APP_NAME VARCHAR (255) NOT NULL ,
+            USER_STORE VARCHAR (255) NOT NULL,
+        USERNAME VARCHAR (255) NOT NULL ,
+        DESCRIPTION VARCHAR (1024),
+            ROLE_CLAIM VARCHAR (512),
+        AUTH_TYPE VARCHAR (255) NOT NULL,
+            PROVISIONING_USERSTORE_DOMAIN VARCHAR (512),
+            IS_LOCAL_CLAIM_DIALECT CHAR(1) DEFAULT '1',
+            IS_SEND_LOCAL_SUBJECT_ID CHAR(1) DEFAULT '0',
+            IS_SEND_AUTH_LIST_OF_IDPS CHAR(1) DEFAULT '0',
+        IS_USE_TENANT_DOMAIN_SUBJECT CHAR(1) DEFAULT '1',
+        IS_USE_USER_DOMAIN_SUBJECT CHAR(1) DEFAULT '1',
+            SUBJECT_CLAIM_URI VARCHAR (512),
+            IS_SAAS_APP CHAR(1) DEFAULT '0',
+        PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+ALTER TABLE SP_APP ADD CONSTRAINT APPLICATION_NAME_CONSTRAINT UNIQUE(APP_NAME, TENANT_ID);
+
+CREATE TABLE IF NOT EXISTS SP_INBOUND_AUTH (
+            ID INTEGER NOT NULL AUTO_INCREMENT,
+            TENANT_ID INTEGER NOT NULL,
+            INBOUND_AUTH_KEY VARCHAR (255) NOT NULL,
+            INBOUND_AUTH_TYPE VARCHAR (255) NOT NULL,
+            PROP_NAME VARCHAR (255),
+            PROP_VALUE VARCHAR (1024) ,
+            APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+ALTER TABLE SP_INBOUND_AUTH ADD CONSTRAINT APPLICATION_ID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS SP_AUTH_STEP (
+            ID INTEGER NOT NULL AUTO_INCREMENT,
+            TENANT_ID INTEGER NOT NULL,
+            STEP_ORDER INTEGER DEFAULT 1,
+            APP_ID INTEGER NOT NULL ,
+            IS_SUBJECT_STEP CHAR(1) DEFAULT '0',
+            IS_ATTRIBUTE_STEP CHAR(1) DEFAULT '0',
+            PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+ALTER TABLE SP_AUTH_STEP ADD CONSTRAINT APPLICATION_ID_CONSTRAINT_STEP FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS SP_FEDERATED_IDP (
+            ID INTEGER NOT NULL,
+            TENANT_ID INTEGER NOT NULL,
+            AUTHENTICATOR_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID, AUTHENTICATOR_ID)
+)ENGINE INNODB;
+
+ALTER TABLE SP_FEDERATED_IDP ADD CONSTRAINT STEP_ID_CONSTRAINT FOREIGN KEY (ID) REFERENCES SP_AUTH_STEP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS SP_CLAIM_MAPPING (
+            ID INTEGER NOT NULL AUTO_INCREMENT,
+            TENANT_ID INTEGER NOT NULL,
+            IDP_CLAIM VARCHAR (512) NOT NULL ,
+            SP_CLAIM VARCHAR (512) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            IS_REQUESTED VARCHAR(128) DEFAULT '0',
+            DEFAULT_VALUE VARCHAR(255),
+            PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+ALTER TABLE SP_CLAIM_MAPPING ADD CONSTRAINT CLAIMID_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS SP_ROLE_MAPPING (
+            ID INTEGER NOT NULL AUTO_INCREMENT,
+            TENANT_ID INTEGER NOT NULL,
+            IDP_ROLE VARCHAR (255) NOT NULL ,
+            SP_ROLE VARCHAR (255) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+ALTER TABLE SP_ROLE_MAPPING ADD CONSTRAINT ROLEID_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS SP_REQ_PATH_AUTHENTICATOR (
+            ID INTEGER NOT NULL AUTO_INCREMENT,
+            TENANT_ID INTEGER NOT NULL,
+            AUTHENTICATOR_NAME VARCHAR (255) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+ALTER TABLE SP_REQ_PATH_AUTHENTICATOR ADD CONSTRAINT REQ_AUTH_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS SP_PROVISIONING_CONNECTOR (
+            ID INTEGER NOT NULL AUTO_INCREMENT,
+            TENANT_ID INTEGER NOT NULL,
+            IDP_NAME VARCHAR (255) NOT NULL ,
+            CONNECTOR_NAME VARCHAR (255) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            IS_JIT_ENABLED CHAR(1) NOT NULL DEFAULT '0',
+            BLOCKING CHAR(1) NOT NULL DEFAULT '0',
+            PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+ALTER TABLE SP_PROVISIONING_CONNECTOR ADD CONSTRAINT PRO_CONNECTOR_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS IDP (
+                  ID INTEGER AUTO_INCREMENT,
+                  TENANT_ID INTEGER,
+                  NAME VARCHAR(254) NOT NULL,
+                  IS_ENABLED CHAR(1) NOT NULL DEFAULT '1',
+                  IS_PRIMARY CHAR(1) NOT NULL DEFAULT '0',
+                  HOME_REALM_ID VARCHAR(254),
+                  IMAGE MEDIUMBLOB,
+                  CERTIFICATE BLOB,
+                  ALIAS VARCHAR(254),
+                  INBOUND_PROV_ENABLED CHAR (1) NOT NULL DEFAULT '0',
+                  INBOUND_PROV_USER_STORE_ID VARCHAR(254),
+                  USER_CLAIM_URI VARCHAR(254),
+                  ROLE_CLAIM_URI VARCHAR(254),
+                  DESCRIPTION VARCHAR (1024),
+                  DEFAULT_AUTHENTICATOR_NAME VARCHAR(254),
+                  DEFAULT_PRO_CONNECTOR_NAME VARCHAR(254),
+                  PROVISIONING_ROLE VARCHAR(128),
+                  IS_FEDERATION_HUB CHAR(1) NOT NULL DEFAULT '0',
+                  IS_LOCAL_CLAIM_DIALECT CHAR(1) NOT NULL DEFAULT '0',
+            DISPLAY_NAME VARCHAR(255),
+                  PRIMARY KEY (ID),
+                  UNIQUE (TENANT_ID, NAME)
+)ENGINE INNODB;
+
+INSERT INTO IDP (TENANT_ID, NAME, HOME_REALM_ID) VALUES (-1234, 'LOCAL', 'localhost');
+
+CREATE TABLE IF NOT EXISTS IDP_ROLE (
+                  ID INTEGER AUTO_INCREMENT,
+                  IDP_ID INTEGER,
+                  TENANT_ID INTEGER,
+                  ROLE VARCHAR(254),
+                  PRIMARY KEY (ID),
+                  UNIQUE (IDP_ID, ROLE),
+                  FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDP_ROLE_MAPPING (
+                  ID INTEGER AUTO_INCREMENT,
+                  IDP_ROLE_ID INTEGER,
+                  TENANT_ID INTEGER,
+                  USER_STORE_ID VARCHAR (253),
+                  LOCAL_ROLE VARCHAR(253),
+                  PRIMARY KEY (ID),
+                  UNIQUE (IDP_ROLE_ID, TENANT_ID, USER_STORE_ID, LOCAL_ROLE),
+                  FOREIGN KEY (IDP_ROLE_ID) REFERENCES IDP_ROLE(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDP_CLAIM (
+                  ID INTEGER AUTO_INCREMENT,
+                  IDP_ID INTEGER,
+                  TENANT_ID INTEGER,
+                  CLAIM VARCHAR(254),
+                  PRIMARY KEY (ID),
+                  UNIQUE (IDP_ID, CLAIM),
+                  FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDP_CLAIM_MAPPING (
+            ID INTEGER AUTO_INCREMENT,
+            IDP_CLAIM_ID INTEGER,
+            TENANT_ID INTEGER,
+            LOCAL_CLAIM VARCHAR(253),
+            DEFAULT_VALUE VARCHAR(255),
+            IS_REQUESTED VARCHAR(128) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (IDP_CLAIM_ID, TENANT_ID, LOCAL_CLAIM),
+            FOREIGN KEY (IDP_CLAIM_ID) REFERENCES IDP_CLAIM(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDP_AUTHENTICATOR (
+            ID INTEGER AUTO_INCREMENT,
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            NAME VARCHAR(255) NOT NULL,
+            IS_ENABLED CHAR (1) DEFAULT '1',
+            DISPLAY_NAME VARCHAR(255),
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, NAME),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+INSERT INTO IDP_AUTHENTICATOR (TENANT_ID, IDP_ID, NAME) VALUES (-1234, 1, 'samlsso');
+INSERT INTO IDP_AUTHENTICATOR (TENANT_ID, IDP_ID, NAME) VALUES (-1234, 1, 'IDPProperties');
+
+CREATE TABLE IF NOT EXISTS IDP_AUTHENTICATOR_PROPERTY (
+            ID INTEGER AUTO_INCREMENT,
+            TENANT_ID INTEGER,
+            AUTHENTICATOR_ID INTEGER,
+            PROPERTY_KEY VARCHAR(255) NOT NULL,
+            PROPERTY_VALUE VARCHAR(2047),
+            IS_SECRET CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, AUTHENTICATOR_ID, PROPERTY_KEY),
+            FOREIGN KEY (AUTHENTICATOR_ID) REFERENCES IDP_AUTHENTICATOR(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+INSERT INTO  IDP_AUTHENTICATOR_PROPERTY (TENANT_ID, AUTHENTICATOR_ID, PROPERTY_KEY,PROPERTY_VALUE, IS_SECRET ) VALUES (-1234, 1 , 'IdPEntityId', 'localhost', '0');
+
+CREATE TABLE IF NOT EXISTS IDP_PROVISIONING_CONFIG (
+            ID INTEGER AUTO_INCREMENT,
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            PROVISIONING_CONNECTOR_TYPE VARCHAR(255) NOT NULL,
+            IS_ENABLED CHAR (1) DEFAULT '0',
+            IS_BLOCKING CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, PROVISIONING_CONNECTOR_TYPE),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDP_PROV_CONFIG_PROPERTY (
+            ID INTEGER AUTO_INCREMENT,
+            TENANT_ID INTEGER,
+            PROVISIONING_CONFIG_ID INTEGER,
+            PROPERTY_KEY VARCHAR(255) NOT NULL,
+            PROPERTY_VALUE VARCHAR(2048),
+            PROPERTY_BLOB_VALUE BLOB,
+            PROPERTY_TYPE CHAR(32) NOT NULL,
+            IS_SECRET CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, PROVISIONING_CONFIG_ID, PROPERTY_KEY),
+            FOREIGN KEY (PROVISIONING_CONFIG_ID) REFERENCES IDP_PROVISIONING_CONFIG(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDP_PROVISIONING_ENTITY (
+            ID INTEGER AUTO_INCREMENT,
+            PROVISIONING_CONFIG_ID INTEGER,
+            ENTITY_TYPE VARCHAR(255) NOT NULL,
+            ENTITY_LOCAL_USERSTORE VARCHAR(255) NOT NULL,
+            ENTITY_NAME VARCHAR(255) NOT NULL,
+            ENTITY_VALUE VARCHAR(255),
+            TENANT_ID INTEGER,
+            PRIMARY KEY (ID),
+            UNIQUE (ENTITY_TYPE, TENANT_ID, ENTITY_LOCAL_USERSTORE, ENTITY_NAME, PROVISIONING_CONFIG_ID),
+            UNIQUE (PROVISIONING_CONFIG_ID, ENTITY_TYPE, ENTITY_VALUE),
+            FOREIGN KEY (PROVISIONING_CONFIG_ID) REFERENCES IDP_PROVISIONING_CONFIG(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDP_LOCAL_CLAIM (
+            ID INTEGER AUTO_INCREMENT,
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            CLAIM_URI VARCHAR(255) NOT NULL,
+            DEFAULT_VALUE VARCHAR(255),
+            IS_REQUESTED VARCHAR(128) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, CLAIM_URI),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_ASSOCIATED_ID (
+            ID INTEGER AUTO_INCREMENT,
+            IDP_USER_ID VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT -1234,
+            IDP_ID INTEGER NOT NULL,
+            DOMAIN_NAME VARCHAR(255) NOT NULL,
+            USER_NAME VARCHAR(255) NOT NULL,
+            PRIMARY KEY (ID),
+            UNIQUE(IDP_USER_ID, TENANT_ID, IDP_ID),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_USER_ACCOUNT_ASSOCIATION (
+            ASSOCIATION_KEY VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER,
+            DOMAIN_NAME VARCHAR(255) NOT NULL,
+            USER_NAME VARCHAR(255) NOT NULL,
+            PRIMARY KEY (TENANT_ID, DOMAIN_NAME, USER_NAME)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS FIDO_DEVICE_STORE (
+            TENANT_ID INTEGER,
+            DOMAIN_NAME VARCHAR(255) NOT NULL,
+            USER_NAME VARCHAR(45) NOT NULL,
+            TIME_REGISTERED TIMESTAMP,
+            KEY_HANDLE VARCHAR(200) NOT NULL,
+            DEVICE_DATA VARCHAR(2048) NOT NULL,
+            PRIMARY KEY (TENANT_ID, DOMAIN_NAME, USER_NAME, KEY_HANDLE)
+        )ENGINE INNODB;
+              
+CREATE TABLE IF NOT EXISTS WF_REQUEST (
+    UUID VARCHAR (45),
+    CREATED_BY VARCHAR (255),
+    TENANT_ID INTEGER DEFAULT -1,
+    OPERATION_TYPE VARCHAR (50),
+    CREATED_AT TIMESTAMP,
+    UPDATED_AT TIMESTAMP,
+    STATUS VARCHAR (30),
+    REQUEST BLOB,
+    PRIMARY KEY (UUID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS WF_BPS_PROFILE (
+    PROFILE_NAME VARCHAR(45),
+    HOST_URL VARCHAR(45),
+    USERNAME VARCHAR(45),
+    PASSWORD VARCHAR(255),
+    CALLBACK_HOST VARCHAR (45),
+    CALLBACK_USERNAME VARCHAR (45),
+    CALLBACK_PASSWORD VARCHAR (255),
+    TENANT_ID VARCHAR (45),
+    PRIMARY KEY (PROFILE_NAME, TENANT_ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS WF_WORKFLOW(
+    ID VARCHAR (45),
+    WF_NAME VARCHAR (45),
+    DESCRIPTION VARCHAR (255),
+    TEMPLATE_ID VARCHAR (45),
+    IMPL_ID VARCHAR (45),
+    TENANT_ID VARCHAR (45),
+    PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS WF_WORKFLOW_ASSOCIATION(
+    ID INTEGER NOT NULL AUTO_INCREMENT,
+    ASSOC_NAME VARCHAR (45),
+    EVENT_ID VARCHAR(45),
+    ASSOC_CONDITION VARCHAR (2000),
+    WORKFLOW_ID VARCHAR (45),
+    IS_ENABLED CHAR (1) DEFAULT '1',
+    PRIMARY KEY(ID),
+    FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS WF_WORKFLOW_CONFIG_PARAM(
+    WORKFLOW_ID VARCHAR (45),
+    PARAM_NAME VARCHAR (45),
+    PARAM_VALUE VARCHAR (1000),
+    PRIMARY KEY (WORKFLOW_ID, PARAM_NAME),
+    FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE
+)ENGINE INNODB;
+
+
+
+CREATE TABLE IF NOT EXISTS WF_REQUEST_ENTITY_RELATIONSHIP(
+  REQUEST_ID VARCHAR (45),
+  ENTITY_NAME VARCHAR (255),
+  ENTITY_TYPE VARCHAR (50),
+  TENANT_ID INTEGER DEFAULT -1,
+  PRIMARY KEY(REQUEST_ID, ENTITY_NAME, ENTITY_TYPE, TENANT_ID),
+  FOREIGN KEY (REQUEST_ID) REFERENCES WF_REQUEST(UUID)ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS WORKFLOW_REQUEST_RELATION(
+  RELATIONSHIP_ID VARCHAR (45),
+  WORKFLOW_ID VARCHAR (45),
+  REQUEST_ID VARCHAR (45),
+  UPDATED_AT TIMESTAMP,
+  STATUS VARCHAR (30),
+  PRIMARY KEY (RELATIONSHIP_ID),
+  FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE,
+  FOREIGN KEY (REQUEST_ID) REFERENCES WF_REQUEST(UUID)ON DELETE CASCADE
+)ENGINE INNODB;
+
+-- End of IDENTITY Tables--
+
+-- Start of API-MGT Tables --
+CREATE TABLE IF NOT EXISTS AM_SUBSCRIBER (
+    SUBSCRIBER_ID INTEGER AUTO_INCREMENT,
+    USER_ID VARCHAR(255) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    EMAIL_ADDRESS VARCHAR(256) NULL,
+    DATE_SUBSCRIBED TIMESTAMP NOT NULL,
+    PRIMARY KEY (SUBSCRIBER_ID),
+    CREATED_BY VARCHAR(100),
+    CREATED_TIME TIMESTAMP,
+    UPDATED_BY VARCHAR(100),
+    UPDATED_TIME TIMESTAMP,
+    UNIQUE (TENANT_ID,USER_ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS AM_APPLICATION (
+    APPLICATION_ID INTEGER AUTO_INCREMENT,
+    NAME VARCHAR(100),
+    SUBSCRIBER_ID INTEGER,
+    APPLICATION_TIER VARCHAR(50) DEFAULT 'Unlimited',
+    CALLBACK_URL VARCHAR(512),
+    DESCRIPTION VARCHAR(512),
+    APPLICATION_STATUS VARCHAR(50) DEFAULT 'APPROVED',
+    GROUP_ID VARCHAR(100),
+    CREATED_BY VARCHAR(100),
+    CREATED_TIME TIMESTAMP,
+    UPDATED_BY VARCHAR(100),
+    UPDATED_TIME TIMESTAMP,
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY(APPLICATION_ID),
+    UNIQUE (NAME,SUBSCRIBER_ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS AM_API (
+    API_ID INTEGER AUTO_INCREMENT,
+    API_PROVIDER VARCHAR(200),
+    API_NAME VARCHAR(200),
+    API_VERSION VARCHAR(30),
+    CONTEXT VARCHAR(256),
+    CONTEXT_TEMPLATE VARCHAR(256),
+    CREATED_BY VARCHAR(100),
+    CREATED_TIME TIMESTAMP,
+    UPDATED_BY VARCHAR(100),
+    UPDATED_TIME TIMESTAMP,
+    PRIMARY KEY(API_ID),
+    UNIQUE (API_PROVIDER,API_NAME,API_VERSION)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS AM_API_URL_MAPPING (
+    URL_MAPPING_ID INTEGER AUTO_INCREMENT,
+    API_ID INTEGER NOT NULL,
+    HTTP_METHOD VARCHAR(20) NULL,
+    AUTH_SCHEME VARCHAR(50) NULL,
+    URL_PATTERN VARCHAR(512) NULL,
+    THROTTLING_TIER varchar(512) DEFAULT NULL,
+    MEDIATION_SCRIPT BLOB,
+    PRIMARY KEY (URL_MAPPING_ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS AM_SUBSCRIPTION (
+    SUBSCRIPTION_ID INTEGER AUTO_INCREMENT,
+    TIER_ID VARCHAR(50),
+    API_ID INTEGER,
+    LAST_ACCESSED TIMESTAMP NULL,
+    APPLICATION_ID INTEGER,
+    SUB_STATUS VARCHAR(50),
+    SUBS_CREATE_STATE VARCHAR(50) DEFAULT 'SUBSCRIBE',
+    CREATED_BY VARCHAR(100),
+    CREATED_TIME TIMESTAMP,
+    UPDATED_BY VARCHAR(100),
+    UPDATED_TIME TIMESTAMP,
+    FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY (SUBSCRIPTION_ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS AM_SUBSCRIPTION_KEY_MAPPING (
+    SUBSCRIPTION_ID INTEGER,
+    ACCESS_TOKEN VARCHAR(255),
+    KEY_TYPE VARCHAR(512) NOT NULL,
+    FOREIGN KEY(SUBSCRIPTION_ID) REFERENCES AM_SUBSCRIPTION(SUBSCRIPTION_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY(SUBSCRIPTION_ID,ACCESS_TOKEN)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS AM_APPLICATION_KEY_MAPPING (
+    APPLICATION_ID INTEGER,
+    CONSUMER_KEY VARCHAR(255),
+    KEY_TYPE VARCHAR(512) NOT NULL,
+    STATE VARCHAR(30) NOT NULL,
+    CREATE_MODE VARCHAR(30) DEFAULT 'CREATED',
+    FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY(APPLICATION_ID,KEY_TYPE)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS AM_API_LC_EVENT (
+    EVENT_ID INTEGER AUTO_INCREMENT,
+    API_ID INTEGER NOT NULL,
+    PREVIOUS_STATE VARCHAR(50),
+    NEW_STATE VARCHAR(50) NOT NULL,
+    USER_ID VARCHAR(255) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    EVENT_DATE TIMESTAMP NOT NULL,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY (EVENT_ID)
+)ENGINE INNODB;
+
+CREATE TABLE AM_APP_KEY_DOMAIN_MAPPING (
+    CONSUMER_KEY VARCHAR(255),
+    AUTHZ_DOMAIN VARCHAR(255) DEFAULT 'ALL',
+    PRIMARY KEY (CONSUMER_KEY,AUTHZ_DOMAIN)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS AM_API_COMMENTS (
+    COMMENT_ID INTEGER AUTO_INCREMENT,
+    COMMENT_TEXT VARCHAR(512),
+    COMMENTED_USER VARCHAR(255),
+    DATE_COMMENTED TIMESTAMP NOT NULL,
+    API_ID INTEGER NOT NULL,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY (COMMENT_ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS AM_API_RATINGS (
+    RATING_ID INTEGER AUTO_INCREMENT,
+    API_ID INTEGER,
+    RATING INTEGER,
+    SUBSCRIBER_ID INTEGER,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+PRIMARY KEY (RATING_ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS AM_TIER_PERMISSIONS (
+    TIER_PERMISSIONS_ID INTEGER AUTO_INCREMENT,
+    TIER VARCHAR(50) NOT NULL,
+    PERMISSIONS_TYPE VARCHAR(50) NOT NULL,
+    ROLES VARCHAR(512) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    PRIMARY KEY(TIER_PERMISSIONS_ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS AM_EXTERNAL_STORES (
+    APISTORE_ID INTEGER AUTO_INCREMENT,
+    API_ID INTEGER,
+    STORE_ID VARCHAR(255) NOT NULL,
+    STORE_DISPLAY_NAME VARCHAR(255) NOT NULL,
+    STORE_ENDPOINT VARCHAR(255) NOT NULL,
+    STORE_TYPE VARCHAR(255) NOT NULL,
+FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+PRIMARY KEY (APISTORE_ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS AM_WORKFLOWS(
+    WF_ID INTEGER AUTO_INCREMENT,
+    WF_REFERENCE VARCHAR(255) NOT NULL,
+    WF_TYPE VARCHAR(255) NOT NULL,
+    WF_STATUS VARCHAR(255) NOT NULL,
+    WF_CREATED_TIME TIMESTAMP DEFAULT 0,
+    WF_UPDATED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ,
+    WF_STATUS_DESC VARCHAR(1000),
+    TENANT_ID INTEGER,
+    TENANT_DOMAIN VARCHAR(255),
+    WF_EXTERNAL_REFERENCE VARCHAR(255) NOT NULL,
+    PRIMARY KEY (WF_ID),
+    UNIQUE (WF_EXTERNAL_REFERENCE)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS AM_APPLICATION_REGISTRATION (
+    REG_ID INT AUTO_INCREMENT,
+    SUBSCRIBER_ID INT,
+    WF_REF VARCHAR(255) NOT NULL,
+    APP_ID INT,
+    TOKEN_TYPE VARCHAR(30),
+    TOKEN_SCOPE VARCHAR(256) DEFAULT 'default',
+    INPUTS VARCHAR(1000),
+    ALLOWED_DOMAINS VARCHAR(256),
+    VALIDITY_PERIOD BIGINT,
+    UNIQUE (SUBSCRIBER_ID,APP_ID,TOKEN_TYPE),
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    FOREIGN KEY(APP_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY (REG_ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS AM_API_SCOPES (
+   API_ID  INTEGER NOT NULL,
+   SCOPE_ID  INTEGER NOT NULL,
+   FOREIGN KEY (API_ID) REFERENCES AM_API (API_ID) ON DELETE CASCADE  ON UPDATE CASCADE,
+   FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID) ON DELETE CASCADE ON UPDATE CASCADE
+)ENGINE = INNODB;
+
+CREATE TABLE IF NOT EXISTS AM_API_DEFAULT_VERSION (
+            DEFAULT_VERSION_ID INT AUTO_INCREMENT, 
+            API_NAME VARCHAR(256) NOT NULL ,
+            API_PROVIDER VARCHAR(256) NOT NULL , 
+            DEFAULT_API_VERSION VARCHAR(30) , 
+            PUBLISHED_DEFAULT_API_VERSION VARCHAR(30) ,
+            PRIMARY KEY (DEFAULT_VERSION_ID)
+);
+
+CREATE INDEX IDX_SUB_APP_ID ON AM_SUBSCRIPTION (APPLICATION_ID, SUBSCRIPTION_ID);
diff --git a/modules/distribution/src/api-resource/sql/mysql_cluster.sql b/modules/distribution/src/api-resource/sql/mysql_cluster.sql
new file mode 100644
index 00000000..464950f1
--- /dev/null
+++ b/modules/distribution/src/api-resource/sql/mysql_cluster.sql
@@ -0,0 +1,752 @@
+-- Start of IDN Tables --
+CREATE TABLE IF NOT EXISTS IDN_BASE_TABLE (
+            PRODUCT_NAME VARCHAR(20),
+            PRIMARY KEY (PRODUCT_NAME)
+)ENGINE INNODB;
+
+INSERT INTO IDN_BASE_TABLE values ('WSO2 Identity Server');
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH_CONSUMER_APPS (
+            ID INTEGER NOT NULL AUTO_INCREMENT,
+            CONSUMER_KEY VARCHAR(255),
+            CONSUMER_SECRET VARCHAR(512),
+            USERNAME VARCHAR(255),
+            TENANT_ID INTEGER DEFAULT 0,
+            APP_NAME VARCHAR(255),
+            OAUTH_VERSION VARCHAR(128),
+            CALLBACK_URL VARCHAR(1024),
+            GRANT_TYPES VARCHAR (1024),
+            CONSTRAINT CONSUMER_KEY_CONSTRAINT UNIQUE (CONSUMER_KEY),
+            PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH1A_REQUEST_TOKEN (
+            REQUEST_TOKEN VARCHAR(255),
+            REQUEST_TOKEN_SECRET VARCHAR(512),
+            CONSUMER_KEY_ID INTEGER,
+            CALLBACK_URL VARCHAR(1024),
+            SCOPE VARCHAR(2048),
+            AUTHORIZED VARCHAR(128),
+            OAUTH_VERIFIER VARCHAR(512),
+            AUTHZ_USER VARCHAR(512),
+            PRIMARY KEY (REQUEST_TOKEN),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH1A_ACCESS_TOKEN (
+            ACCESS_TOKEN VARCHAR(255),
+            ACCESS_TOKEN_SECRET VARCHAR(512),
+            CONSUMER_KEY_ID INTEGER,
+            SCOPE VARCHAR(2048),
+            AUTHZ_USER VARCHAR(512),
+            PRIMARY KEY (ACCESS_TOKEN),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH2_ACCESS_TOKEN (
+            TOKEN_ID VARCHAR (255),
+            ACCESS_TOKEN VARCHAR(255),
+            REFRESH_TOKEN VARCHAR(255),
+            CONSUMER_KEY_ID INTEGER,
+            AUTHZ_USER VARCHAR (100),
+            TENANT_ID INTEGER,
+            USER_DOMAIN VARCHAR(50),
+            USER_TYPE VARCHAR (25),
+            TIME_CREATED TIMESTAMP DEFAULT 0,
+            REFRESH_TOKEN_TIME_CREATED TIMESTAMP DEFAULT 0,
+            VALIDITY_PERIOD BIGINT,
+            REFRESH_TOKEN_VALIDITY_PERIOD BIGINT,
+            TOKEN_SCOPE_HASH VARCHAR(32),
+            TOKEN_STATE VARCHAR(25) DEFAULT 'ACTIVE',
+            TOKEN_STATE_ID VARCHAR (128) DEFAULT 'NONE',
+            PRIMARY KEY (TOKEN_ID),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE,
+            CONSTRAINT CON_APP_KEY UNIQUE (CONSUMER_KEY_ID,AUTHZ_USER,TENANT_ID,USER_DOMAIN,USER_TYPE,TOKEN_SCOPE_HASH,
+                                           TOKEN_STATE,TOKEN_STATE_ID)
+)ENGINE INNODB;
+
+CREATE INDEX IDX_AT_CK_AU ON IDN_OAUTH2_ACCESS_TOKEN(CONSUMER_KEY_ID, AUTHZ_USER, TOKEN_STATE, USER_TYPE);
+
+CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED);
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH2_AUTHORIZATION_CODE (
+            AUTHORIZATION_CODE VARCHAR(512),
+            CONSUMER_KEY_ID INTEGER,
+            CALLBACK_URL VARCHAR(1024),
+            SCOPE VARCHAR(2048),
+            AUTHZ_USER VARCHAR (100),
+            TENANT_ID INTEGER,
+            USER_DOMAIN VARCHAR(50),
+            TIME_CREATED TIMESTAMP,
+            VALIDITY_PERIOD BIGINT,
+            STATE VARCHAR (25) DEFAULT 'ACTIVE',
+            TOKEN_ID VARCHAR(255),
+            PRIMARY KEY (AUTHORIZATION_CODE),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH2_SCOPE_ASSOCIATION (
+            TOKEN_ID VARCHAR (255),
+            TOKEN_SCOPE VARCHAR (60),
+            PRIMARY KEY (TOKEN_ID, TOKEN_SCOPE),
+            FOREIGN KEY (TOKEN_ID) REFERENCES IDN_OAUTH2_ACCESS_TOKEN(TOKEN_ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH2_SCOPE (
+            SCOPE_ID INT(11) NOT NULL AUTO_INCREMENT,
+            SCOPE_KEY VARCHAR(100) NOT NULL,
+            NAME VARCHAR(255) NULL,
+            DESCRIPTION VARCHAR(512) NULL,
+            TENANT_ID INT(11) NOT NULL DEFAULT 0,
+            ROLES VARCHAR (500) NULL,
+            PRIMARY KEY (SCOPE_ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_OAUTH2_RESOURCE_SCOPE (
+            RESOURCE_PATH VARCHAR(255) NOT NULL,
+            SCOPE_ID INTEGER (11) NOT NULL,
+            PRIMARY KEY (RESOURCE_PATH),
+            FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_SCIM_GROUP (
+            ID INTEGER AUTO_INCREMENT,
+            TENANT_ID INTEGER NOT NULL,
+            ROLE_NAME VARCHAR(255) NOT NULL,
+            ATTR_NAME VARCHAR(1024) NOT NULL,
+            ATTR_VALUE VARCHAR(1024),
+            PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_OPENID_REMEMBER_ME (
+            USER_NAME VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT 0,
+            COOKIE_VALUE VARCHAR(1024),
+            CREATED_TIME TIMESTAMP,
+            PRIMARY KEY (USER_NAME, TENANT_ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_OPENID_USER_RPS (
+            USER_NAME VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT 0,
+            RP_URL VARCHAR(255) NOT NULL,
+            TRUSTED_ALWAYS VARCHAR(128) DEFAULT 'FALSE',
+            LAST_VISIT DATE NOT NULL,
+            VISIT_COUNT INTEGER DEFAULT 0,
+            DEFAULT_PROFILE_NAME VARCHAR(255) DEFAULT 'DEFAULT',
+            PRIMARY KEY (USER_NAME, TENANT_ID, RP_URL)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_OPENID_ASSOCIATIONS (
+            HANDLE VARCHAR(255) NOT NULL,
+            ASSOC_TYPE VARCHAR(255) NOT NULL,
+            EXPIRE_IN TIMESTAMP NOT NULL,
+            MAC_KEY VARCHAR(255) NOT NULL,
+            ASSOC_STORE VARCHAR(128) DEFAULT 'SHARED',
+            PRIMARY KEY (HANDLE)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_STS_STORE (
+            ID INTEGER AUTO_INCREMENT,
+            TOKEN_ID VARCHAR(255) NOT NULL,
+            TOKEN_CONTENT BLOB(1024) NOT NULL,
+            CREATE_DATE TIMESTAMP NOT NULL,
+            EXPIRE_DATE TIMESTAMP NOT NULL,
+            STATE INTEGER DEFAULT 0,
+            PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_IDENTITY_USER_DATA (
+            TENANT_ID INTEGER DEFAULT -1234,
+            USER_NAME VARCHAR(255) NOT NULL,
+            DATA_KEY VARCHAR(255) NOT NULL,
+            DATA_VALUE VARCHAR(255),
+            PRIMARY KEY (TENANT_ID, USER_NAME, DATA_KEY)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_IDENTITY_META_DATA (
+            USER_NAME VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT -1234,
+            METADATA_TYPE VARCHAR(255) NOT NULL,
+            METADATA VARCHAR(255) NOT NULL,
+            VALID VARCHAR(255) NOT NULL,
+            PRIMARY KEY (TENANT_ID, USER_NAME, METADATA_TYPE,METADATA)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_THRIFT_SESSION (
+            SESSION_ID VARCHAR(255) NOT NULL,
+            USER_NAME VARCHAR(255) NOT NULL,
+            CREATED_TIME VARCHAR(255) NOT NULL,
+            LAST_MODIFIED_TIME VARCHAR(255) NOT NULL,
+            PRIMARY KEY (SESSION_ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_AUTH_SESSION_STORE (
+            SESSION_ID VARCHAR (100) NOT NULL,
+            SESSION_TYPE VARCHAR(100) NOT NULL,
+            SESSION_OBJECT BLOB,
+            TIME_CREATED TIMESTAMP,
+            PRIMARY KEY (SESSION_ID, SESSION_TYPE)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS SP_APP (
+        ID INTEGER NOT NULL AUTO_INCREMENT,
+        TENANT_ID INTEGER NOT NULL,
+            APP_NAME VARCHAR (255) NOT NULL ,
+            USER_STORE VARCHAR (255) NOT NULL,
+        USERNAME VARCHAR (255) NOT NULL ,
+        DESCRIPTION VARCHAR (1024),
+            ROLE_CLAIM VARCHAR (512),
+        AUTH_TYPE VARCHAR (255) NOT NULL,
+            PROVISIONING_USERSTORE_DOMAIN VARCHAR (512),
+            IS_LOCAL_CLAIM_DIALECT CHAR(1) DEFAULT '1',
+            IS_SEND_LOCAL_SUBJECT_ID CHAR(1) DEFAULT '0',
+            IS_SEND_AUTH_LIST_OF_IDPS CHAR(1) DEFAULT '0',
+        IS_USE_TENANT_DOMAIN_SUBJECT CHAR(1) DEFAULT '1',
+        IS_USE_USER_DOMAIN_SUBJECT CHAR(1) DEFAULT '1',
+            SUBJECT_CLAIM_URI VARCHAR (512),
+            IS_SAAS_APP CHAR(1) DEFAULT '0',
+        PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+ALTER TABLE SP_APP ADD CONSTRAINT APPLICATION_NAME_CONSTRAINT UNIQUE(APP_NAME, TENANT_ID);
+
+CREATE TABLE IF NOT EXISTS SP_INBOUND_AUTH (
+            ID INTEGER NOT NULL AUTO_INCREMENT,
+            TENANT_ID INTEGER NOT NULL,
+            INBOUND_AUTH_KEY VARCHAR (255) NOT NULL,
+            INBOUND_AUTH_TYPE VARCHAR (255) NOT NULL,
+            PROP_NAME VARCHAR (255),
+            PROP_VALUE VARCHAR (1024) ,
+            APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+ALTER TABLE SP_INBOUND_AUTH ADD CONSTRAINT APPLICATION_ID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS SP_AUTH_STEP (
+            ID INTEGER NOT NULL AUTO_INCREMENT,
+            TENANT_ID INTEGER NOT NULL,
+            STEP_ORDER INTEGER DEFAULT 1,
+            APP_ID INTEGER NOT NULL ,
+            IS_SUBJECT_STEP CHAR(1) DEFAULT '0',
+            IS_ATTRIBUTE_STEP CHAR(1) DEFAULT '0',
+            PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+ALTER TABLE SP_AUTH_STEP ADD CONSTRAINT APPLICATION_ID_CONSTRAINT_STEP FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS SP_FEDERATED_IDP (
+            ID INTEGER NOT NULL,
+            TENANT_ID INTEGER NOT NULL,
+            AUTHENTICATOR_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID, AUTHENTICATOR_ID)
+)ENGINE INNODB;
+
+ALTER TABLE SP_FEDERATED_IDP ADD CONSTRAINT STEP_ID_CONSTRAINT FOREIGN KEY (ID) REFERENCES SP_AUTH_STEP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS SP_CLAIM_MAPPING (
+            ID INTEGER NOT NULL AUTO_INCREMENT,
+            TENANT_ID INTEGER NOT NULL,
+            IDP_CLAIM VARCHAR (512) NOT NULL ,
+            SP_CLAIM VARCHAR (512) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            IS_REQUESTED VARCHAR(128) DEFAULT '0',
+            DEFAULT_VALUE VARCHAR(255),
+            PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+ALTER TABLE SP_CLAIM_MAPPING ADD CONSTRAINT CLAIMID_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS SP_ROLE_MAPPING (
+            ID INTEGER NOT NULL AUTO_INCREMENT,
+            TENANT_ID INTEGER NOT NULL,
+            IDP_ROLE VARCHAR (255) NOT NULL ,
+            SP_ROLE VARCHAR (255) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+ALTER TABLE SP_ROLE_MAPPING ADD CONSTRAINT ROLEID_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS SP_REQ_PATH_AUTHENTICATOR (
+            ID INTEGER NOT NULL AUTO_INCREMENT,
+            TENANT_ID INTEGER NOT NULL,
+            AUTHENTICATOR_NAME VARCHAR (255) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+ALTER TABLE SP_REQ_PATH_AUTHENTICATOR ADD CONSTRAINT REQ_AUTH_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS SP_PROVISIONING_CONNECTOR (
+            ID INTEGER NOT NULL AUTO_INCREMENT,
+            TENANT_ID INTEGER NOT NULL,
+            IDP_NAME VARCHAR (255) NOT NULL ,
+            CONNECTOR_NAME VARCHAR (255) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            IS_JIT_ENABLED CHAR(1) NOT NULL DEFAULT '0',
+            BLOCKING CHAR(1) NOT NULL DEFAULT '0',
+            PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+ALTER TABLE SP_PROVISIONING_CONNECTOR ADD CONSTRAINT PRO_CONNECTOR_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+CREATE TABLE IF NOT EXISTS IDP (
+                  ID INTEGER AUTO_INCREMENT,
+                  TENANT_ID INTEGER,
+                  NAME VARCHAR(254) NOT NULL,
+                  IS_ENABLED CHAR(1) NOT NULL DEFAULT '1',
+                  IS_PRIMARY CHAR(1) NOT NULL DEFAULT '0',
+                  HOME_REALM_ID VARCHAR(254),
+                  IMAGE MEDIUMBLOB,
+                  CERTIFICATE BLOB,
+                  ALIAS VARCHAR(254),
+                  INBOUND_PROV_ENABLED CHAR (1) NOT NULL DEFAULT '0',
+                  INBOUND_PROV_USER_STORE_ID VARCHAR(254),
+                  USER_CLAIM_URI VARCHAR(254),
+                  ROLE_CLAIM_URI VARCHAR(254),
+                  DESCRIPTION VARCHAR (1024),
+                  DEFAULT_AUTHENTICATOR_NAME VARCHAR(254),
+                  DEFAULT_PRO_CONNECTOR_NAME VARCHAR(254),
+                  PROVISIONING_ROLE VARCHAR(128),
+                  IS_FEDERATION_HUB CHAR(1) NOT NULL DEFAULT '0',
+                  IS_LOCAL_CLAIM_DIALECT CHAR(1) NOT NULL DEFAULT '0',
+            DISPLAY_NAME VARCHAR(255),
+                  PRIMARY KEY (ID),
+                  UNIQUE (TENANT_ID, NAME)
+)ENGINE INNODB;
+
+INSERT INTO IDP (TENANT_ID, NAME, HOME_REALM_ID) VALUES (-1234, 'LOCAL', 'localhost');
+
+CREATE TABLE IF NOT EXISTS IDP_ROLE (
+                  ID INTEGER AUTO_INCREMENT,
+                  IDP_ID INTEGER,
+                  TENANT_ID INTEGER,
+                  ROLE VARCHAR(254),
+                  PRIMARY KEY (ID),
+                  UNIQUE (IDP_ID, ROLE),
+                  FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDP_ROLE_MAPPING (
+                  ID INTEGER AUTO_INCREMENT,
+                  IDP_ROLE_ID INTEGER,
+                  TENANT_ID INTEGER,
+                  USER_STORE_ID VARCHAR (253),
+                  LOCAL_ROLE VARCHAR(253),
+                  PRIMARY KEY (ID),
+                  UNIQUE (IDP_ROLE_ID, TENANT_ID, USER_STORE_ID, LOCAL_ROLE),
+                  FOREIGN KEY (IDP_ROLE_ID) REFERENCES IDP_ROLE(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDP_CLAIM (
+                  ID INTEGER AUTO_INCREMENT,
+                  IDP_ID INTEGER,
+                  TENANT_ID INTEGER,
+                  CLAIM VARCHAR(254),
+                  PRIMARY KEY (ID),
+                  UNIQUE (IDP_ID, CLAIM),
+                  FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDP_CLAIM_MAPPING (
+            ID INTEGER AUTO_INCREMENT,
+            IDP_CLAIM_ID INTEGER,
+            TENANT_ID INTEGER,
+            LOCAL_CLAIM VARCHAR(253),
+            DEFAULT_VALUE VARCHAR(255),
+            IS_REQUESTED VARCHAR(128) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (IDP_CLAIM_ID, TENANT_ID, LOCAL_CLAIM),
+            FOREIGN KEY (IDP_CLAIM_ID) REFERENCES IDP_CLAIM(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDP_AUTHENTICATOR (
+            ID INTEGER AUTO_INCREMENT,
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            NAME VARCHAR(255) NOT NULL,
+            IS_ENABLED CHAR (1) DEFAULT '1',
+            DISPLAY_NAME VARCHAR(255),
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, NAME),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+INSERT INTO IDP_AUTHENTICATOR (TENANT_ID, IDP_ID, NAME) VALUES (-1234, 1, 'samlsso');
+INSERT INTO IDP_AUTHENTICATOR (TENANT_ID, IDP_ID, NAME) VALUES (-1234, 1, 'IDPProperties');
+
+CREATE TABLE IF NOT EXISTS IDP_AUTHENTICATOR_PROPERTY (
+            ID INTEGER AUTO_INCREMENT,
+            TENANT_ID INTEGER,
+            AUTHENTICATOR_ID INTEGER,
+            PROPERTY_KEY VARCHAR(255) NOT NULL,
+            PROPERTY_VALUE VARCHAR(2047),
+            IS_SECRET CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, AUTHENTICATOR_ID, PROPERTY_KEY),
+            FOREIGN KEY (AUTHENTICATOR_ID) REFERENCES IDP_AUTHENTICATOR(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+INSERT INTO  IDP_AUTHENTICATOR_PROPERTY (TENANT_ID, AUTHENTICATOR_ID, PROPERTY_KEY,PROPERTY_VALUE, IS_SECRET ) VALUES (-1234, 1 , 'IdPEntityId', 'localhost', '0');
+
+CREATE TABLE IF NOT EXISTS IDP_PROVISIONING_CONFIG (
+            ID INTEGER AUTO_INCREMENT,
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            PROVISIONING_CONNECTOR_TYPE VARCHAR(255) NOT NULL,
+            IS_ENABLED CHAR (1) DEFAULT '0',
+            IS_BLOCKING CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, PROVISIONING_CONNECTOR_TYPE),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDP_PROV_CONFIG_PROPERTY (
+            ID INTEGER AUTO_INCREMENT,
+            TENANT_ID INTEGER,
+            PROVISIONING_CONFIG_ID INTEGER,
+            PROPERTY_KEY VARCHAR(255) NOT NULL,
+            PROPERTY_VALUE VARCHAR(2048),
+            PROPERTY_BLOB_VALUE BLOB,
+            PROPERTY_TYPE CHAR(32) NOT NULL,
+            IS_SECRET CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, PROVISIONING_CONFIG_ID, PROPERTY_KEY),
+            FOREIGN KEY (PROVISIONING_CONFIG_ID) REFERENCES IDP_PROVISIONING_CONFIG(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDP_PROVISIONING_ENTITY (
+            ID INTEGER AUTO_INCREMENT,
+            PROVISIONING_CONFIG_ID INTEGER,
+            ENTITY_TYPE VARCHAR(255) NOT NULL,
+            ENTITY_LOCAL_USERSTORE VARCHAR(255) NOT NULL,
+            ENTITY_NAME VARCHAR(255) NOT NULL,
+            ENTITY_VALUE VARCHAR(255),
+            TENANT_ID INTEGER,
+            PRIMARY KEY (ID),
+            UNIQUE (ENTITY_TYPE, TENANT_ID, ENTITY_LOCAL_USERSTORE, ENTITY_NAME, PROVISIONING_CONFIG_ID),
+            UNIQUE (PROVISIONING_CONFIG_ID, ENTITY_TYPE, ENTITY_VALUE),
+            FOREIGN KEY (PROVISIONING_CONFIG_ID) REFERENCES IDP_PROVISIONING_CONFIG(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDP_LOCAL_CLAIM (
+            ID INTEGER AUTO_INCREMENT,
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            CLAIM_URI VARCHAR(255) NOT NULL,
+            DEFAULT_VALUE VARCHAR(255),
+            IS_REQUESTED VARCHAR(128) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, CLAIM_URI),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_ASSOCIATED_ID (
+            ID INTEGER AUTO_INCREMENT,
+            IDP_USER_ID VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT -1234,
+            IDP_ID INTEGER NOT NULL,
+            DOMAIN_NAME VARCHAR(255) NOT NULL,
+            USER_NAME VARCHAR(255) NOT NULL,
+            PRIMARY KEY (ID),
+            UNIQUE(IDP_USER_ID, TENANT_ID, IDP_ID),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS IDN_USER_ACCOUNT_ASSOCIATION (
+            ASSOCIATION_KEY VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER,
+            DOMAIN_NAME VARCHAR(255) NOT NULL,
+            USER_NAME VARCHAR(255) NOT NULL,
+            PRIMARY KEY (TENANT_ID, DOMAIN_NAME, USER_NAME)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS FIDO_DEVICE_STORE (
+            TENANT_ID INTEGER,
+            DOMAIN_NAME VARCHAR(255) NOT NULL,
+            USER_NAME VARCHAR(45) NOT NULL,
+            TIME_REGISTERED TIMESTAMP,
+            KEY_HANDLE VARCHAR(200) NOT NULL,
+            DEVICE_DATA VARCHAR(2048) NOT NULL,
+            PRIMARY KEY (TENANT_ID, DOMAIN_NAME, USER_NAME, KEY_HANDLE)
+        )ENGINE INNODB;
+              
+CREATE TABLE IF NOT EXISTS WF_REQUEST (
+    UUID VARCHAR (45),
+    CREATED_BY VARCHAR (255),
+    TENANT_ID INTEGER DEFAULT -1,
+    OPERATION_TYPE VARCHAR (50),
+    CREATED_AT TIMESTAMP,
+    UPDATED_AT TIMESTAMP,
+    STATUS VARCHAR (30),
+    REQUEST BLOB,
+    PRIMARY KEY (UUID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS WF_BPS_PROFILE (
+    PROFILE_NAME VARCHAR(45),
+    HOST_URL VARCHAR(45),
+    USERNAME VARCHAR(45),
+    PASSWORD VARCHAR(255),
+    CALLBACK_HOST VARCHAR (45),
+    CALLBACK_USERNAME VARCHAR (45),
+    CALLBACK_PASSWORD VARCHAR (255),
+    TENANT_ID VARCHAR (45),
+    PRIMARY KEY (PROFILE_NAME, TENANT_ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS WF_WORKFLOW(
+    ID VARCHAR (45),
+    WF_NAME VARCHAR (45),
+    DESCRIPTION VARCHAR (255),
+    TEMPLATE_ID VARCHAR (45),
+    IMPL_ID VARCHAR (45),
+    TENANT_ID VARCHAR (45),
+    PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS WF_WORKFLOW_ASSOCIATION(
+    ID INTEGER NOT NULL AUTO_INCREMENT,
+    ASSOC_NAME VARCHAR (45),
+    EVENT_ID VARCHAR(45),
+    ASSOC_CONDITION VARCHAR (2000),
+    WORKFLOW_ID VARCHAR (45),
+    IS_ENABLED CHAR (1) DEFAULT '1',
+    PRIMARY KEY(ID),
+    FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS WF_WORKFLOW_CONFIG_PARAM(
+    WORKFLOW_ID VARCHAR (45),
+    PARAM_NAME VARCHAR (45),
+    PARAM_VALUE VARCHAR (1000),
+    PRIMARY KEY (WORKFLOW_ID, PARAM_NAME),
+    FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE
+)ENGINE INNODB;
+
+
+
+CREATE TABLE IF NOT EXISTS WF_REQUEST_ENTITY_RELATIONSHIP(
+  REQUEST_ID VARCHAR (45),
+  ENTITY_NAME VARCHAR (255),
+  ENTITY_TYPE VARCHAR (50),
+  TENANT_ID INTEGER DEFAULT -1,
+  PRIMARY KEY(REQUEST_ID, ENTITY_NAME, ENTITY_TYPE, TENANT_ID),
+  FOREIGN KEY (REQUEST_ID) REFERENCES WF_REQUEST(UUID)ON DELETE CASCADE
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS WORKFLOW_REQUEST_RELATION(
+  RELATIONSHIP_ID VARCHAR (45),
+  WORKFLOW_ID VARCHAR (45),
+  REQUEST_ID VARCHAR (45),
+  UPDATED_AT TIMESTAMP,
+  STATUS VARCHAR (30),
+  PRIMARY KEY (RELATIONSHIP_ID),
+  FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE,
+  FOREIGN KEY (REQUEST_ID) REFERENCES WF_REQUEST(UUID)ON DELETE CASCADE
+)ENGINE INNODB;
+
+-- End of IDN Tables--
+
+-- Start of API-MGT Tables --
+CREATE TABLE IF NOT EXISTS AM_SUBSCRIBER (
+    SUBSCRIBER_ID INTEGER AUTO_INCREMENT,
+    USER_ID VARCHAR(255) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    EMAIL_ADDRESS VARCHAR(256) NULL,
+    DATE_SUBSCRIBED TIMESTAMP NOT NULL,
+    PRIMARY KEY (SUBSCRIBER_ID),
+    CREATED_BY VARCHAR(100),
+    CREATED_TIME TIMESTAMP,
+    UPDATED_BY VARCHAR(100),
+    UPDATED_TIME TIMESTAMP,
+    UNIQUE (TENANT_ID,USER_ID)
+)ENGINE NDB;
+
+CREATE TABLE IF NOT EXISTS AM_APPLICATION (
+    APPLICATION_ID INTEGER AUTO_INCREMENT,
+    NAME VARCHAR(100),
+    SUBSCRIBER_ID INTEGER,
+    APPLICATION_TIER VARCHAR(50) DEFAULT 'Unlimited',
+    CALLBACK_URL VARCHAR(512),
+    DESCRIPTION VARCHAR(512),
+    APPLICATION_STATUS VARCHAR(50) DEFAULT 'APPROVED',
+    GROUP_ID VARCHAR(100),
+    CREATED_BY VARCHAR(100),
+    CREATED_TIME TIMESTAMP,
+    UPDATED_BY VARCHAR(100),
+    UPDATED_TIME TIMESTAMP,
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON DELETE RESTRICT,
+    PRIMARY KEY(APPLICATION_ID),
+    UNIQUE (NAME,SUBSCRIBER_ID)
+)ENGINE NDB;
+
+CREATE TABLE IF NOT EXISTS AM_API (
+    API_ID INTEGER AUTO_INCREMENT,
+    API_PROVIDER VARCHAR(200),
+    API_NAME VARCHAR(200),
+    API_VERSION VARCHAR(30),
+    CONTEXT VARCHAR(256),
+    CONTEXT_TEMPLATE VARCHAR(256),
+    CREATED_BY VARCHAR(100),
+    CREATED_TIME TIMESTAMP,
+    UPDATED_BY VARCHAR(100),
+    UPDATED_TIME TIMESTAMP,
+    PRIMARY KEY(API_ID),
+    UNIQUE (API_PROVIDER,API_NAME,API_VERSION)
+)ENGINE NDB;
+
+CREATE TABLE IF NOT EXISTS AM_API_URL_MAPPING (
+    URL_MAPPING_ID INTEGER AUTO_INCREMENT,
+    API_ID INTEGER NOT NULL,
+    HTTP_METHOD VARCHAR(20) NULL,
+    AUTH_SCHEME VARCHAR(50) NULL,
+    URL_PATTERN VARCHAR(512) NULL,
+    THROTTLING_TIER varchar(512) DEFAULT NULL,
+    MEDIATION_SCRIPT BLOB,
+    PRIMARY KEY (URL_MAPPING_ID)
+)ENGINE NDB;
+
+CREATE TABLE IF NOT EXISTS AM_SUBSCRIPTION (
+    SUBSCRIPTION_ID INTEGER AUTO_INCREMENT,
+    TIER_ID VARCHAR(50),
+    API_ID INTEGER,
+    LAST_ACCESSED TIMESTAMP NULL,
+    APPLICATION_ID INTEGER,
+    SUB_STATUS VARCHAR(50),
+    SUBS_CREATE_STATE VARCHAR(50) DEFAULT 'SUBSCRIBE',
+    CREATED_BY VARCHAR(100),
+    CREATED_TIME TIMESTAMP,
+    UPDATED_BY VARCHAR(100),
+    UPDATED_TIME TIMESTAMP,
+    FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON DELETE RESTRICT,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE RESTRICT,
+    PRIMARY KEY (SUBSCRIPTION_ID)
+)ENGINE NDB;
+
+CREATE TABLE IF NOT EXISTS AM_SUBSCRIPTION_KEY_MAPPING (
+    SUBSCRIPTION_ID INTEGER,
+    ACCESS_TOKEN VARCHAR(255),
+    KEY_TYPE VARCHAR(512) NOT NULL,
+    FOREIGN KEY(SUBSCRIPTION_ID) REFERENCES AM_SUBSCRIPTION(SUBSCRIPTION_ID) ON DELETE RESTRICT,
+    PRIMARY KEY(SUBSCRIPTION_ID,ACCESS_TOKEN)
+)ENGINE NDB;
+
+CREATE TABLE IF NOT EXISTS AM_APPLICATION_KEY_MAPPING (
+    APPLICATION_ID INTEGER,
+    CONSUMER_KEY VARCHAR(255),
+    KEY_TYPE VARCHAR(512) NOT NULL,
+    STATE VARCHAR(30) NOT NULL,
+    CREATE_MODE VARCHAR(30) DEFAULT 'CREATED',
+    FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON DELETE RESTRICT,
+    PRIMARY KEY(APPLICATION_ID,KEY_TYPE)
+)ENGINE NDB;
+
+CREATE TABLE IF NOT EXISTS AM_API_LC_EVENT (
+    EVENT_ID INTEGER AUTO_INCREMENT,
+    API_ID INTEGER NOT NULL,
+    PREVIOUS_STATE VARCHAR(50),
+    NEW_STATE VARCHAR(50) NOT NULL,
+    USER_ID VARCHAR(255) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    EVENT_DATE TIMESTAMP NOT NULL,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE RESTRICT,
+    PRIMARY KEY (EVENT_ID)
+)ENGINE NDB;
+
+CREATE TABLE AM_APP_KEY_DOMAIN_MAPPING (
+    CONSUMER_KEY VARCHAR(255),
+    AUTHZ_DOMAIN VARCHAR(255) DEFAULT 'ALL',
+    PRIMARY KEY (CONSUMER_KEY,AUTHZ_DOMAIN),
+    FOREIGN KEY (CONSUMER_KEY) REFERENCES IDN_OAUTH_CONSUMER_APPS(CONSUMER_KEY)
+)ENGINE NDB;
+
+CREATE TABLE IF NOT EXISTS AM_API_COMMENTS (
+    COMMENT_ID INTEGER AUTO_INCREMENT,
+    COMMENT_TEXT VARCHAR(512),
+    COMMENTED_USER VARCHAR(255),
+    DATE_COMMENTED TIMESTAMP NOT NULL,
+    API_ID INTEGER NOT NULL,
+    PRIMARY KEY (COMMENT_ID)
+)ENGINE NDB;
+
+CREATE TABLE IF NOT EXISTS AM_API_RATINGS (
+    RATING_ID INTEGER AUTO_INCREMENT,
+    API_ID INTEGER,
+    RATING INTEGER,
+    SUBSCRIBER_ID INTEGER,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE RESTRICT,
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON DELETE RESTRICT,
+PRIMARY KEY (RATING_ID)
+)ENGINE NDB;
+
+CREATE TABLE IF NOT EXISTS AM_TIER_PERMISSIONS (
+    TIER_PERMISSIONS_ID INTEGER AUTO_INCREMENT,
+    TIER VARCHAR(50) NOT NULL,
+    PERMISSIONS_TYPE VARCHAR(50) NOT NULL,
+    ROLES VARCHAR(512) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    PRIMARY KEY(TIER_PERMISSIONS_ID)
+)ENGINE NDB;
+
+CREATE TABLE IF NOT EXISTS AM_EXTERNAL_STORES (
+    APISTORE_ID INTEGER AUTO_INCREMENT,
+    API_ID INTEGER,
+    STORE_ID VARCHAR(255) NOT NULL,
+    STORE_DISPLAY_NAME VARCHAR(255) NOT NULL,
+    STORE_ENDPOINT VARCHAR(255) NOT NULL,
+    STORE_TYPE VARCHAR(255) NOT NULL,
+FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE RESTRICT,
+PRIMARY KEY (APISTORE_ID)
+)ENGINE NDB;
+
+CREATE TABLE IF NOT EXISTS AM_WORKFLOWS(
+    WF_ID INTEGER AUTO_INCREMENT,
+    WF_REFERENCE VARCHAR(255) NOT NULL,
+    WF_TYPE VARCHAR(255) NOT NULL,
+    WF_STATUS VARCHAR(255) NOT NULL,
+    WF_CREATED_TIME TIMESTAMP DEFAULT 0,
+    WF_UPDATED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ,
+    WF_STATUS_DESC VARCHAR(1000),
+    TENANT_ID INTEGER,
+    TENANT_DOMAIN VARCHAR(255),
+    WF_EXTERNAL_REFERENCE VARCHAR(255) NOT NULL,
+    PRIMARY KEY (WF_ID),
+    UNIQUE (WF_EXTERNAL_REFERENCE)
+)ENGINE NDB;
+
+CREATE TABLE IF NOT EXISTS AM_APPLICATION_REGISTRATION (
+    REG_ID INT AUTO_INCREMENT,
+    SUBSCRIBER_ID INT,
+    WF_REF VARCHAR(255) NOT NULL,
+    APP_ID INT,
+    TOKEN_TYPE VARCHAR(30),
+    TOKEN_SCOPE VARCHAR(256) DEFAULT 'default',
+    INPUTS VARCHAR(1000),
+    ALLOWED_DOMAINS VARCHAR(256),
+    VALIDITY_PERIOD BIGINT,
+    UNIQUE (SUBSCRIBER_ID,APP_ID,TOKEN_TYPE),
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON DELETE RESTRICT,
+    FOREIGN KEY(APP_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON DELETE RESTRICT,
+    PRIMARY KEY (REG_ID)
+)ENGINE NDB;
+
+CREATE TABLE IF NOT EXISTS AM_API_SCOPES (
+   API_ID  INTEGER NOT NULL,
+   SCOPE_ID  INTEGER NOT NULL,
+   FOREIGN KEY (API_ID) REFERENCES AM_API (API_ID) ON DELETE CASCADE,
+   FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID) ON DELETE CASCADE
+)ENGINE = NDB;
+
+CREATE TABLE IF NOT EXISTS AM_API_DEFAULT_VERSION (
+            DEFAULT_VERSION_ID INT AUTO_INCREMENT, 
+            API_NAME VARCHAR(256) NOT NULL ,
+            API_PROVIDER VARCHAR(256) NOT NULL , 
+            DEFAULT_API_VERSION VARCHAR(30) , 
+            PUBLISHED_DEFAULT_API_VERSION VARCHAR(30) ,
+            PRIMARY KEY (DEFAULT_VERSION_ID)
+);
+
+CREATE INDEX IDX_SUB_APP_ID ON AM_SUBSCRIPTION (APPLICATION_ID, SUBSCRIPTION_ID);
diff --git a/modules/distribution/src/api-resource/sql/oracle.sql b/modules/distribution/src/api-resource/sql/oracle.sql
new file mode 100644
index 00000000..d58ec683
--- /dev/null
+++ b/modules/distribution/src/api-resource/sql/oracle.sql
@@ -0,0 +1,1181 @@
+ -- Create Oracle New User and Connect
+--------------------------------------
+-- CREATE USER apimuser IDENTIFIED BY wso2;
+-- GRANT CONNECT,RESOURCE to apimuser WITH ADMIN OPTION;
+-- CONNECT apimuser/wso2
+--
+
+-- Start of IDN Tables --
+CREATE TABLE IDN_BASE_TABLE (
+            PRODUCT_NAME VARCHAR2 (20),
+            PRIMARY KEY (PRODUCT_NAME))
+/
+INSERT INTO IDN_BASE_TABLE values ('WSO2 Identity Server')
+/
+CREATE TABLE IDN_OAUTH_CONSUMER_APPS (
+            ID INTEGER,
+            CONSUMER_KEY VARCHAR2 (255),
+            CONSUMER_SECRET VARCHAR2 (512),
+            USERNAME VARCHAR2 (255),
+            TENANT_ID INTEGER DEFAULT 0,
+            APP_NAME VARCHAR2 (255),
+            OAUTH_VERSION VARCHAR2 (128),
+            CALLBACK_URL VARCHAR2 (1024),
+            GRANT_TYPES VARCHAR (1024),
+            CONSTRAINT CONSUMER_KEY_CONSTRAINT UNIQUE (CONSUMER_KEY),
+            PRIMARY KEY (ID))
+/
+CREATE SEQUENCE IDN_OAUTH_CONSUMER_APPS_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER IDN_OAUTH_CONSUMER_APPS_TRIG
+            BEFORE INSERT
+            ON IDN_OAUTH_CONSUMER_APPS
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+              BEGIN
+                SELECT IDN_OAUTH_CONSUMER_APPS_SEQ.nextval INTO :NEW.ID FROM dual;
+              END;
+/
+CREATE TABLE IDN_OAUTH1A_REQUEST_TOKEN (
+            REQUEST_TOKEN VARCHAR2 (512),
+            REQUEST_TOKEN_SECRET VARCHAR2 (512),
+            CONSUMER_KEY_ID INTEGER,
+            CALLBACK_URL VARCHAR2 (1024),
+            SCOPE VARCHAR2(2048),
+            AUTHORIZED VARCHAR2 (128),
+            OAUTH_VERIFIER VARCHAR2 (512),
+            AUTHZ_USER VARCHAR2 (512),
+            PRIMARY KEY (REQUEST_TOKEN),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE)
+/
+CREATE TABLE IDN_OAUTH1A_ACCESS_TOKEN (
+            ACCESS_TOKEN VARCHAR2 (512),
+            ACCESS_TOKEN_SECRET VARCHAR2 (512),
+            CONSUMER_KEY_ID INTEGER,
+            SCOPE VARCHAR2(2048),
+            AUTHZ_USER VARCHAR2 (512),
+            PRIMARY KEY (ACCESS_TOKEN),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE)
+/
+CREATE TABLE IDN_OAUTH2_ACCESS_TOKEN (
+            TOKEN_ID VARCHAR (255),
+            ACCESS_TOKEN VARCHAR2 (255),
+            REFRESH_TOKEN VARCHAR2 (255),
+            CONSUMER_KEY_ID INTEGER,
+            AUTHZ_USER VARCHAR2 (100),
+            TENANT_ID INTEGER,
+            USER_DOMAIN VARCHAR2 (50),
+            USER_TYPE VARCHAR (25),
+            TIME_CREATED TIMESTAMP,
+            REFRESH_TOKEN_TIME_CREATED TIMESTAMP,
+            VALIDITY_PERIOD NUMBER(19),
+            REFRESH_TOKEN_VALIDITY_PERIOD NUMBER(19),
+            TOKEN_SCOPE_HASH VARCHAR2 (32),
+            TOKEN_STATE VARCHAR2 (25) DEFAULT 'ACTIVE',
+            TOKEN_STATE_ID VARCHAR (128) DEFAULT 'NONE',
+            PRIMARY KEY (TOKEN_ID),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE,
+            CONSTRAINT CON_APP_KEY UNIQUE (CONSUMER_KEY_ID,AUTHZ_USER,TOKEN_ID,USER_DOMAIN,USER_TYPE,TOKEN_SCOPE_HASH,
+                                           TOKEN_STATE,TOKEN_STATE_ID))
+/
+CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED)
+/
+CREATE INDEX IDX_AT_CK_AU ON IDN_OAUTH2_ACCESS_TOKEN(CONSUMER_KEY_ID, AUTHZ_USER, TOKEN_STATE, USER_TYPE)
+/
+CREATE TABLE IDN_OAUTH2_AUTHORIZATION_CODE (
+            AUTHORIZATION_CODE VARCHAR2 (512),
+            CONSUMER_KEY_ID INTEGER,
+              CALLBACK_URL VARCHAR2 (1024),
+            SCOPE VARCHAR2(2048),
+            AUTHZ_USER VARCHAR2 (100),
+            TENANT_ID INTEGER,
+            USER_DOMAIN VARCHAR2 (50),
+            TIME_CREATED TIMESTAMP,
+            VALIDITY_PERIOD NUMBER(19),
+            STATE VARCHAR (25) DEFAULT 'ACTIVE',
+            TOKEN_ID VARCHAR(255),
+            PRIMARY KEY (AUTHORIZATION_CODE),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE)
+/
+CREATE TABLE IDN_OAUTH2_SCOPE_ASSOCIATION (
+            TOKEN_ID VARCHAR2 (255),
+            TOKEN_SCOPE VARCHAR2 (60),
+            PRIMARY KEY (TOKEN_ID, TOKEN_SCOPE),
+            FOREIGN KEY (TOKEN_ID) REFERENCES IDN_OAUTH2_ACCESS_TOKEN(TOKEN_ID) ON DELETE CASCADE)
+/
+CREATE TABLE IDN_OAUTH2_SCOPE (
+            SCOPE_ID INTEGER,
+            SCOPE_KEY VARCHAR2 (100) NOT NULL,
+            NAME VARCHAR2 (255) NULL,
+            DESCRIPTION VARCHAR2 (512) NULL,
+  TENANT_ID INTEGER DEFAULT 0,
+        ROLES VARCHAR2 (500) NULL,
+            PRIMARY KEY (SCOPE_ID))
+/
+CREATE SEQUENCE IDN_OAUTH2_SCOPE_SEQUENCE START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER IDN_OAUTH2_SCOPE_TRIGGER
+            BEFORE INSERT
+            ON IDN_OAUTH2_SCOPE
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+            BEGIN
+                SELECT IDN_OAUTH2_SCOPE_SEQUENCE.nextval INTO :NEW.SCOPE_ID FROM dual;
+            END;
+/
+CREATE TABLE IDN_OAUTH2_RESOURCE_SCOPE (
+            RESOURCE_PATH VARCHAR2 (255) NOT NULL,
+            SCOPE_ID INTEGER NOT NULL,
+            PRIMARY KEY (RESOURCE_PATH),
+            FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID))
+/
+CREATE TABLE IDN_SCIM_GROUP (
+            ID INTEGER,
+            TENANT_ID INTEGER NOT NULL,
+            ROLE_NAME VARCHAR2(255) NOT NULL,
+            ATTR_NAME VARCHAR2(1024) NOT NULL,
+            ATTR_VALUE VARCHAR2(1024),
+            PRIMARY KEY (ID))
+/
+CREATE SEQUENCE IDN_SCIM_GROUP_SEQUENCE START WITH 1 INCREMENT BY 1 NOCACHE
+/
+
+CREATE OR REPLACE TRIGGER IDN_SCIM_GROUP_TRIGGER
+            BEFORE INSERT
+            ON IDN_SCIM_GROUP
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+            BEGIN
+                SELECT IDN_SCIM_GROUP_SEQUENCE.nextval INTO :NEW.ID FROM dual;
+            END;
+/
+CREATE TABLE IDN_OPENID_REMEMBER_ME (
+            USER_NAME VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT 0,
+            COOKIE_VALUE VARCHAR(1024),
+            CREATED_TIME TIMESTAMP,
+            PRIMARY KEY (USER_NAME, TENANT_ID))
+/
+CREATE TABLE IDN_OPENID_USER_RPS (
+            USER_NAME VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT 0,
+            RP_URL VARCHAR(255) NOT NULL,
+            TRUSTED_ALWAYS VARCHAR(128) DEFAULT 'FALSE',
+            LAST_VISIT DATE NOT NULL,
+            VISIT_COUNT INTEGER DEFAULT 0,
+            DEFAULT_PROFILE_NAME VARCHAR(255) DEFAULT 'DEFAULT',
+            PRIMARY KEY (USER_NAME, TENANT_ID, RP_URL))
+/
+CREATE TABLE IDN_OPENID_ASSOCIATIONS (
+            HANDLE VARCHAR(255) NOT NULL,
+            ASSOC_TYPE VARCHAR(255) NOT NULL,
+            EXPIRE_IN TIMESTAMP NOT NULL,
+            MAC_KEY VARCHAR(255) NOT NULL,
+            ASSOC_STORE VARCHAR(128) DEFAULT 'SHARED',
+            PRIMARY KEY (HANDLE))
+/
+CREATE TABLE IDN_STS_STORE (
+            ID INTEGER,
+            TOKEN_ID VARCHAR(255) NOT NULL,
+            TOKEN_CONTENT BLOB NOT NULL,
+            CREATE_DATE TIMESTAMP NOT NULL,
+            EXPIRE_DATE TIMESTAMP NOT NULL,
+            STATE INTEGER DEFAULT 0,
+            PRIMARY KEY (ID))
+/
+CREATE SEQUENCE IDN_STS_STORE_SEQUENCE START WITH 1 INCREMENT BY 1 NOCACHE
+/
+
+CREATE OR REPLACE TRIGGER IDN_STS_STORE_TRIGGER
+            BEFORE INSERT
+            ON IDN_STS_STORE
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+            BEGIN
+                SELECT IDN_STS_STORE_SEQUENCE.nextval INTO :NEW.ID FROM dual;
+            END;
+/
+CREATE TABLE IDN_IDENTITY_USER_DATA (
+            TENANT_ID INTEGER DEFAULT -1234,
+            USER_NAME VARCHAR(255) NOT NULL,
+            DATA_KEY VARCHAR(255) NOT NULL,
+            DATA_VALUE VARCHAR(255),
+            PRIMARY KEY (TENANT_ID, USER_NAME, DATA_KEY))
+/
+CREATE TABLE IDN_IDENTITY_META_DATA (
+            USER_NAME VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT -1234,
+            METADATA_TYPE VARCHAR(255) NOT NULL,
+            METADATA VARCHAR(255) NOT NULL,
+            VALID VARCHAR(255) NOT NULL,
+            PRIMARY KEY (TENANT_ID, USER_NAME, METADATA_TYPE,METADATA))
+/
+CREATE TABLE IDN_THRIFT_SESSION (
+            SESSION_ID VARCHAR2(255) NOT NULL,
+            USER_NAME VARCHAR2(255) NOT NULL,
+            CREATED_TIME VARCHAR2(255) NOT NULL,
+            LAST_MODIFIED_TIME VARCHAR2(255) NOT NULL,
+            PRIMARY KEY (SESSION_ID)
+)
+/
+CREATE TABLE IDN_AUTH_SESSION_STORE (
+            SESSION_ID VARCHAR (100) NOT NULL,
+            SESSION_TYPE VARCHAR(100) NOT NULL,
+            SESSION_OBJECT BLOB,
+            TIME_CREATED TIMESTAMP,
+            PRIMARY KEY (SESSION_ID, SESSION_TYPE)
+)
+/
+CREATE TABLE SP_APP (
+            ID INTEGER,
+            TENANT_ID INTEGER NOT NULL,
+            APP_NAME VARCHAR (255) NOT NULL ,
+            USER_STORE VARCHAR (255) NOT NULL,
+            USERNAME VARCHAR (255) NOT NULL ,
+            DESCRIPTION VARCHAR (1024),
+            ROLE_CLAIM VARCHAR (512),
+            AUTH_TYPE VARCHAR (255) NOT NULL,
+            PROVISIONING_USERSTORE_DOMAIN VARCHAR (512),
+            IS_LOCAL_CLAIM_DIALECT CHAR(1) DEFAULT '1',
+            IS_SEND_LOCAL_SUBJECT_ID CHAR(1) DEFAULT '0',
+            IS_SEND_AUTH_LIST_OF_IDPS CHAR(1) DEFAULT '0',
+            IS_USE_TENANT_DOMAIN_SUBJECT CHAR(1) DEFAULT '1',
+            IS_USE_USER_DOMAIN_SUBJECT CHAR(1) DEFAULT '1',
+            SUBJECT_CLAIM_URI VARCHAR (512),
+            IS_SAAS_APP CHAR(1) DEFAULT '0',
+            PRIMARY KEY (ID))
+/
+CREATE SEQUENCE SP_APP_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER SP_APP_TRIG
+            BEFORE INSERT
+            ON SP_APP
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT SP_APP_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+ALTER TABLE SP_APP ADD CONSTRAINT APPLICATION_NAME_CONSTRAINT UNIQUE(APP_NAME, TENANT_ID)
+/
+CREATE TABLE SP_INBOUND_AUTH (
+            ID INTEGER,
+            TENANT_ID INTEGER NOT NULL,
+            INBOUND_AUTH_KEY VARCHAR (255) NOT NULL,
+            INBOUND_AUTH_TYPE VARCHAR (255) NOT NULL,
+            PROP_NAME VARCHAR (255),
+            PROP_VALUE VARCHAR (1024) ,
+            APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID))
+/
+CREATE SEQUENCE SP_INBOUND_AUTH_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER SP_INBOUND_AUTH_TRIG
+            BEFORE INSERT
+            ON SP_INBOUND_AUTH
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT SP_INBOUND_AUTH_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+ALTER TABLE SP_INBOUND_AUTH ADD CONSTRAINT APPLICATION_ID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE
+/
+CREATE TABLE SP_AUTH_STEP (
+            ID INTEGER,
+            TENANT_ID INTEGER NOT NULL,
+            STEP_ORDER INTEGER DEFAULT 1,
+  APP_ID INTEGER NOT NULL,
+            IS_SUBJECT_STEP CHAR(1) DEFAULT '0',
+            IS_ATTRIBUTE_STEP CHAR(1) DEFAULT '0',
+            PRIMARY KEY (ID))
+/
+CREATE SEQUENCE SP_AUTH_STEP_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER SP_AUTH_STEP_TRIG
+            BEFORE INSERT
+            ON SP_AUTH_STEP
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT SP_AUTH_STEP_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+ALTER TABLE SP_AUTH_STEP ADD CONSTRAINT APPLICATION_ID_CONSTRAINT_STEP FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE
+/
+CREATE TABLE SP_FEDERATED_IDP (
+            ID INTEGER NOT NULL,
+            TENANT_ID INTEGER NOT NULL,
+            AUTHENTICATOR_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID, AUTHENTICATOR_ID))
+/
+ALTER TABLE SP_FEDERATED_IDP ADD CONSTRAINT STEP_ID_CONSTRAINT FOREIGN KEY (ID) REFERENCES SP_AUTH_STEP (ID) ON DELETE CASCADE
+/
+CREATE TABLE SP_CLAIM_MAPPING (
+            ID INTEGER,
+            TENANT_ID INTEGER NOT NULL,
+            IDP_CLAIM VARCHAR (512) NOT NULL ,
+            SP_CLAIM VARCHAR (512) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            IS_REQUESTED VARCHAR(128) DEFAULT '0',
+            DEFAULT_VALUE VARCHAR(255),
+            PRIMARY KEY (ID))
+/
+CREATE SEQUENCE SP_CLAIM_MAPPING_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER SP_CLAIM_MAPPING_TRIG
+            BEFORE INSERT
+            ON SP_CLAIM_MAPPING
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT SP_CLAIM_MAPPING_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+ALTER TABLE SP_CLAIM_MAPPING ADD CONSTRAINT CLAIMID_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE
+/
+CREATE TABLE SP_ROLE_MAPPING (
+            ID INTEGER,
+            TENANT_ID INTEGER NOT NULL,
+            IDP_ROLE VARCHAR (255) NOT NULL ,
+            SP_ROLE VARCHAR (255) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID))
+/
+CREATE SEQUENCE SP_ROLE_MAPPING_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER SP_ROLE_MAPPING_TRIG
+            BEFORE INSERT
+            ON SP_ROLE_MAPPING
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT SP_ROLE_MAPPING_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+ALTER TABLE SP_ROLE_MAPPING ADD CONSTRAINT ROLEID_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE
+/
+CREATE TABLE SP_REQ_PATH_AUTHENTICATOR (
+            ID INTEGER,
+            TENANT_ID INTEGER NOT NULL,
+            AUTHENTICATOR_NAME VARCHAR (255) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID))
+/
+CREATE SEQUENCE SP_REQ_PATH_AUTH_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER SP_REQ_PATH_AUTH_TRIG
+            BEFORE INSERT
+            ON SP_REQ_PATH_AUTHENTICATOR
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT SP_REQ_PATH_AUTH_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+ALTER TABLE SP_REQ_PATH_AUTHENTICATOR ADD CONSTRAINT REQ_AUTH_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE
+/
+CREATE TABLE SP_PROVISIONING_CONNECTOR (
+            ID INTEGER,
+            TENANT_ID INTEGER NOT NULL,
+            IDP_NAME VARCHAR (255) NOT NULL ,
+            CONNECTOR_NAME VARCHAR (255) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            IS_JIT_ENABLED CHAR(1) DEFAULT '0',
+        BLOCKING CHAR(1) DEFAULT '0',
+            PRIMARY KEY (ID))
+/
+CREATE SEQUENCE SP_PROV_CONNECTOR_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER SP_PROV_CONNECTOR_TRIG
+            BEFORE INSERT
+            ON SP_PROVISIONING_CONNECTOR
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT SP_PROV_CONNECTOR_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+ALTER TABLE SP_PROVISIONING_CONNECTOR ADD CONSTRAINT PRO_CONNECTOR_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE
+/
+CREATE TABLE IDP (
+            ID INTEGER,
+            TENANT_ID INTEGER,
+            NAME VARCHAR(254) NOT NULL,
+            IS_ENABLED CHAR(1) DEFAULT '1',
+            IS_PRIMARY CHAR(1) DEFAULT '0',
+            HOME_REALM_ID VARCHAR(254),
+            IMAGE BLOB,
+            CERTIFICATE BLOB,
+            ALIAS VARCHAR(254),
+            INBOUND_PROV_ENABLED CHAR (1) DEFAULT '0',
+            INBOUND_PROV_USER_STORE_ID VARCHAR(254),
+            USER_CLAIM_URI VARCHAR(254),
+            ROLE_CLAIM_URI VARCHAR(254),
+            DESCRIPTION VARCHAR (1024),
+            DEFAULT_AUTHENTICATOR_NAME VARCHAR(254),
+            DEFAULT_PRO_CONNECTOR_NAME VARCHAR(254),
+            PROVISIONING_ROLE VARCHAR(128),
+            IS_FEDERATION_HUB CHAR(1) DEFAULT '0',
+            IS_LOCAL_CLAIM_DIALECT CHAR(1) DEFAULT '0',
+  DISPLAY_NAME VARCHAR(255),
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, NAME))
+/
+CREATE SEQUENCE IDP_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER IDP_TRIG
+            BEFORE INSERT
+            ON IDP
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+INSERT INTO IDP (TENANT_ID, NAME, HOME_REALM_ID) VALUES (-1234, 'LOCAL', 'localhost')
+/
+CREATE TABLE IDP_ROLE (
+            ID INTEGER,
+            IDP_ID INTEGER,
+            TENANT_ID INTEGER,
+            ROLE VARCHAR(254),
+            PRIMARY KEY (ID),
+            UNIQUE (IDP_ID, ROLE),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE)
+/
+CREATE SEQUENCE IDP_ROLE_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER IDP_ROLE_TRIG
+            BEFORE INSERT
+            ON IDP_ROLE
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_ROLE_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+CREATE TABLE IDP_ROLE_MAPPING (
+            ID INTEGER,
+            IDP_ROLE_ID INTEGER,
+            TENANT_ID INTEGER,
+            USER_STORE_ID VARCHAR (253),
+            LOCAL_ROLE VARCHAR(253),
+            PRIMARY KEY (ID),
+            UNIQUE (IDP_ROLE_ID, TENANT_ID, USER_STORE_ID, LOCAL_ROLE),
+            FOREIGN KEY (IDP_ROLE_ID) REFERENCES IDP_ROLE(ID) ON DELETE CASCADE)
+/
+CREATE SEQUENCE IDP_ROLE_MAPPING_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER IDP_ROLE_MAPPING_TRIG
+            BEFORE INSERT
+            ON IDP_ROLE_MAPPING
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_ROLE_MAPPING_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+CREATE TABLE IDP_CLAIM (
+            ID INTEGER,
+            IDP_ID INTEGER,
+            TENANT_ID INTEGER,
+            CLAIM VARCHAR(254),
+            PRIMARY KEY (ID),
+            UNIQUE (IDP_ID, CLAIM),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE)
+/
+CREATE SEQUENCE IDP_CLAIM_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER IDP_CLAIM_TRIG
+            BEFORE INSERT
+            ON IDP_CLAIM
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_CLAIM_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+CREATE TABLE IDP_CLAIM_MAPPING (
+            ID INTEGER,
+            IDP_CLAIM_ID INTEGER,
+            TENANT_ID INTEGER,
+            LOCAL_CLAIM VARCHAR(253),
+            DEFAULT_VALUE VARCHAR(255),
+            IS_REQUESTED VARCHAR(128) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (IDP_CLAIM_ID, TENANT_ID, LOCAL_CLAIM),
+            FOREIGN KEY (IDP_CLAIM_ID) REFERENCES IDP_CLAIM(ID) ON DELETE CASCADE)
+/
+CREATE SEQUENCE IDP_CLAIM_MAPPING_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER IDP_CLAIM_MAPPING_TRIG
+            BEFORE INSERT
+            ON IDP_CLAIM_MAPPING
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_CLAIM_MAPPING_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+CREATE TABLE IDP_AUTHENTICATOR (
+            ID INTEGER,
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            NAME VARCHAR(255) NOT NULL,
+            IS_ENABLED CHAR (1) DEFAULT '1',
+            DISPLAY_NAME VARCHAR(255),
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, NAME),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE)
+/
+CREATE SEQUENCE IDP_AUTHENTICATOR_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER IDP_AUTHENTICATOR_TRIG
+            BEFORE INSERT
+            ON IDP_AUTHENTICATOR
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_AUTHENTICATOR_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+INSERT INTO IDP_AUTHENTICATOR (TENANT_ID, IDP_ID, NAME) VALUES (-1234, 1, 'samlsso')
+/
+INSERT INTO IDP_AUTHENTICATOR (TENANT_ID, IDP_ID, NAME) VALUES (-1234, 1, 'IDPProperties')
+/
+CREATE TABLE IDP_AUTHENTICATOR_PROPERTY (
+            ID INTEGER,
+            TENANT_ID INTEGER,
+            AUTHENTICATOR_ID INTEGER,
+            PROPERTY_KEY VARCHAR(255) NOT NULL,
+            PROPERTY_VALUE VARCHAR(2047),
+            IS_SECRET CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, AUTHENTICATOR_ID, PROPERTY_KEY),
+            FOREIGN KEY (AUTHENTICATOR_ID) REFERENCES IDP_AUTHENTICATOR(ID) ON DELETE CASCADE)
+/
+CREATE SEQUENCE IDP_AUTHENTICATOR_PROP_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER IDP_AUTHENTICATOR_PROP_TRIG
+            BEFORE INSERT
+            ON IDP_AUTHENTICATOR_PROPERTY
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_AUTHENTICATOR_PROP_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+INSERT INTO  IDP_AUTHENTICATOR_PROPERTY (TENANT_ID, AUTHENTICATOR_ID, PROPERTY_KEY,PROPERTY_VALUE, IS_SECRET ) VALUES (-1234, 1 , 'IdPEntityId', 'localhost', '0')
+/
+CREATE TABLE IDP_PROVISIONING_CONFIG (
+            ID INTEGER,
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            PROVISIONING_CONNECTOR_TYPE VARCHAR(255) NOT NULL,
+            IS_ENABLED CHAR (1) DEFAULT '0',
+            IS_BLOCKING CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, PROVISIONING_CONNECTOR_TYPE),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE)
+/
+CREATE SEQUENCE IDP_PROVISIONING_CONFIG_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER IDP_PROVISIONING_CONFIG_TRIG
+            BEFORE INSERT
+            ON IDP_PROVISIONING_CONFIG
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_PROVISIONING_CONFIG_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+CREATE TABLE IDP_PROV_CONFIG_PROPERTY (
+            ID INTEGER,
+            TENANT_ID INTEGER,
+            PROVISIONING_CONFIG_ID INTEGER,
+            PROPERTY_KEY VARCHAR(255) NOT NULL,
+            PROPERTY_VALUE VARCHAR(2048),
+            PROPERTY_BLOB_VALUE BLOB,
+            PROPERTY_TYPE CHAR(32) NOT NULL,
+            IS_SECRET CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, PROVISIONING_CONFIG_ID, PROPERTY_KEY),
+            FOREIGN KEY (PROVISIONING_CONFIG_ID) REFERENCES IDP_PROVISIONING_CONFIG(ID) ON DELETE CASCADE)
+/
+CREATE SEQUENCE IDP_PROV_CONFIG_PROP_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER IDP_PROV_CONFIG_PROP_TRIG
+            BEFORE INSERT
+            ON IDP_PROV_CONFIG_PROPERTY
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_PROV_CONFIG_PROP_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+CREATE TABLE IDP_PROVISIONING_ENTITY (
+            ID INTEGER,
+            PROVISIONING_CONFIG_ID INTEGER,
+            ENTITY_TYPE VARCHAR(255) NOT NULL,
+            ENTITY_LOCAL_USERSTORE VARCHAR(255) NOT NULL,
+            ENTITY_NAME VARCHAR(255) NOT NULL,
+            ENTITY_VALUE VARCHAR(255),
+            TENANT_ID INTEGER,
+            PRIMARY KEY (ID),
+            UNIQUE (ENTITY_TYPE, TENANT_ID, ENTITY_LOCAL_USERSTORE, ENTITY_NAME, PROVISIONING_CONFIG_ID),
+            UNIQUE (PROVISIONING_CONFIG_ID, ENTITY_TYPE, ENTITY_VALUE),
+            FOREIGN KEY (PROVISIONING_CONFIG_ID) REFERENCES IDP_PROVISIONING_CONFIG(ID) ON DELETE CASCADE)
+/
+CREATE SEQUENCE IDP_PROV_ENTITY_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER IDP_PROV_ENTITY_TRIG
+            BEFORE INSERT
+            ON IDP_PROVISIONING_ENTITY
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_PROV_ENTITY_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+CREATE TABLE IDP_LOCAL_CLAIM (
+            ID INTEGER,
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            CLAIM_URI VARCHAR(255) NOT NULL,
+            DEFAULT_VALUE VARCHAR(255),
+            IS_REQUESTED VARCHAR(128) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, CLAIM_URI),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE)
+/
+CREATE SEQUENCE IDP_LOCAL_CLAIM_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER IDP_LOCAL_CLAIM_TRIG
+            BEFORE INSERT
+            ON IDP_LOCAL_CLAIM
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_LOCAL_CLAIM_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+CREATE TABLE IDN_ASSOCIATED_ID (
+            ID INTEGER,
+        IDP_USER_ID VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT -1234,
+        IDP_ID INTEGER NOT NULL,
+            DOMAIN_NAME VARCHAR(255) NOT NULL,
+        USER_NAME VARCHAR(255) NOT NULL,
+        PRIMARY KEY (ID),
+            UNIQUE(IDP_USER_ID, TENANT_ID, IDP_ID),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE
+)
+/
+CREATE SEQUENCE IDN_ASSOCIATED_ID_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER IDN_ASSOCIATED_ID_TRIG
+BEFORE INSERT
+ON IDN_ASSOCIATED_ID
+REFERENCING NEW AS NEW
+FOR EACH ROW
+  BEGIN
+    SELECT IDN_ASSOCIATED_ID_SEQ.nextval
+    INTO :NEW.ID
+    FROM dual;
+  END;
+/
+CREATE TABLE IDN_USER_ACCOUNT_ASSOCIATION (
+            ASSOCIATION_KEY VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER,
+            DOMAIN_NAME VARCHAR(255) NOT NULL,
+            USER_NAME VARCHAR(255) NOT NULL,
+            PRIMARY KEY (TENANT_ID, DOMAIN_NAME, USER_NAME))
+/
+CREATE TABLE FIDO_DEVICE_STORE (
+        TENANT_ID INTEGER,
+        DOMAIN_NAME VARCHAR(255) NOT NULL,
+        USER_NAME VARCHAR(45) NOT NULL,
+    TIME_REGISTERED TIMESTAMP,
+        KEY_HANDLE VARCHAR(200) NOT NULL,
+        DEVICE_DATA VARCHAR(2048) NOT NULL,
+      PRIMARY KEY (TENANT_ID, DOMAIN_NAME, USER_NAME, KEY_HANDLE))
+/
+
+CREATE TABLE WF_REQUEST (
+    UUID VARCHAR2 (45),
+    CREATED_BY VARCHAR2 (255),
+    TENANT_ID INTEGER DEFAULT -1,
+    OPERATION_TYPE VARCHAR2 (50),
+    CREATED_AT TIMESTAMP,
+    UPDATED_AT TIMESTAMP,
+    STATUS VARCHAR2 (30),
+    REQUEST BLOB,
+    PRIMARY KEY (UUID))
+/
+
+CREATE TABLE WF_BPS_PROFILE (
+    PROFILE_NAME VARCHAR2(45),
+    HOST_URL VARCHAR2(45),
+    USERNAME VARCHAR2(45),
+    PASSWORD VARCHAR2(255),
+    CALLBACK_HOST VARCHAR2 (45),
+    CALLBACK_USERNAME VARCHAR2 (45),
+    CALLBACK_PASSWORD VARCHAR2 (255),
+    TENANT_ID VARCHAR2 (45),
+    PRIMARY KEY (PROFILE_NAME, TENANT_ID))
+/
+
+CREATE TABLE WF_WORKFLOW(
+    ID VARCHAR2 (45),
+    WF_NAME VARCHAR2 (45),
+    DESCRIPTION VARCHAR2 (255),
+    TEMPLATE_ID VARCHAR2 (45),
+    IMPL_ID VARCHAR2 (45),
+    TENANT_ID VARCHAR2 (45),
+    PRIMARY KEY (ID))
+/
+
+CREATE TABLE WF_WORKFLOW_ASSOCIATION(
+    ID INTEGER,
+    ASSOC_NAME VARCHAR2 (45),
+    EVENT_ID VARCHAR2(45),
+    ASSOC_CONDITION VARCHAR2 (2000),
+    WORKFLOW_ID VARCHAR2 (45),
+    IS_ENABLED CHAR (1) DEFAULT '1',
+    PRIMARY KEY(ID),
+    FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE)
+/
+
+CREATE SEQUENCE WF_WORKFLOW_ASSOCIATION_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER WF_WORKFLOW_ASSOCIATION_TRIG
+BEFORE INSERT
+ON WF_WORKFLOW_ASSOCIATION
+REFERENCING NEW AS NEW
+FOR EACH ROW
+  BEGIN
+    SELECT WF_WORKFLOW_ASSOCIATION_SEQ.nextval
+    INTO :NEW.ID
+    FROM dual;
+  END;
+/
+
+CREATE TABLE WF_WORKFLOW_CONFIG_PARAM(
+    WORKFLOW_ID VARCHAR2 (45),
+    PARAM_NAME VARCHAR2 (45),
+    PARAM_VALUE VARCHAR2 (1000),
+    PRIMARY KEY (WORKFLOW_ID, PARAM_NAME),
+    FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE)
+/
+
+CREATE TABLE WF_REQUEST_ENTITY_RELATIONSHIP(
+  REQUEST_ID VARCHAR2 (45),
+  ENTITY_NAME VARCHAR2 (255),
+  ENTITY_TYPE VARCHAR2 (50),
+  TENANT_ID INTEGER DEFAULT -1,
+  PRIMARY KEY(REQUEST_ID, ENTITY_NAME, ENTITY_TYPE, TENANT_ID),
+  FOREIGN KEY (REQUEST_ID) REFERENCES WF_REQUEST(UUID)ON DELETE CASCADE)
+/
+
+CREATE TABLE WORKFLOW_REQUEST_RELATION(
+  RELATIONSHIP_ID VARCHAR2 (45),
+  WORKFLOW_ID VARCHAR2 (45),
+  REQUEST_ID VARCHAR2 (45),
+  UPDATED_AT TIMESTAMP,
+  STATUS VARCHAR (30),
+  PRIMARY KEY (RELATIONSHIP_ID),
+  FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE,
+  FOREIGN KEY (REQUEST_ID) REFERENCES WF_REQUEST(UUID)ON DELETE CASCADE)
+/
+
+-- End of IDENTITY Tables--
+
+-- Start of API-MGT Tables--
+CREATE TABLE AM_SUBSCRIBER (
+    SUBSCRIBER_ID INTEGER,
+    USER_ID VARCHAR2(255) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    EMAIL_ADDRESS VARCHAR2(256) NULL,
+    DATE_SUBSCRIBED DATE NOT NULL,
+    CREATED_BY VARCHAR2(100),
+    CREATED_TIME DATE,
+    UPDATED_BY VARCHAR2(100),
+    UPDATED_TIME DATE,
+    PRIMARY KEY (SUBSCRIBER_ID),
+    UNIQUE (TENANT_ID,USER_ID)
+)
+/
+
+CREATE SEQUENCE AM_SUBSCRIBER_SEQUENCE START WITH 1 INCREMENT BY 1
+/
+
+CREATE OR REPLACE TRIGGER AM_SUBSCRIBER_TRIGGER
+		            BEFORE INSERT
+                    ON AM_SUBSCRIBER
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_SUBSCRIBER_SEQUENCE.nextval INTO :NEW.SUBSCRIBER_ID FROM dual;
+                    END;
+/
+-- TODO: Have to add ON UPDATE CASCADE for the FOREIGN KEY(SUBSCRIBER_ID) relation
+CREATE TABLE AM_APPLICATION (
+    APPLICATION_ID INTEGER,
+    NAME VARCHAR2(100),
+    SUBSCRIBER_ID INTEGER,
+    APPLICATION_TIER VARCHAR2(50) DEFAULT 'Unlimited',
+    CALLBACK_URL VARCHAR2(512),
+    DESCRIPTION VARCHAR2(512),
+    APPLICATION_STATUS VARCHAR2(50) DEFAULT 'APPROVED',
+    GROUP_ID VARCHAR2(100),
+    CREATED_BY VARCHAR2(100),
+    CREATED_TIME DATE,
+    UPDATED_BY VARCHAR2(100),
+    UPDATED_TIME DATE,
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON DELETE CASCADE,
+    PRIMARY KEY(APPLICATION_ID),
+    UNIQUE (NAME,SUBSCRIBER_ID)
+)
+/
+
+CREATE SEQUENCE AM_APPLICATION_SEQUENCE START WITH 1 INCREMENT BY 1
+/
+
+CREATE OR REPLACE TRIGGER AM_APPLICATION_TRIGGER
+		            BEFORE INSERT
+                    ON AM_APPLICATION
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_APPLICATION_SEQUENCE.nextval INTO :NEW.APPLICATION_ID FROM dual;
+                    END;
+/
+
+CREATE TABLE AM_API (
+    API_ID INTEGER,
+    API_PROVIDER VARCHAR2(256),
+    API_NAME VARCHAR2(256),
+    API_VERSION VARCHAR2(30),
+    CONTEXT VARCHAR2(256),
+    CONTEXT_TEMPLATE VARCHAR2(256),
+    CREATED_BY VARCHAR2(100),
+    CREATED_TIME DATE,
+    UPDATED_BY VARCHAR2(100),
+    UPDATED_TIME DATE,
+    PRIMARY KEY(API_ID),
+    UNIQUE (API_PROVIDER,API_NAME,API_VERSION)
+)
+/
+
+CREATE SEQUENCE AM_API_SEQUENCE START WITH 1 INCREMENT BY 1
+/
+
+CREATE OR REPLACE TRIGGER AM_API_TRIGGER
+		            BEFORE INSERT
+                    ON AM_API
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_API_SEQUENCE.nextval INTO :NEW.API_ID FROM dual;
+                    END;
+/
+
+CREATE TABLE AM_API_URL_MAPPING (
+    URL_MAPPING_ID INTEGER,
+    API_ID INTEGER NOT NULL,
+    HTTP_METHOD VARCHAR(20) NULL,
+    AUTH_SCHEME VARCHAR(50) NULL,
+    URL_PATTERN VARCHAR(512) NULL,
+    THROTTLING_TIER varchar(512) DEFAULT NULL,
+    MEDIATION_SCRIPT BLOB,
+    PRIMARY KEY(URL_MAPPING_ID)
+)
+/
+
+CREATE SEQUENCE AM_API_URL_MAPPING_SEQUENCE START WITH 1 INCREMENT BY 1
+/
+
+CREATE OR REPLACE TRIGGER AM_API_URL_MAPPING_TRIGGER
+		            BEFORE INSERT
+                    ON AM_API_URL_MAPPING
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_API_URL_MAPPING_SEQUENCE.nextval INTO :NEW.URL_MAPPING_ID FROM dual;
+                    END;
+/
+
+-- TODO: Have to add ON UPDATE CASCADE for the FOREIGN KEY(SUBSCRIPTION_ID) relation
+CREATE TABLE AM_SUBSCRIPTION (
+    SUBSCRIPTION_ID INTEGER,
+    TIER_ID VARCHAR2(50),
+    API_ID INTEGER,
+    LAST_ACCESSED DATE NULL,
+    APPLICATION_ID INTEGER,
+    SUB_STATUS VARCHAR(50),
+    SUBS_CREATE_STATE VARCHAR(50) DEFAULT 'SUBSCRIBE',
+    CREATED_BY VARCHAR2(100),
+    CREATED_TIME DATE,
+    UPDATED_BY VARCHAR2(100),
+    UPDATED_TIME DATE,
+    FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON DELETE CASCADE,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE CASCADE,
+    PRIMARY KEY (SUBSCRIPTION_ID)
+)
+/
+
+CREATE SEQUENCE AM_SUBSCRIPTION_SEQUENCE START WITH 1 INCREMENT BY 1
+/
+
+CREATE OR REPLACE TRIGGER AM_SUBSCRIPTION_TRIGGER
+		            BEFORE INSERT
+                    ON AM_SUBSCRIPTION
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_SUBSCRIPTION_SEQUENCE.nextval INTO :NEW.SUBSCRIPTION_ID FROM dual;
+                    END;
+/
+-- TODO: Have to add ON UPDATE CASCADE for the FOREIGN KEY(APPLICATION_ID) and FOREIGN KEY(API_ID) relations
+CREATE TABLE AM_SUBSCRIPTION_KEY_MAPPING (
+    SUBSCRIPTION_ID INTEGER,
+    ACCESS_TOKEN VARCHAR2(512),
+    KEY_TYPE VARCHAR2(512) NOT NULL,
+    FOREIGN KEY(SUBSCRIPTION_ID) REFERENCES AM_SUBSCRIPTION(SUBSCRIPTION_ID) ON DELETE CASCADE,
+    PRIMARY KEY(SUBSCRIPTION_ID,ACCESS_TOKEN)
+)
+/
+--TODO: Have to add ON UPDATE CASCADE for the FOREIGN KEY(APPLICATION_ID) relation
+CREATE TABLE AM_APPLICATION_KEY_MAPPING (
+    APPLICATION_ID INTEGER,
+    CONSUMER_KEY VARCHAR2(512),
+    KEY_TYPE VARCHAR2(512) NOT NULL,
+    STATE VARCHAR2(30) NOT NULL,
+    CREATE_MODE VARCHAR2(30) DEFAULT 'CREATED',
+    FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON DELETE CASCADE,
+    PRIMARY KEY(APPLICATION_ID,KEY_TYPE)
+)
+/
+
+CREATE TABLE AM_APPLICATION_REGISTRATION (
+    REG_ID INTEGER ,
+    SUBSCRIBER_ID INTEGER,
+    WF_REF VARCHAR2(255) NOT NULL,
+    APP_ID INTEGER,
+    TOKEN_TYPE VARCHAR2(30),
+    TOKEN_SCOPE VARCHAR2(256) DEFAULT 'default',
+    INPUTS VARCHAR2(1024),
+    ALLOWED_DOMAINS VARCHAR2(256),
+    VALIDITY_PERIOD NUMBER(19),
+    UNIQUE (SUBSCRIBER_ID,APP_ID,TOKEN_TYPE),
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID),
+    FOREIGN KEY(APP_ID) REFERENCES AM_APPLICATION(APPLICATION_ID),
+    PRIMARY KEY (REG_ID)
+)
+/
+-- TODO: Have to add ON UPDATE CASCADE for the FOREIGN KEY(API_ID) relation
+CREATE TABLE AM_API_LC_EVENT (
+    EVENT_ID INTEGER,
+    API_ID INTEGER NOT NULL,
+    PREVIOUS_STATE VARCHAR2(50),
+    NEW_STATE VARCHAR2(50) NOT NULL,
+    USER_ID VARCHAR2(255) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    EVENT_DATE DATE NOT NULL,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE CASCADE,
+    PRIMARY KEY (EVENT_ID)
+)
+/
+
+CREATE TABLE AM_APP_KEY_DOMAIN_MAPPING (
+    CONSUMER_KEY VARCHAR(255),
+    AUTHZ_DOMAIN VARCHAR(255) DEFAULT 'ALL',
+    PRIMARY KEY (CONSUMER_KEY,AUTHZ_DOMAIN)
+)
+/
+
+CREATE TABLE AM_API_COMMENTS (
+    COMMENT_ID INTEGER,
+    COMMENT_TEXT VARCHAR2(512),
+    COMMENTED_USER VARCHAR2(255),
+    DATE_COMMENTED DATE NOT NULL,
+    API_ID INTEGER NOT NULL,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE CASCADE,
+    PRIMARY KEY (COMMENT_ID)
+)
+/
+
+CREATE SEQUENCE AM_API_COMMENTS_SEQUENCE START WITH 1 INCREMENT BY 1
+/
+
+CREATE OR REPLACE TRIGGER AM_API_COMMENTS_TRIGGER
+		            BEFORE INSERT
+                    ON AM_API_COMMENTS
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_API_COMMENTS_SEQUENCE.nextval INTO :NEW.COMMENT_ID FROM dual;
+                    END;
+/
+
+CREATE TABLE AM_API_RATINGS (
+    RATING_ID INTEGER,
+    API_ID INTEGER,
+    RATING INTEGER,
+    SUBSCRIBER_ID INTEGER,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE CASCADE,
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON DELETE CASCADE,
+    PRIMARY KEY (RATING_ID)
+)
+/
+
+CREATE SEQUENCE AM_API_RATINGS_SEQUENCE START WITH 1 INCREMENT BY 1
+/
+
+CREATE OR REPLACE TRIGGER AM_API_RATINGS_TRIGGER
+		            BEFORE INSERT
+                    ON AM_API_RATINGS
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_API_RATINGS_SEQUENCE.nextval INTO :NEW.RATING_ID FROM dual;
+                    END;
+/
+
+CREATE TABLE AM_TIER_PERMISSIONS (
+    TIER_PERMISSIONS_ID INTEGER,
+    TIER VARCHAR2(50) NOT NULL,
+    PERMISSIONS_TYPE VARCHAR2(50) NOT NULL,
+    ROLES VARCHAR2(512) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    PRIMARY KEY(TIER_PERMISSIONS_ID)
+)
+/
+
+CREATE SEQUENCE AM_TIER_PERMISSIONS_SEQUENCE START WITH 1 INCREMENT BY 1
+/
+
+CREATE OR REPLACE TRIGGER AM_TIER_PERMISSIONS_TRIGGER
+		            BEFORE INSERT
+                    ON AM_TIER_PERMISSIONS
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_TIER_PERMISSIONS_SEQUENCE.nextval INTO :NEW.TIER_PERMISSIONS_ID FROM dual;
+                    END;
+/
+
+CREATE SEQUENCE AM_API_LC_EVENT_SEQUENCE START WITH 1 INCREMENT BY 1
+/
+
+CREATE OR REPLACE TRIGGER AM_API_LC_EVENT_TRIGGER
+		            BEFORE INSERT
+                    ON AM_API_LC_EVENT
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_API_LC_EVENT_SEQUENCE.nextval INTO :NEW.EVENT_ID FROM dual;
+                    END;
+/
+-- Start of IDP-APPLICATION-MGT Tables --
+
+-- End of IDP-APPLICATION-MGT Tables --
+
+
+CREATE TABLE AM_EXTERNAL_STORES (
+    APISTORE_ID INTEGER,
+    API_ID INTEGER,
+    STORE_ID VARCHAR2(255) NOT NULL,
+    STORE_DISPLAY_NAME VARCHAR2(255) NOT NULL,
+    STORE_ENDPOINT VARCHAR2(255) NOT NULL,
+    STORE_TYPE VARCHAR2(255) NOT NULL,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE CASCADE,
+    PRIMARY KEY (APISTORE_ID)
+)
+/
+
+CREATE TABLE AM_WORKFLOWS(
+    WF_ID INTEGER,
+    WF_REFERENCE VARCHAR(255) NOT NULL,
+    WF_TYPE VARCHAR(255) NOT NULL,
+    WF_STATUS VARCHAR(255) NOT NULL,
+    WF_CREATED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    WF_UPDATED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    WF_STATUS_DESC VARCHAR(1000),
+    TENANT_ID INTEGER,
+    TENANT_DOMAIN VARCHAR(255),
+    WF_EXTERNAL_REFERENCE VARCHAR(255) NOT NULL UNIQUE,
+    PRIMARY KEY (WF_ID)
+)
+/
+
+CREATE TABLE AM_API_SCOPES (
+   API_ID  INTEGER NOT NULL,
+   SCOPE_ID  INTEGER NOT NULL,
+   FOREIGN KEY (API_ID) REFERENCES AM_API (API_ID) ON DELETE CASCADE,
+   FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID) ON DELETE CASCADE
+)
+/
+CREATE SEQUENCE AM_APP_REGISTRATION_SEQUENCE START WITH 1 INCREMENT BY 1
+/
+
+CREATE OR REPLACE TRIGGER AM_APP_REGISTRATION_TRIGGER
+		            BEFORE INSERT
+                    ON AM_APPLICATION_REGISTRATION
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_APP_REGISTRATION_SEQUENCE.nextval INTO :NEW.REG_ID FROM dual;
+                    END;
+/
+
+CREATE SEQUENCE AM_WORKFLOWS_SEQUENCE START WITH 1 INCREMENT BY 1
+/
+
+CREATE OR REPLACE TRIGGER AM_WORKFLOWS_TRIGGER
+		            BEFORE INSERT
+                    ON AM_WORKFLOWS
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_WORKFLOWS_SEQUENCE.nextval INTO :NEW.WF_ID FROM dual;
+                    END;
+/
+
+CREATE SEQUENCE AM_EXTERNAL_STORES_SEQUENCE START WITH 1 INCREMENT BY 1
+/
+
+CREATE OR REPLACE TRIGGER AM_EXTERNAL_STORES_TRIGGER
+		            BEFORE INSERT
+                    ON AM_EXTERNAL_STORES
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_EXTERNAL_STORES_SEQUENCE.nextval INTO :NEW.APISTORE_ID FROM dual;
+                    END;
+/
+
+CREATE TABLE AM_API_DEFAULT_VERSION (
+            DEFAULT_VERSION_ID NUMBER, 
+            API_NAME VARCHAR(256) NOT NULL ,
+            API_PROVIDER VARCHAR(256) NOT NULL , 
+            DEFAULT_API_VERSION VARCHAR(30) , 
+            PUBLISHED_DEFAULT_API_VERSION VARCHAR(30) ,
+            PRIMARY KEY (DEFAULT_VERSION_ID)
+)
+/
+CREATE SEQUENCE AM_API_DEFAULT_VERSION_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER AM_API_DEFAULT_VERSION_TRG
+                    BEFORE INSERT
+                    ON AM_API_DEFAULT_VERSION
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_API_DEFAULT_VERSION_SEQ.nextval INTO :NEW.DEFAULT_VERSION_ID FROM dual;
+                    END;
+/
+CREATE INDEX IDX_SUB_APP_ID ON AM_SUBSCRIPTION (APPLICATION_ID, SUBSCRIPTION_ID)
+/
+
diff --git a/modules/distribution/src/api-resource/sql/oracle_rac.sql b/modules/distribution/src/api-resource/sql/oracle_rac.sql
new file mode 100644
index 00000000..4b510a58
--- /dev/null
+++ b/modules/distribution/src/api-resource/sql/oracle_rac.sql
@@ -0,0 +1,1180 @@
+-- Create Oracle New User and Connect
+--------------------------------------
+-- CREATE USER apimuser IDENTIFIED BY wso2;
+-- GRANT CONNECT,RESOURCE to apimuser WITH ADMIN OPTION;
+-- CONNECT apimuser/wso2
+--
+
+-- Start of IDN Tables --
+CREATE TABLE IDN_BASE_TABLE (
+            PRODUCT_NAME VARCHAR2 (20),
+            PRIMARY KEY (PRODUCT_NAME))
+/
+INSERT INTO IDN_BASE_TABLE values ('WSO2 Identity Server')
+/
+CREATE TABLE IDN_OAUTH_CONSUMER_APPS (
+            ID INTEGER,
+            CONSUMER_KEY VARCHAR2 (255),
+            CONSUMER_SECRET VARCHAR2 (512),
+            USERNAME VARCHAR2 (255),
+            TENANT_ID INTEGER DEFAULT 0,
+            APP_NAME VARCHAR2 (255),
+            OAUTH_VERSION VARCHAR2 (128),
+            CALLBACK_URL VARCHAR2 (1024),
+            GRANT_TYPES VARCHAR (1024),
+            CONSTRAINT CONSUMER_KEY_CONSTRAINT UNIQUE (CONSUMER_KEY),
+            PRIMARY KEY (ID))
+/
+CREATE SEQUENCE IDN_OAUTH_CONSUMER_APPS_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER IDN_OAUTH_CONSUMER_APPS_TRIG
+            BEFORE INSERT
+            ON IDN_OAUTH_CONSUMER_APPS
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+              BEGIN
+                SELECT IDN_OAUTH_CONSUMER_APPS_SEQ.nextval INTO :NEW.ID FROM dual;
+              END;
+/
+CREATE TABLE IDN_OAUTH1A_REQUEST_TOKEN (
+            REQUEST_TOKEN VARCHAR2 (512),
+            REQUEST_TOKEN_SECRET VARCHAR2 (512),
+            CONSUMER_KEY_ID INTEGER,
+            CALLBACK_URL VARCHAR2 (1024),
+            SCOPE VARCHAR2(2048),
+            AUTHORIZED VARCHAR2 (128),
+            OAUTH_VERIFIER VARCHAR2 (512),
+            AUTHZ_USER VARCHAR2 (512),
+            PRIMARY KEY (REQUEST_TOKEN),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE)
+/
+CREATE TABLE IDN_OAUTH1A_ACCESS_TOKEN (
+            ACCESS_TOKEN VARCHAR2 (512),
+            ACCESS_TOKEN_SECRET VARCHAR2 (512),
+            CONSUMER_KEY_ID INTEGER,
+            SCOPE VARCHAR2(2048),
+            AUTHZ_USER VARCHAR2 (512),
+            PRIMARY KEY (ACCESS_TOKEN),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE)
+/
+CREATE TABLE IDN_OAUTH2_ACCESS_TOKEN (
+            TOKEN_ID VARCHAR (255),
+            ACCESS_TOKEN VARCHAR2 (255),
+            REFRESH_TOKEN VARCHAR2 (255),
+            CONSUMER_KEY_ID INTEGER,
+            AUTHZ_USER VARCHAR2 (100),
+            TENANT_ID INTEGER,
+            USER_DOMAIN VARCHAR2 (50),
+            USER_TYPE VARCHAR (25),
+            TIME_CREATED TIMESTAMP,
+            REFRESH_TOKEN_TIME_CREATED TIMESTAMP,
+            VALIDITY_PERIOD NUMBER(19),
+            REFRESH_TOKEN_VALIDITY_PERIOD NUMBER(19),
+            TOKEN_SCOPE_HASH VARCHAR2 (32),
+            TOKEN_STATE VARCHAR2 (25) DEFAULT 'ACTIVE',
+            TOKEN_STATE_ID VARCHAR (128) DEFAULT 'NONE',
+            PRIMARY KEY (TOKEN_ID),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE,
+            CONSTRAINT CON_APP_KEY UNIQUE (CONSUMER_KEY_ID,AUTHZ_USER,TOKEN_ID,USER_DOMAIN,USER_TYPE,TOKEN_SCOPE_HASH,
+            TOKEN_STATE,TOKEN_STATE_ID))
+/
+CREATE INDEX IDX_AT_CK_AU ON IDN_OAUTH2_ACCESS_TOKEN(CONSUMER_KEY_ID, AUTHZ_USER, TOKEN_STATE, USER_TYPE)
+/
+CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED)
+/
+CREATE TABLE IDN_OAUTH2_AUTHORIZATION_CODE (
+            AUTHORIZATION_CODE VARCHAR2 (512),
+            CONSUMER_KEY_ID INTEGER,
+              CALLBACK_URL VARCHAR2 (1024),
+            SCOPE VARCHAR2(2048),
+            AUTHZ_USER VARCHAR2 (100),
+            TENANT_ID INTEGER,
+            USER_DOMAIN VARCHAR2(50),
+            TIME_CREATED TIMESTAMP,
+            VALIDITY_PERIOD NUMBER(19),
+            STATE VARCHAR (25) DEFAULT 'ACTIVE',
+            TOKEN_ID VARCHAR(255),
+            PRIMARY KEY (AUTHORIZATION_CODE),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE)
+/
+CREATE TABLE IDN_OAUTH2_SCOPE_ASSOCIATION (
+            TOKEN_ID VARCHAR2 (255),
+            TOKEN_SCOPE VARCHAR2 (60),
+            PRIMARY KEY (TOKEN_ID, TOKEN_SCOPE),
+            FOREIGN KEY (TOKEN_ID) REFERENCES IDN_OAUTH2_ACCESS_TOKEN(TOKEN_ID) ON DELETE CASCADE)
+/
+CREATE TABLE IDN_OAUTH2_SCOPE (
+            SCOPE_ID INTEGER,
+            SCOPE_KEY VARCHAR2 (100) NOT NULL,
+            NAME VARCHAR2 (255) NULL,
+            DESCRIPTION VARCHAR2 (512) NULL,
+            TENANT_ID INTEGER DEFAULT 0,
+        ROLES VARCHAR2 (500) NULL,
+            PRIMARY KEY (SCOPE_ID))
+/
+CREATE SEQUENCE IDN_OAUTH2_SCOPE_SEQUENCE START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER IDN_OAUTH2_SCOPE_TRIGGER
+            BEFORE INSERT
+            ON IDN_OAUTH2_SCOPE
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+            BEGIN
+                SELECT IDN_OAUTH2_SCOPE_SEQUENCE.nextval INTO :NEW.SCOPE_ID FROM dual;
+            END;
+/
+CREATE TABLE IDN_OAUTH2_RESOURCE_SCOPE (
+            RESOURCE_PATH VARCHAR2 (255) NOT NULL,
+            SCOPE_ID INTEGER NOT NULL,
+            PRIMARY KEY (RESOURCE_PATH),
+            FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID))
+/
+CREATE TABLE IDN_SCIM_GROUP (
+            ID INTEGER,
+            TENANT_ID INTEGER NOT NULL,
+            ROLE_NAME VARCHAR2(255) NOT NULL,
+            ATTR_NAME VARCHAR2(1024) NOT NULL,
+            ATTR_VALUE VARCHAR2(1024),
+            PRIMARY KEY (ID))
+/
+CREATE SEQUENCE IDN_SCIM_GROUP_SEQUENCE START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+
+CREATE OR REPLACE TRIGGER IDN_SCIM_GROUP_TRIGGER
+            BEFORE INSERT
+            ON IDN_SCIM_GROUP
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+            BEGIN
+                SELECT IDN_SCIM_GROUP_SEQUENCE.nextval INTO :NEW.ID FROM dual;
+            END;
+/
+CREATE TABLE IDN_OPENID_REMEMBER_ME (
+            USER_NAME VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT 0,
+            COOKIE_VALUE VARCHAR(1024),
+            CREATED_TIME TIMESTAMP,
+            PRIMARY KEY (USER_NAME, TENANT_ID))
+/
+CREATE TABLE IDN_OPENID_USER_RPS (
+            USER_NAME VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT 0,
+            RP_URL VARCHAR(255) NOT NULL,
+            TRUSTED_ALWAYS VARCHAR(128) DEFAULT 'FALSE',
+            LAST_VISIT DATE NOT NULL,
+            VISIT_COUNT INTEGER DEFAULT 0,
+            DEFAULT_PROFILE_NAME VARCHAR(255) DEFAULT 'DEFAULT',
+            PRIMARY KEY (USER_NAME, TENANT_ID, RP_URL))
+/
+CREATE TABLE IDN_OPENID_ASSOCIATIONS (
+            HANDLE VARCHAR(255) NOT NULL,
+            ASSOC_TYPE VARCHAR(255) NOT NULL,
+            EXPIRE_IN TIMESTAMP NOT NULL,
+            MAC_KEY VARCHAR(255) NOT NULL,
+            ASSOC_STORE VARCHAR(128) DEFAULT 'SHARED',
+            PRIMARY KEY (HANDLE))
+/
+CREATE TABLE IDN_STS_STORE (
+            ID INTEGER,
+            TOKEN_ID VARCHAR(255) NOT NULL,
+            TOKEN_CONTENT BLOB NOT NULL,
+            CREATE_DATE TIMESTAMP NOT NULL,
+            EXPIRE_DATE TIMESTAMP NOT NULL,
+            STATE INTEGER DEFAULT 0,
+            PRIMARY KEY (ID))
+/
+CREATE SEQUENCE IDN_STS_STORE_SEQUENCE START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+
+CREATE OR REPLACE TRIGGER IDN_STS_STORE_TRIGGER
+            BEFORE INSERT
+            ON IDN_STS_STORE
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+            BEGIN
+                SELECT IDN_STS_STORE_SEQUENCE.nextval INTO :NEW.ID FROM dual;
+            END;
+/
+CREATE TABLE IDN_IDENTITY_USER_DATA (
+            TENANT_ID INTEGER DEFAULT -1234,
+            USER_NAME VARCHAR(255) NOT NULL,
+            DATA_KEY VARCHAR(255) NOT NULL,
+            DATA_VALUE VARCHAR(255),
+            PRIMARY KEY (TENANT_ID, USER_NAME, DATA_KEY))
+/
+CREATE TABLE IDN_IDENTITY_META_DATA (
+            USER_NAME VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT -1234,
+            METADATA_TYPE VARCHAR(255) NOT NULL,
+            METADATA VARCHAR(255) NOT NULL,
+            VALID VARCHAR(255) NOT NULL,
+            PRIMARY KEY (TENANT_ID, USER_NAME, METADATA_TYPE,METADATA))
+/
+CREATE TABLE IDN_THRIFT_SESSION (
+            SESSION_ID VARCHAR2(255) NOT NULL,
+            USER_NAME VARCHAR2(255) NOT NULL,
+            CREATED_TIME VARCHAR2(255) NOT NULL,
+            LAST_MODIFIED_TIME VARCHAR2(255) NOT NULL,
+            PRIMARY KEY (SESSION_ID)
+)
+/
+CREATE TABLE IDN_AUTH_SESSION_STORE (
+            SESSION_ID VARCHAR (100) NOT NULL,
+            SESSION_TYPE VARCHAR(100) NOT NULL,
+            SESSION_OBJECT BLOB,
+            TIME_CREATED TIMESTAMP,
+            PRIMARY KEY (SESSION_ID, SESSION_TYPE)
+)
+/
+CREATE TABLE SP_APP (
+            ID INTEGER,
+            TENANT_ID INTEGER NOT NULL,
+            APP_NAME VARCHAR (255) NOT NULL ,
+            USER_STORE VARCHAR (255) NOT NULL,
+            USERNAME VARCHAR (255) NOT NULL ,
+            DESCRIPTION VARCHAR (1024),
+                ROLE_CLAIM VARCHAR (512),
+            AUTH_TYPE VARCHAR (255) NOT NULL,
+            PROVISIONING_USERSTORE_DOMAIN VARCHAR (512),
+            IS_LOCAL_CLAIM_DIALECT CHAR(1) DEFAULT '1',
+            IS_SEND_LOCAL_SUBJECT_ID CHAR(1) DEFAULT '0',
+            IS_SEND_AUTH_LIST_OF_IDPS CHAR(1) DEFAULT '0',
+            IS_USE_TENANT_DOMAIN_SUBJECT CHAR(1) DEFAULT '1',
+            IS_USE_USER_DOMAIN_SUBJECT CHAR(1) DEFAULT '1',
+            SUBJECT_CLAIM_URI VARCHAR (512),
+            IS_SAAS_APP CHAR(1) DEFAULT '0',
+            PRIMARY KEY (ID))
+/
+CREATE SEQUENCE SP_APP_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER SP_APP_TRIG
+            BEFORE INSERT
+            ON SP_APP
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT SP_APP_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+ALTER TABLE SP_APP ADD CONSTRAINT APPLICATION_NAME_CONSTRAINT UNIQUE(APP_NAME, TENANT_ID)
+/
+CREATE TABLE SP_INBOUND_AUTH (
+            ID INTEGER,
+            TENANT_ID INTEGER NOT NULL,
+            INBOUND_AUTH_KEY VARCHAR (255) NOT NULL,
+            INBOUND_AUTH_TYPE VARCHAR (255) NOT NULL,
+            PROP_NAME VARCHAR (255),
+            PROP_VALUE VARCHAR (1024) ,
+            APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID))
+/
+CREATE SEQUENCE SP_INBOUND_AUTH_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER SP_INBOUND_AUTH_TRIG
+            BEFORE INSERT
+            ON SP_INBOUND_AUTH
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT SP_INBOUND_AUTH_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+ALTER TABLE SP_INBOUND_AUTH ADD CONSTRAINT APPLICATION_ID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE
+/
+CREATE TABLE SP_AUTH_STEP (
+            ID INTEGER,
+            TENANT_ID INTEGER NOT NULL,
+            STEP_ORDER INTEGER DEFAULT 1,
+            APP_ID INTEGER NOT NULL,
+            IS_SUBJECT_STEP CHAR(1) DEFAULT '0',
+            IS_ATTRIBUTE_STEP CHAR(1) DEFAULT '0',
+            PRIMARY KEY (ID))
+/
+CREATE SEQUENCE SP_AUTH_STEP_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER SP_AUTH_STEP_TRIG
+            BEFORE INSERT
+            ON SP_AUTH_STEP
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT SP_AUTH_STEP_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+ALTER TABLE SP_AUTH_STEP ADD CONSTRAINT APPLICATION_ID_CONSTRAINT_STEP FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE
+/
+CREATE TABLE SP_FEDERATED_IDP (
+            ID INTEGER NOT NULL,
+            TENANT_ID INTEGER NOT NULL,
+            AUTHENTICATOR_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID, AUTHENTICATOR_ID))
+/
+ALTER TABLE SP_FEDERATED_IDP ADD CONSTRAINT STEP_ID_CONSTRAINT FOREIGN KEY (ID) REFERENCES SP_AUTH_STEP (ID) ON DELETE CASCADE
+/
+CREATE TABLE SP_CLAIM_MAPPING (
+            ID INTEGER,
+            TENANT_ID INTEGER NOT NULL,
+            IDP_CLAIM VARCHAR (512) NOT NULL ,
+            SP_CLAIM VARCHAR (512) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            IS_REQUESTED VARCHAR(128) DEFAULT '0',
+            DEFAULT_VALUE VARCHAR(255),
+            PRIMARY KEY (ID))
+/
+CREATE SEQUENCE SP_CLAIM_MAPPING_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER SP_CLAIM_MAPPING_TRIG
+            BEFORE INSERT
+            ON SP_CLAIM_MAPPING
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT SP_CLAIM_MAPPING_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+ALTER TABLE SP_CLAIM_MAPPING ADD CONSTRAINT CLAIMID_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE
+/
+CREATE TABLE SP_ROLE_MAPPING (
+            ID INTEGER,
+            TENANT_ID INTEGER NOT NULL,
+            IDP_ROLE VARCHAR (255) NOT NULL ,
+            SP_ROLE VARCHAR (255) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID))
+/
+CREATE SEQUENCE SP_ROLE_MAPPING_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER SP_ROLE_MAPPING_TRIG
+            BEFORE INSERT
+            ON SP_ROLE_MAPPING
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT SP_ROLE_MAPPING_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+ALTER TABLE SP_ROLE_MAPPING ADD CONSTRAINT ROLEID_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE
+/
+CREATE TABLE SP_REQ_PATH_AUTHENTICATOR (
+            ID INTEGER,
+            TENANT_ID INTEGER NOT NULL,
+            AUTHENTICATOR_NAME VARCHAR (255) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID))
+/
+CREATE SEQUENCE SP_REQ_PATH_AUTH_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER SP_REQ_PATH_AUTH_TRIG
+            BEFORE INSERT
+            ON SP_REQ_PATH_AUTHENTICATOR
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT SP_REQ_PATH_AUTH_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+ALTER TABLE SP_REQ_PATH_AUTHENTICATOR ADD CONSTRAINT REQ_AUTH_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE
+/
+CREATE TABLE SP_PROVISIONING_CONNECTOR (
+            ID INTEGER,
+            TENANT_ID INTEGER NOT NULL,
+            IDP_NAME VARCHAR (255) NOT NULL ,
+            CONNECTOR_NAME VARCHAR (255) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            IS_JIT_ENABLED CHAR(1) DEFAULT '0',
+        BLOCKING CHAR(1) DEFAULT '0',
+            PRIMARY KEY (ID))
+/
+CREATE SEQUENCE SP_PROV_CONNECTOR_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER SP_PROV_CONNECTOR_TRIG
+            BEFORE INSERT
+            ON SP_PROVISIONING_CONNECTOR
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT SP_PROV_CONNECTOR_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+ALTER TABLE SP_PROVISIONING_CONNECTOR ADD CONSTRAINT PRO_CONNECTOR_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE
+/
+CREATE TABLE IDP (
+            ID INTEGER,
+            TENANT_ID INTEGER,
+            NAME VARCHAR(254) NOT NULL,
+            IS_ENABLED CHAR(1) DEFAULT '1',
+            IS_PRIMARY CHAR(1) DEFAULT '0',
+            HOME_REALM_ID VARCHAR(254),
+            IMAGE BLOB,
+            CERTIFICATE BLOB,
+            ALIAS VARCHAR(254),
+            INBOUND_PROV_ENABLED CHAR (1) DEFAULT '0',
+            INBOUND_PROV_USER_STORE_ID VARCHAR(254),
+            USER_CLAIM_URI VARCHAR(254),
+            ROLE_CLAIM_URI VARCHAR(254),
+            DESCRIPTION VARCHAR (1024),
+            DEFAULT_AUTHENTICATOR_NAME VARCHAR(254),
+            DEFAULT_PRO_CONNECTOR_NAME VARCHAR(254),
+            PROVISIONING_ROLE VARCHAR(128),
+            IS_FEDERATION_HUB CHAR(1) DEFAULT '0',
+            IS_LOCAL_CLAIM_DIALECT CHAR(1) DEFAULT '0',
+            DISPLAY_NAME VARCHAR(254),
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, NAME))
+/
+CREATE SEQUENCE IDP_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER IDP_TRIG
+            BEFORE INSERT
+            ON IDP
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+INSERT INTO IDP (TENANT_ID, NAME, HOME_REALM_ID) VALUES (-1234, 'LOCAL', 'localhost')
+/
+CREATE TABLE IDP_ROLE (
+            ID INTEGER,
+            IDP_ID INTEGER,
+            TENANT_ID INTEGER,
+            ROLE VARCHAR(254),
+            PRIMARY KEY (ID),
+            UNIQUE (IDP_ID, ROLE),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE)
+/
+CREATE SEQUENCE IDP_ROLE_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER IDP_ROLE_TRIG
+            BEFORE INSERT
+            ON IDP_ROLE
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_ROLE_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+CREATE TABLE IDP_ROLE_MAPPING (
+            ID INTEGER,
+            IDP_ROLE_ID INTEGER,
+            TENANT_ID INTEGER,
+            USER_STORE_ID VARCHAR (253),
+            LOCAL_ROLE VARCHAR(253),
+            PRIMARY KEY (ID),
+            UNIQUE (IDP_ROLE_ID, TENANT_ID, USER_STORE_ID, LOCAL_ROLE),
+            FOREIGN KEY (IDP_ROLE_ID) REFERENCES IDP_ROLE(ID) ON DELETE CASCADE)
+/
+CREATE SEQUENCE IDP_ROLE_MAPPING_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER IDP_ROLE_MAPPING_TRIG
+            BEFORE INSERT
+            ON IDP_ROLE_MAPPING
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_ROLE_MAPPING_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+CREATE TABLE IDP_CLAIM (
+            ID INTEGER,
+            IDP_ID INTEGER,
+            TENANT_ID INTEGER,
+            CLAIM VARCHAR(254),
+            PRIMARY KEY (ID),
+            UNIQUE (IDP_ID, CLAIM),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE)
+/
+CREATE SEQUENCE IDP_CLAIM_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER IDP_CLAIM_TRIG
+            BEFORE INSERT
+            ON IDP_CLAIM
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_CLAIM_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+CREATE TABLE IDP_CLAIM_MAPPING (
+            ID INTEGER,
+            IDP_CLAIM_ID INTEGER,
+            TENANT_ID INTEGER,
+            LOCAL_CLAIM VARCHAR(253),
+            DEFAULT_VALUE VARCHAR(255),
+            IS_REQUESTED VARCHAR(128) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (IDP_CLAIM_ID, TENANT_ID, LOCAL_CLAIM),
+            FOREIGN KEY (IDP_CLAIM_ID) REFERENCES IDP_CLAIM(ID) ON DELETE CASCADE)
+/
+CREATE SEQUENCE IDP_CLAIM_MAPPING_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER IDP_CLAIM_MAPPING_TRIG
+            BEFORE INSERT
+            ON IDP_CLAIM_MAPPING
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_CLAIM_MAPPING_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+CREATE TABLE IDP_AUTHENTICATOR (
+            ID INTEGER,
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            NAME VARCHAR(255) NOT NULL,
+            IS_ENABLED CHAR (1) DEFAULT '1',
+            DISPLAY_NAME VARCHAR(255),
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, NAME),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE)
+/
+CREATE SEQUENCE IDP_AUTHENTICATOR_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER IDP_AUTHENTICATOR_TRIG
+            BEFORE INSERT
+            ON IDP_AUTHENTICATOR
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_AUTHENTICATOR_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+INSERT INTO IDP_AUTHENTICATOR (TENANT_ID, IDP_ID, NAME) VALUES (-1234, 1, 'samlsso')
+/
+INSERT INTO IDP_AUTHENTICATOR (TENANT_ID, IDP_ID, NAME) VALUES (-1234, 1, 'IDPProperties')
+/
+CREATE TABLE IDP_AUTHENTICATOR_PROPERTY (
+            ID INTEGER,
+            TENANT_ID INTEGER,
+            AUTHENTICATOR_ID INTEGER,
+            PROPERTY_KEY VARCHAR(255) NOT NULL,
+            PROPERTY_VALUE VARCHAR(2047),
+            IS_SECRET CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, AUTHENTICATOR_ID, PROPERTY_KEY),
+            FOREIGN KEY (AUTHENTICATOR_ID) REFERENCES IDP_AUTHENTICATOR(ID) ON DELETE CASCADE)
+/
+CREATE SEQUENCE IDP_AUTHENTICATOR_PROP_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER IDP_AUTHENTICATOR_PROP_TRIG
+            BEFORE INSERT
+            ON IDP_AUTHENTICATOR_PROPERTY
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_AUTHENTICATOR_PROP_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+INSERT INTO  IDP_AUTHENTICATOR_PROPERTY (TENANT_ID, AUTHENTICATOR_ID, PROPERTY_KEY,PROPERTY_VALUE, IS_SECRET ) VALUES (-1234, 1 , 'IdPEntityId', 'localhost', '0')
+/
+CREATE TABLE IDP_PROVISIONING_CONFIG (
+            ID INTEGER,
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            PROVISIONING_CONNECTOR_TYPE VARCHAR(255) NOT NULL,
+            IS_ENABLED CHAR (1) DEFAULT '0',
+            IS_BLOCKING CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, PROVISIONING_CONNECTOR_TYPE),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE)
+/
+CREATE SEQUENCE IDP_PROVISIONING_CONFIG_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER IDP_PROVISIONING_CONFIG_TRIG
+            BEFORE INSERT
+            ON IDP_PROVISIONING_CONFIG
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_PROVISIONING_CONFIG_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+CREATE TABLE IDP_PROV_CONFIG_PROPERTY (
+            ID INTEGER,
+            TENANT_ID INTEGER,
+            PROVISIONING_CONFIG_ID INTEGER,
+            PROPERTY_KEY VARCHAR(255) NOT NULL,
+            PROPERTY_VALUE VARCHAR(2048),
+            PROPERTY_BLOB_VALUE BLOB,
+            PROPERTY_TYPE CHAR(32) NOT NULL,
+            IS_SECRET CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, PROVISIONING_CONFIG_ID, PROPERTY_KEY),
+            FOREIGN KEY (PROVISIONING_CONFIG_ID) REFERENCES IDP_PROVISIONING_CONFIG(ID) ON DELETE CASCADE)
+/
+CREATE SEQUENCE IDP_PROV_CONFIG_PROP_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER IDP_PROV_CONFIG_PROP_TRIG
+            BEFORE INSERT
+            ON IDP_PROV_CONFIG_PROPERTY
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_PROV_CONFIG_PROP_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+CREATE TABLE IDP_PROVISIONING_ENTITY (
+            ID INTEGER,
+            PROVISIONING_CONFIG_ID INTEGER,
+            ENTITY_TYPE VARCHAR(255) NOT NULL,
+            ENTITY_LOCAL_USERSTORE VARCHAR(255) NOT NULL,
+            ENTITY_NAME VARCHAR(255) NOT NULL,
+            ENTITY_VALUE VARCHAR(255),
+            TENANT_ID INTEGER,
+            PRIMARY KEY (ID),
+            UNIQUE (ENTITY_TYPE, TENANT_ID, ENTITY_LOCAL_USERSTORE, ENTITY_NAME, PROVISIONING_CONFIG_ID),
+            UNIQUE (PROVISIONING_CONFIG_ID, ENTITY_TYPE, ENTITY_VALUE),
+            FOREIGN KEY (PROVISIONING_CONFIG_ID) REFERENCES IDP_PROVISIONING_CONFIG(ID) ON DELETE CASCADE)
+/
+CREATE SEQUENCE IDP_PROV_ENTITY_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER IDP_PROV_ENTITY_TRIG
+            BEFORE INSERT
+            ON IDP_PROVISIONING_ENTITY
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_PROV_ENTITY_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+CREATE TABLE IDP_LOCAL_CLAIM (
+            ID INTEGER,
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            CLAIM_URI VARCHAR(255) NOT NULL,
+            DEFAULT_VALUE VARCHAR(255),
+            IS_REQUESTED VARCHAR(128) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, CLAIM_URI),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE)
+/
+CREATE SEQUENCE IDP_LOCAL_CLAIM_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER IDP_LOCAL_CLAIM_TRIG
+            BEFORE INSERT
+            ON IDP_LOCAL_CLAIM
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDP_LOCAL_CLAIM_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+CREATE TABLE IDN_ASSOCIATED_ID (
+            ID INTEGER,
+        IDP_USER_ID VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT -1234,
+        IDP_ID INTEGER NOT NULL,
+            DOMAIN_NAME VARCHAR(255) NOT NULL,
+        USER_NAME VARCHAR(255) NOT NULL,
+        PRIMARY KEY (ID),
+            UNIQUE(IDP_USER_ID, TENANT_ID, IDP_ID),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE
+)
+/
+CREATE SEQUENCE IDN_ASSOCIATED_ID_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
+/
+CREATE OR REPLACE TRIGGER IDN_ASSOCIATED_ID_TRIG
+            BEFORE INSERT
+            ON IDN_ASSOCIATED_ID
+            REFERENCING NEW AS NEW
+            FOR EACH ROW
+               BEGIN
+                   SELECT IDN_ASSOCIATED_ID_SEQ.nextval INTO :NEW.ID FROM dual;
+               END;
+/
+CREATE TABLE IDN_USER_ACCOUNT_ASSOCIATION (
+            ASSOCIATION_KEY VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER,
+            DOMAIN_NAME VARCHAR(255) NOT NULL,
+            USER_NAME VARCHAR(255) NOT NULL,
+            PRIMARY KEY (TENANT_ID, DOMAIN_NAME, USER_NAME))
+/
+CREATE TABLE FIDO_DEVICE_STORE (
+        TENANT_ID INTEGER,
+        DOMAIN_NAME VARCHAR(255) NOT NULL,
+        USER_NAME VARCHAR(45) NOT NULL,
+    TIME_REGISTERED TIMESTAMP,
+        KEY_HANDLE VARCHAR(200) NOT NULL,
+        DEVICE_DATA VARCHAR(2048) NOT NULL,
+      PRIMARY KEY (TENANT_ID, DOMAIN_NAME, USER_NAME, KEY_HANDLE))
+/
+
+CREATE TABLE WF_REQUEST (
+    UUID VARCHAR2 (45),
+    CREATED_BY VARCHAR2 (255),
+    TENANT_ID INTEGER DEFAULT -1,
+    OPERATION_TYPE VARCHAR2 (50),
+    CREATED_AT TIMESTAMP,
+    UPDATED_AT TIMESTAMP,
+    STATUS VARCHAR2 (30),
+    REQUEST BLOB,
+    PRIMARY KEY (UUID))
+/
+
+CREATE TABLE WF_BPS_PROFILE (
+    PROFILE_NAME VARCHAR2(45),
+    HOST_URL VARCHAR2(45),
+    USERNAME VARCHAR2(45),
+    PASSWORD VARCHAR2(255),
+    CALLBACK_HOST VARCHAR2 (45),
+    CALLBACK_USERNAME VARCHAR2 (45),
+    CALLBACK_PASSWORD VARCHAR2 (255),
+    TENANT_ID VARCHAR2 (45),
+    PRIMARY KEY (PROFILE_NAME, TENANT_ID))
+/
+
+CREATE TABLE WF_WORKFLOW(
+    ID VARCHAR2 (45),
+    WF_NAME VARCHAR2 (45),
+    DESCRIPTION VARCHAR2 (255),
+    TEMPLATE_ID VARCHAR2 (45),
+    IMPL_ID VARCHAR2 (45),
+    TENANT_ID VARCHAR2 (45),
+    PRIMARY KEY (ID))
+/
+
+CREATE TABLE WF_WORKFLOW_ASSOCIATION(
+    ID INTEGER,
+    ASSOC_NAME VARCHAR2 (45),
+    EVENT_ID VARCHAR2(45),
+    ASSOC_CONDITION VARCHAR2 (2000),
+    WORKFLOW_ID VARCHAR2 (45),
+    IS_ENABLED CHAR (1) DEFAULT '1',
+    PRIMARY KEY(ID),
+    FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE)
+/
+
+CREATE SEQUENCE WF_WORKFLOW_ASSOCIATION_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+
+CREATE OR REPLACE TRIGGER WF_WORKFLOW_ASSOCIATION_TRIG
+BEFORE INSERT
+ON WF_WORKFLOW_ASSOCIATION
+REFERENCING NEW AS NEW
+FOR EACH ROW
+  BEGIN
+    SELECT WF_WORKFLOW_ASSOCIATION_SEQ.nextval
+    INTO :NEW.ID
+    FROM dual;
+  END;
+/
+
+CREATE TABLE WF_WORKFLOW_CONFIG_PARAM(
+    WORKFLOW_ID VARCHAR2 (45),
+    PARAM_NAME VARCHAR2 (45),
+    PARAM_VALUE VARCHAR2 (1000),
+    PRIMARY KEY (WORKFLOW_ID, PARAM_NAME),
+    FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE)
+/
+
+CREATE TABLE WF_REQUEST_ENTITY_RELATIONSHIP(
+  REQUEST_ID VARCHAR2 (45),
+  ENTITY_NAME VARCHAR2 (255),
+  ENTITY_TYPE VARCHAR2 (50),
+  TENANT_ID INTEGER DEFAULT -1,
+  PRIMARY KEY(REQUEST_ID, ENTITY_NAME, ENTITY_TYPE, TENANT_ID),
+  FOREIGN KEY (REQUEST_ID) REFERENCES WF_REQUEST(UUID)ON DELETE CASCADE)
+/
+
+CREATE TABLE WORKFLOW_REQUEST_RELATION(
+  RELATIONSHIP_ID VARCHAR2 (45),
+  WORKFLOW_ID VARCHAR2 (45),
+  REQUEST_ID VARCHAR2 (45),
+  UPDATED_AT TIMESTAMP,
+  STATUS VARCHAR (30),
+  PRIMARY KEY (RELATIONSHIP_ID),
+  FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE,
+  FOREIGN KEY (REQUEST_ID) REFERENCES WF_REQUEST(UUID)ON DELETE CASCADE)
+/
+
+-- End of IDENTITY Tables--
+
+-- Start of API-MGT Tables--
+CREATE TABLE AM_SUBSCRIBER (
+    SUBSCRIBER_ID INTEGER,
+    USER_ID VARCHAR2(255) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    EMAIL_ADDRESS VARCHAR2(256) NULL,
+    DATE_SUBSCRIBED DATE NOT NULL,
+    CREATED_BY VARCHAR2(100),
+    CREATED_TIME DATE,
+    UPDATED_BY VARCHAR2(100),
+    UPDATED_TIME DATE,
+    PRIMARY KEY (SUBSCRIBER_ID),
+    UNIQUE (TENANT_ID,USER_ID)
+)
+/
+
+CREATE SEQUENCE AM_SUBSCRIBER_SEQUENCE START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+
+CREATE OR REPLACE TRIGGER AM_SUBSCRIBER_TRIGGER
+		            BEFORE INSERT
+                    ON AM_SUBSCRIBER
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_SUBSCRIBER_SEQUENCE.nextval INTO :NEW.SUBSCRIBER_ID FROM dual;
+                    END;
+/
+-- TODO: Have to add ON UPDATE CASCADE for the FOREIGN KEY(SUBSCRIBER_ID) relation
+CREATE TABLE AM_APPLICATION (
+    APPLICATION_ID INTEGER,
+    NAME VARCHAR2(100),
+    SUBSCRIBER_ID INTEGER,
+    APPLICATION_TIER VARCHAR2(50) DEFAULT 'Unlimited',
+    CALLBACK_URL VARCHAR2(512),
+    DESCRIPTION VARCHAR2(512),
+    APPLICATION_STATUS VARCHAR2(50) DEFAULT 'APPROVED',
+    GROUP_ID VARCHAR(100),
+    CREATED_BY VARCHAR2(100),
+    CREATED_TIME DATE,
+    UPDATED_BY VARCHAR2(100),
+    UPDATED_TIME DATE,
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON DELETE CASCADE,
+    PRIMARY KEY(APPLICATION_ID),
+    UNIQUE (NAME,SUBSCRIBER_ID)
+)
+/
+
+CREATE SEQUENCE AM_APPLICATION_SEQUENCE START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+
+CREATE OR REPLACE TRIGGER AM_APPLICATION_TRIGGER
+		            BEFORE INSERT
+                    ON AM_APPLICATION
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_APPLICATION_SEQUENCE.nextval INTO :NEW.APPLICATION_ID FROM dual;
+                    END;
+/
+
+CREATE TABLE AM_API (
+    API_ID INTEGER,
+    API_PROVIDER VARCHAR2(256),
+    API_NAME VARCHAR2(256),
+    API_VERSION VARCHAR2(30),
+    CONTEXT VARCHAR2(256),
+    CONTEXT_TEMPLATE VARCHAR2(256),
+    CREATED_BY VARCHAR2(100),
+    CREATED_TIME DATE,
+    UPDATED_BY VARCHAR2(100),
+    UPDATED_TIME DATE,
+    PRIMARY KEY(API_ID),
+    UNIQUE (API_PROVIDER,API_NAME,API_VERSION)
+)
+/
+
+CREATE SEQUENCE AM_API_SEQUENCE START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+
+CREATE OR REPLACE TRIGGER AM_API_TRIGGER
+		            BEFORE INSERT
+                    ON AM_API
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_API_SEQUENCE.nextval INTO :NEW.API_ID FROM dual;
+                    END;
+/
+
+CREATE TABLE AM_API_URL_MAPPING (
+    URL_MAPPING_ID INTEGER,
+    API_ID INTEGER NOT NULL,
+    HTTP_METHOD VARCHAR(20) NULL,
+    AUTH_SCHEME VARCHAR(50) NULL,
+    URL_PATTERN VARCHAR(512) NULL,
+    THROTTLING_TIER varchar(512) DEFAULT NULL,
+    MEDIATION_SCRIPT BLOB,
+    PRIMARY KEY(URL_MAPPING_ID)
+)
+/
+
+CREATE SEQUENCE AM_API_URL_MAPPING_SEQUENCE START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+
+CREATE OR REPLACE TRIGGER AM_API_URL_MAPPING_TRIGGER
+		            BEFORE INSERT
+                    ON AM_API_URL_MAPPING
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_API_URL_MAPPING_SEQUENCE.nextval INTO :NEW.URL_MAPPING_ID FROM dual;
+                    END;
+/
+
+-- TODO: Have to add ON UPDATE CASCADE for the FOREIGN KEY(SUBSCRIPTION_ID) relation
+CREATE TABLE AM_SUBSCRIPTION (
+    SUBSCRIPTION_ID INTEGER,
+    TIER_ID VARCHAR2(50),
+    API_ID INTEGER,
+    LAST_ACCESSED DATE NULL,
+    APPLICATION_ID INTEGER,
+    SUB_STATUS VARCHAR(50),
+    SUBS_CREATE_STATE VARCHAR(50) DEFAULT 'SUBSCRIBE',
+    CREATED_BY VARCHAR2(100),
+    CREATED_TIME DATE,
+    UPDATED_BY VARCHAR2(100),
+    UPDATED_TIME DATE,
+    FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON DELETE CASCADE,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE CASCADE,
+    PRIMARY KEY (SUBSCRIPTION_ID)
+)
+/
+
+CREATE SEQUENCE AM_SUBSCRIPTION_SEQUENCE START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+
+CREATE OR REPLACE TRIGGER AM_SUBSCRIPTION_TRIGGER
+		            BEFORE INSERT
+                    ON AM_SUBSCRIPTION
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_SUBSCRIPTION_SEQUENCE.nextval INTO :NEW.SUBSCRIPTION_ID FROM dual;
+                    END;
+/
+-- TODO: Have to add ON UPDATE CASCADE for the FOREIGN KEY(APPLICATION_ID) and FOREIGN KEY(API_ID) relations
+CREATE TABLE AM_SUBSCRIPTION_KEY_MAPPING (
+    SUBSCRIPTION_ID INTEGER,
+    ACCESS_TOKEN VARCHAR2(512),
+    KEY_TYPE VARCHAR2(512) NOT NULL,
+    FOREIGN KEY(SUBSCRIPTION_ID) REFERENCES AM_SUBSCRIPTION(SUBSCRIPTION_ID) ON DELETE CASCADE,
+    PRIMARY KEY(SUBSCRIPTION_ID,ACCESS_TOKEN)
+)
+/
+--TODO: Have to add ON UPDATE CASCADE for the FOREIGN KEY(APPLICATION_ID) relation
+CREATE TABLE AM_APPLICATION_KEY_MAPPING (
+    APPLICATION_ID INTEGER,
+    CONSUMER_KEY VARCHAR2(512),
+    KEY_TYPE VARCHAR2(512) NOT NULL,
+    CREATE_MODE VARCHAR2(30) DEFAULT 'CREATED',
+    STATE VARCHAR2(30) NOT NULL,
+    FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON DELETE CASCADE,
+    PRIMARY KEY(APPLICATION_ID,KEY_TYPE)
+)
+/
+
+CREATE TABLE AM_APPLICATION_REGISTRATION (
+    REG_ID INTEGER ,
+    SUBSCRIBER_ID INTEGER,
+    WF_REF VARCHAR2(255) NOT NULL,
+    APP_ID INTEGER,
+    TOKEN_TYPE VARCHAR2(30),
+    TOKEN_SCOPE VARCHAR2(256) DEFAULT 'default',
+    INPUTS VARCHAR2(1000),
+    ALLOWED_DOMAINS VARCHAR2(256),
+    VALIDITY_PERIOD NUMBER(19),
+    UNIQUE (SUBSCRIBER_ID,APP_ID,TOKEN_TYPE),
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID),
+    FOREIGN KEY(APP_ID) REFERENCES AM_APPLICATION(APPLICATION_ID),
+    PRIMARY KEY (REG_ID)
+)
+/
+-- TODO: Have to add ON UPDATE CASCADE for the FOREIGN KEY(API_ID) relation
+CREATE TABLE AM_API_LC_EVENT (
+    EVENT_ID INTEGER,
+    API_ID INTEGER NOT NULL,
+    PREVIOUS_STATE VARCHAR2(50),
+    NEW_STATE VARCHAR2(50) NOT NULL,
+    USER_ID VARCHAR2(255) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    EVENT_DATE DATE NOT NULL,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE CASCADE,
+    PRIMARY KEY (EVENT_ID)
+)
+/
+
+CREATE TABLE AM_APP_KEY_DOMAIN_MAPPING (
+    CONSUMER_KEY VARCHAR(255),
+    AUTHZ_DOMAIN VARCHAR(255) DEFAULT 'ALL',
+    PRIMARY KEY (CONSUMER_KEY,AUTHZ_DOMAIN)
+)
+/
+
+CREATE TABLE AM_API_COMMENTS (
+    COMMENT_ID INTEGER,
+    COMMENT_TEXT VARCHAR2(512),
+    COMMENTED_USER VARCHAR2(255),
+    DATE_COMMENTED DATE NOT NULL,
+    API_ID INTEGER NOT NULL,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE CASCADE,
+    PRIMARY KEY (COMMENT_ID)
+)
+/
+
+CREATE SEQUENCE AM_API_COMMENTS_SEQUENCE START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+
+CREATE OR REPLACE TRIGGER AM_API_COMMENTS_TRIGGER
+		            BEFORE INSERT
+                    ON AM_API_COMMENTS
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_API_COMMENTS_SEQUENCE.nextval INTO :NEW.COMMENT_ID FROM dual;
+                    END;
+/
+
+CREATE TABLE AM_API_RATINGS (
+    RATING_ID INTEGER,
+    API_ID INTEGER,
+    RATING INTEGER,
+    SUBSCRIBER_ID INTEGER,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE CASCADE,
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON DELETE CASCADE,
+    PRIMARY KEY (RATING_ID)
+)
+/
+
+CREATE SEQUENCE AM_API_RATINGS_SEQUENCE START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+
+CREATE OR REPLACE TRIGGER AM_API_RATINGS_TRIGGER
+		            BEFORE INSERT
+                    ON AM_API_RATINGS
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_API_RATINGS_SEQUENCE.nextval INTO :NEW.RATING_ID FROM dual;
+                    END;
+/
+
+CREATE TABLE AM_TIER_PERMISSIONS (
+    TIER_PERMISSIONS_ID INTEGER,
+    TIER VARCHAR2(50) NOT NULL,
+    PERMISSIONS_TYPE VARCHAR2(50) NOT NULL,
+    ROLES VARCHAR2(512) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    PRIMARY KEY(TIER_PERMISSIONS_ID)
+)
+/
+
+CREATE SEQUENCE AM_TIER_PERMISSIONS_SEQUENCE START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+
+CREATE OR REPLACE TRIGGER AM_TIER_PERMISSIONS_TRIGGER
+		            BEFORE INSERT
+                    ON AM_TIER_PERMISSIONS
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_TIER_PERMISSIONS_SEQUENCE.nextval INTO :NEW.TIER_PERMISSIONS_ID FROM dual;
+                    END;
+/
+
+CREATE SEQUENCE AM_API_LC_EVENT_SEQUENCE START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+
+CREATE OR REPLACE TRIGGER AM_API_LC_EVENT_TRIGGER
+		            BEFORE INSERT
+                    ON AM_API_LC_EVENT
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_API_LC_EVENT_SEQUENCE.nextval INTO :NEW.EVENT_ID FROM dual;
+                    END;
+/
+-- Start of IDP-APPLICATION-MGT Tables --
+
+-- End of IDP-APPLICATION-MGT Tables --
+
+
+CREATE TABLE AM_EXTERNAL_STORES (
+    APISTORE_ID INTEGER,
+    API_ID INTEGER,
+    STORE_ID VARCHAR2(255) NOT NULL,
+    STORE_DISPLAY_NAME VARCHAR2(255) NOT NULL,
+    STORE_ENDPOINT VARCHAR2(255) NOT NULL,
+    STORE_TYPE VARCHAR2(255) NOT NULL,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE CASCADE,
+    PRIMARY KEY (APISTORE_ID)
+)
+/
+
+CREATE TABLE AM_WORKFLOWS(
+    WF_ID INTEGER,
+    WF_REFERENCE VARCHAR(255) NOT NULL,
+    WF_TYPE VARCHAR(255) NOT NULL,
+    WF_STATUS VARCHAR(255) NOT NULL,
+    WF_CREATED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    WF_UPDATED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    WF_STATUS_DESC VARCHAR(1000),
+    TENANT_ID INTEGER,
+    TENANT_DOMAIN VARCHAR(255),
+    WF_EXTERNAL_REFERENCE VARCHAR(255) NOT NULL UNIQUE,
+    PRIMARY KEY (WF_ID)
+)
+/
+
+CREATE TABLE AM_API_SCOPES (
+   API_ID  INTEGER NOT NULL,
+   SCOPE_ID  INTEGER NOT NULL,
+   FOREIGN KEY (API_ID) REFERENCES AM_API (API_ID) ON DELETE CASCADE,
+   FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID) ON DELETE CASCADE
+)
+/
+CREATE SEQUENCE AM_APP_REGISTRATION_SEQUENCE START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+
+CREATE OR REPLACE TRIGGER AM_APP_REGISTRATION_TRIGGER
+		            BEFORE INSERT
+                    ON AM_APPLICATION_REGISTRATION
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_APP_REGISTRATION_SEQUENCE.nextval INTO :NEW.REG_ID FROM dual;
+                    END;
+/
+
+CREATE SEQUENCE AM_WORKFLOWS_SEQUENCE START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+
+CREATE OR REPLACE TRIGGER AM_WORKFLOWS_TRIGGER
+		            BEFORE INSERT
+                    ON AM_WORKFLOWS
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_WORKFLOWS_SEQUENCE.nextval INTO :NEW.WF_ID FROM dual;
+                    END;
+/
+
+CREATE SEQUENCE AM_EXTERNAL_STORES_SEQUENCE START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+
+CREATE OR REPLACE TRIGGER AM_EXTERNAL_STORES_TRIGGER
+		            BEFORE INSERT
+                    ON AM_EXTERNAL_STORES
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_EXTERNAL_STORES_SEQUENCE.nextval INTO :NEW.APISTORE_ID FROM dual;
+                    END;
+/
+
+CREATE TABLE AM_API_DEFAULT_VERSION (
+            DEFAULT_VERSION_ID NUMBER, 
+            API_NAME VARCHAR(256) NOT NULL ,
+            API_PROVIDER VARCHAR(256) NOT NULL , 
+            DEFAULT_API_VERSION VARCHAR(30) , 
+            PUBLISHED_DEFAULT_API_VERSION VARCHAR(30) ,
+            PRIMARY KEY (DEFAULT_VERSION_ID)
+)
+/
+CREATE SEQUENCE AM_API_DEFAULT_VERSION_SEQ START WITH 1 INCREMENT BY 1 CACHE 20 ORDER
+/
+CREATE OR REPLACE TRIGGER AM_API_DEFAULT_VERSION_TRG
+                    BEFORE INSERT
+                    ON AM_API_DEFAULT_VERSION
+                    REFERENCING NEW AS NEW
+                    FOR EACH ROW
+                    BEGIN
+                    SELECT AM_API_DEFAULT_VERSION_SEQ.nextval INTO :NEW.DEFAULT_VERSION_ID FROM dual;
+                    END;
+/
+CREATE INDEX IDX_SUB_APP_ID ON AM_SUBSCRIPTION (APPLICATION_ID, SUBSCRIPTION_ID)
+/
+
diff --git a/modules/distribution/src/api-resource/sql/postgresql.sql b/modules/distribution/src/api-resource/sql/postgresql.sql
new file mode 100644
index 00000000..7545a9c4
--- /dev/null
+++ b/modules/distribution/src/api-resource/sql/postgresql.sql
@@ -0,0 +1,859 @@
+BEGIN TRANSACTION;
+
+-- Start of IDN Tables --
+DROP TABLE IF EXISTS IDN_BASE_TABLE;
+CREATE TABLE IDN_BASE_TABLE (
+            PRODUCT_NAME VARCHAR(20),
+            PRIMARY KEY (PRODUCT_NAME)
+);
+
+INSERT INTO IDN_BASE_TABLE values ('WSO2 Identity Server');
+
+DROP TABLE IF EXISTS IDN_OAUTH_CONSUMER_APPS;
+DROP SEQUENCE IF EXISTS IDN_OAUTH_CONSUMER_APPS_PK_SEQ;
+CREATE SEQUENCE IDN_OAUTH_CONSUMER_APPS_PK_SEQ;
+CREATE TABLE IDN_OAUTH_CONSUMER_APPS (
+            ID INTEGER DEFAULT NEXTVAL('IDN_OAUTH_CONSUMER_APPS_PK_SEQ'),
+            CONSUMER_KEY VARCHAR(255),
+            CONSUMER_SECRET VARCHAR(512),
+            USERNAME VARCHAR(255),
+            TENANT_ID INTEGER DEFAULT 0,
+            APP_NAME VARCHAR(255),
+            OAUTH_VERSION VARCHAR(128),
+            CALLBACK_URL VARCHAR(1024),
+            GRANT_TYPES VARCHAR (1024),
+            CONSTRAINT CONSUMER_KEY_CONSTRAINT UNIQUE (CONSUMER_KEY),
+            PRIMARY KEY (ID)
+);
+
+DROP TABLE IF EXISTS IDN_OAUTH1A_REQUEST_TOKEN;
+CREATE TABLE IDN_OAUTH1A_REQUEST_TOKEN (
+            REQUEST_TOKEN VARCHAR(512),
+            REQUEST_TOKEN_SECRET VARCHAR(512),
+            CONSUMER_KEY_ID INTEGER,
+            CALLBACK_URL VARCHAR(1024),
+            SCOPE VARCHAR(2048),
+            AUTHORIZED VARCHAR(128),
+            OAUTH_VERIFIER VARCHAR(512),
+            AUTHZ_USER VARCHAR(512),
+            PRIMARY KEY (REQUEST_TOKEN),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE
+);
+
+DROP TABLE IF EXISTS IDN_OAUTH1A_ACCESS_TOKEN;
+CREATE TABLE IDN_OAUTH1A_ACCESS_TOKEN (
+            ACCESS_TOKEN VARCHAR(512),
+            ACCESS_TOKEN_SECRET VARCHAR(512),
+            CONSUMER_KEY_ID INTEGER,
+            SCOPE VARCHAR(2048),
+            AUTHZ_USER VARCHAR(512),
+            PRIMARY KEY (ACCESS_TOKEN),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE
+);
+
+DROP TABLE IF EXISTS IDN_OAUTH2_ACCESS_TOKEN;
+CREATE TABLE IDN_OAUTH2_ACCESS_TOKEN (
+            TOKEN_ID VARCHAR (255),
+            ACCESS_TOKEN VARCHAR(255),
+            REFRESH_TOKEN VARCHAR(255),
+            CONSUMER_KEY_ID INTEGER,
+            AUTHZ_USER VARCHAR (100),
+            TENANT_ID INTEGER,
+            USER_DOMAIN VARCHAR(50),
+            USER_TYPE VARCHAR (25),
+            TIME_CREATED TIMESTAMP,
+            REFRESH_TOKEN_TIME_CREATED TIMESTAMP,
+            VALIDITY_PERIOD BIGINT,
+            REFRESH_TOKEN_VALIDITY_PERIOD BIGINT,
+            TOKEN_SCOPE_HASH VARCHAR(32),
+            TOKEN_STATE VARCHAR(25) DEFAULT 'ACTIVE',
+            TOKEN_STATE_ID VARCHAR (128) DEFAULT 'NONE',
+            PRIMARY KEY (TOKEN_ID),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE,
+            CONSTRAINT CON_APP_KEY UNIQUE (CONSUMER_KEY_ID,AUTHZ_USER,TOKEN_ID,USER_DOMAIN,USER_TYPE,TOKEN_SCOPE_HASH,
+                                           TOKEN_STATE,TOKEN_STATE_ID)
+);
+
+CREATE INDEX IDX_AT_CK_AU ON IDN_OAUTH2_ACCESS_TOKEN(CONSUMER_KEY_ID, AUTHZ_USER, TOKEN_STATE, USER_TYPE);
+
+CREATE INDEX IDX_TC ON IDN_OAUTH2_ACCESS_TOKEN(TIME_CREATED);
+
+DROP TABLE IF EXISTS IDN_OAUTH2_AUTHORIZATION_CODE;
+CREATE TABLE IDN_OAUTH2_AUTHORIZATION_CODE (
+            AUTHORIZATION_CODE VARCHAR(512),
+            CONSUMER_KEY_ID INTEGER,
+                CALLBACK_URL VARCHAR(1024),
+            SCOPE VARCHAR(2048),
+            AUTHZ_USER VARCHAR (100),
+            TENANT_ID INTEGER,
+            USER_DOMAIN VARCHAR(50),
+                TIME_CREATED TIMESTAMP,
+                VALIDITY_PERIOD BIGINT,
+            STATE VARCHAR (25) DEFAULT 'ACTIVE',
+            TOKEN_ID VARCHAR(255),
+            PRIMARY KEY (AUTHORIZATION_CODE),
+            FOREIGN KEY (CONSUMER_KEY_ID) REFERENCES IDN_OAUTH_CONSUMER_APPS(ID) ON DELETE CASCADE
+);
+
+DROP TABLE IF EXISTS IDN_OAUTH2_SCOPE_ASSOCIATION;
+CREATE TABLE IDN_OAUTH2_SCOPE_ASSOCIATION (
+            TOKEN_ID VARCHAR (255),
+            TOKEN_SCOPE VARCHAR (60),
+            PRIMARY KEY (TOKEN_ID, TOKEN_SCOPE),
+            FOREIGN KEY (TOKEN_ID) REFERENCES IDN_OAUTH2_ACCESS_TOKEN(TOKEN_ID) ON DELETE CASCADE);
+
+DROP TABLE IF EXISTS IDN_OAUTH2_SCOPE;
+DROP SEQUENCE IF EXISTS IDN_OAUTH2_SCOPE_PK_SEQ;
+CREATE SEQUENCE IDN_OAUTH2_SCOPE_PK_SEQ;
+CREATE TABLE IF NOT EXISTS IDN_OAUTH2_SCOPE (
+            SCOPE_ID INTEGER DEFAULT NEXTVAL('IDN_OAUTH2_SCOPE_PK_SEQ'),
+            SCOPE_KEY VARCHAR(100) NOT NULL,
+            NAME VARCHAR(255) NULL,
+            DESCRIPTION VARCHAR(512) NULL,
+            TENANT_ID INTEGER DEFAULT 0,
+          ROLES VARCHAR (500) NULL,
+            PRIMARY KEY (SCOPE_ID)
+);
+
+DROP TABLE IF EXISTS IDN_OAUTH2_RESOURCE_SCOPE;
+CREATE TABLE IF NOT EXISTS IDN_OAUTH2_RESOURCE_SCOPE (
+            RESOURCE_PATH VARCHAR(255) NOT NULL,
+            SCOPE_ID INTEGER NOT NULL,
+            PRIMARY KEY (RESOURCE_PATH),
+            FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID)
+);
+
+DROP TABLE IF EXISTS IDN_SCIM_GROUP;
+DROP SEQUENCE IF EXISTS IDN_SCIM_GROUP_PK_SEQ;
+CREATE SEQUENCE IDN_SCIM_GROUP_PK_SEQ;
+CREATE TABLE IDN_SCIM_GROUP (
+                  ID INTEGER DEFAULT NEXTVAL('IDN_SCIM_GROUP_PK_SEQ'),
+                  TENANT_ID INTEGER NOT NULL,
+                  ROLE_NAME VARCHAR(255) NOT NULL,
+            ATTR_NAME VARCHAR(1024) NOT NULL,
+                  ATTR_VALUE VARCHAR(1024),
+            PRIMARY KEY (ID)
+);
+
+DROP TABLE IF EXISTS IDN_OPENID_REMEMBER_ME;
+CREATE TABLE IDN_OPENID_REMEMBER_ME (
+            USER_NAME VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT 0,
+            COOKIE_VALUE VARCHAR(1024),
+            CREATED_TIME TIMESTAMP,
+            PRIMARY KEY (USER_NAME, TENANT_ID)
+);
+
+DROP TABLE IF EXISTS IDN_OPENID_USER_RPS;
+CREATE TABLE IDN_OPENID_USER_RPS (
+                  USER_NAME VARCHAR(255) NOT NULL,
+                  TENANT_ID INTEGER DEFAULT 0,
+                  RP_URL VARCHAR(255) NOT NULL,
+                  TRUSTED_ALWAYS VARCHAR(128) DEFAULT 'FALSE',
+                  LAST_VISIT DATE NOT NULL,
+                  VISIT_COUNT INTEGER DEFAULT 0,
+                  DEFAULT_PROFILE_NAME VARCHAR(255) DEFAULT 'DEFAULT',
+                  PRIMARY KEY (USER_NAME, TENANT_ID, RP_URL)
+);
+
+DROP TABLE IF EXISTS IDN_OPENID_ASSOCIATIONS;
+CREATE TABLE IDN_OPENID_ASSOCIATIONS (
+                  HANDLE VARCHAR(255) NOT NULL,
+                  ASSOC_TYPE VARCHAR(255) NOT NULL,
+                  EXPIRE_IN TIMESTAMP NOT NULL,
+                  MAC_KEY VARCHAR(255) NOT NULL,
+                  ASSOC_STORE VARCHAR(128) DEFAULT 'SHARED',
+                  PRIMARY KEY (HANDLE)
+);
+
+DROP TABLE IF EXISTS IDN_STS_STORE;
+DROP SEQUENCE IF EXISTS IDN_STS_STORE_PK_SEQ;
+CREATE SEQUENCE IDN_STS_STORE_PK_SEQ;
+CREATE TABLE IDN_STS_STORE (
+            ID INTEGER DEFAULT NEXTVAL('IDN_STS_STORE_PK_SEQ'),
+            TOKEN_ID VARCHAR(255) NOT NULL,
+            TOKEN_CONTENT BYTEA NOT NULL,
+            CREATE_DATE TIMESTAMP NOT NULL,
+            EXPIRE_DATE TIMESTAMP NOT NULL,
+            STATE INTEGER DEFAULT 0,
+            PRIMARY KEY (ID)
+);
+
+DROP TABLE IF EXISTS IDN_IDENTITY_USER_DATA;
+CREATE TABLE IDN_IDENTITY_USER_DATA (
+            TENANT_ID INTEGER DEFAULT -1234,
+            USER_NAME VARCHAR(255) NOT NULL,
+            DATA_KEY VARCHAR(255) NOT NULL,
+            DATA_VALUE VARCHAR(255),
+            PRIMARY KEY (TENANT_ID, USER_NAME, DATA_KEY)
+);
+
+DROP TABLE IF EXISTS IDN_IDENTITY_META_DATA;
+CREATE TABLE IDN_IDENTITY_META_DATA (
+            USER_NAME VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT -1234,
+            METADATA_TYPE VARCHAR(255) NOT NULL,
+            METADATA VARCHAR(255) NOT NULL,
+            VALID VARCHAR(255) NOT NULL,
+            PRIMARY KEY (TENANT_ID, USER_NAME, METADATA_TYPE,METADATA)
+);
+
+DROP TABLE IF EXISTS IDN_THRIFT_SESSION;
+CREATE TABLE IDN_THRIFT_SESSION (
+            SESSION_ID VARCHAR(255) NOT NULL,
+            USER_NAME VARCHAR(255) NOT NULL,
+            CREATED_TIME VARCHAR(255) NOT NULL,
+            LAST_MODIFIED_TIME VARCHAR(255) NOT NULL,
+            PRIMARY KEY (SESSION_ID)
+);
+
+DROP TABLE IF EXISTS IDN_AUTH_SESSION_STORE;
+CREATE TABLE IDN_AUTH_SESSION_STORE (
+            SESSION_ID VARCHAR(100) NOT NULL,
+            SESSION_TYPE VARCHAR(100) NOT NULL,
+            SESSION_OBJECT BYTEA,
+            TIME_CREATED TIMESTAMP,
+            PRIMARY KEY (SESSION_ID, SESSION_TYPE)
+      );
+
+DROP TABLE IF EXISTS SP_APP;
+DROP SEQUENCE IF EXISTS SP_APP_SEQ;
+CREATE SEQUENCE SP_APP_SEQ;
+CREATE TABLE SP_APP (
+            ID INTEGER DEFAULT NEXTVAL('SP_APP_SEQ'),
+            TENANT_ID INTEGER NOT NULL,
+            APP_NAME VARCHAR (255) NOT NULL ,
+            USER_STORE VARCHAR (255) NOT NULL,
+            USERNAME VARCHAR (255) NOT NULL ,
+            DESCRIPTION VARCHAR (1024),
+                ROLE_CLAIM VARCHAR (512),
+            AUTH_TYPE VARCHAR (255) NOT NULL,
+            PROVISIONING_USERSTORE_DOMAIN VARCHAR (512),
+            IS_LOCAL_CLAIM_DIALECT CHAR(1) DEFAULT '1',
+            IS_SEND_LOCAL_SUBJECT_ID CHAR(1) DEFAULT '0',
+            IS_SEND_AUTH_LIST_OF_IDPS CHAR(1) DEFAULT '0',
+            IS_USE_TENANT_DOMAIN_SUBJECT CHAR(1) DEFAULT '1',
+            IS_USE_USER_DOMAIN_SUBJECT CHAR(1) DEFAULT '1',
+            SUBJECT_CLAIM_URI VARCHAR (512),
+            IS_SAAS_APP CHAR(1) DEFAULT '0',
+            PRIMARY KEY (ID));
+
+ALTER TABLE SP_APP ADD CONSTRAINT APPLICATION_NAME_CONSTRAINT UNIQUE(APP_NAME, TENANT_ID);
+
+DROP TABLE IF EXISTS SP_INBOUND_AUTH;
+DROP SEQUENCE IF EXISTS SP_INBOUND_AUTH_SEQ;
+CREATE SEQUENCE SP_INBOUND_AUTH_SEQ;
+CREATE TABLE SP_INBOUND_AUTH (
+            ID INTEGER DEFAULT NEXTVAL('SP_INBOUND_AUTH_SEQ'),
+            TENANT_ID INTEGER NOT NULL,
+            INBOUND_AUTH_KEY VARCHAR (255) NOT NULL,
+            INBOUND_AUTH_TYPE VARCHAR (255) NOT NULL,
+            PROP_NAME VARCHAR (255),
+            PROP_VALUE VARCHAR (1024) ,
+            APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID));
+
+ALTER TABLE SP_INBOUND_AUTH ADD CONSTRAINT APPLICATION_ID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+DROP TABLE IF EXISTS SP_AUTH_STEP;
+DROP SEQUENCE IF EXISTS SP_AUTH_STEP_SEQ;
+CREATE SEQUENCE SP_AUTH_STEP_SEQ;
+CREATE TABLE SP_AUTH_STEP (
+            ID INTEGER DEFAULT NEXTVAL('SP_AUTH_STEP_SEQ'),
+            TENANT_ID INTEGER NOT NULL,
+            STEP_ORDER INTEGER DEFAULT 1,
+            APP_ID INTEGER NOT NULL,
+            IS_SUBJECT_STEP CHAR(1) DEFAULT '0',
+            IS_ATTRIBUTE_STEP CHAR(1) DEFAULT '0',
+            PRIMARY KEY (ID));
+
+ALTER TABLE SP_AUTH_STEP ADD CONSTRAINT APPLICATION_ID_CONSTRAINT_STEP FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+DROP TABLE IF EXISTS SP_FEDERATED_IDP;
+CREATE TABLE SP_FEDERATED_IDP (
+            ID INTEGER NOT NULL,
+            TENANT_ID INTEGER NOT NULL,
+            AUTHENTICATOR_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID, AUTHENTICATOR_ID));
+
+ALTER TABLE SP_FEDERATED_IDP ADD CONSTRAINT STEP_ID_CONSTRAINT FOREIGN KEY (ID) REFERENCES SP_AUTH_STEP (ID) ON DELETE CASCADE;
+
+DROP TABLE IF EXISTS SP_CLAIM_MAPPING;
+DROP SEQUENCE IF EXISTS SP_CLAIM_MAPPING_SEQ;
+CREATE SEQUENCE SP_CLAIM_MAPPING_SEQ;
+CREATE TABLE SP_CLAIM_MAPPING (
+            ID INTEGER DEFAULT NEXTVAL('SP_CLAIM_MAPPING_SEQ'),
+            TENANT_ID INTEGER NOT NULL,
+            IDP_CLAIM VARCHAR (512) NOT NULL ,
+            SP_CLAIM VARCHAR (512) NOT NULL ,
+                  APP_ID INTEGER NOT NULL,
+            IS_REQUESTED VARCHAR(128) DEFAULT '0',
+            DEFAULT_VALUE VARCHAR(255),
+            PRIMARY KEY (ID));
+
+ALTER TABLE SP_CLAIM_MAPPING ADD CONSTRAINT CLAIMID_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+DROP TABLE IF EXISTS SP_ROLE_MAPPING;
+DROP SEQUENCE IF EXISTS SP_ROLE_MAPPING_SEQ;
+CREATE SEQUENCE SP_ROLE_MAPPING_SEQ;
+CREATE TABLE SP_ROLE_MAPPING (
+            ID INTEGER DEFAULT NEXTVAL('SP_ROLE_MAPPING_SEQ'),
+            TENANT_ID INTEGER NOT NULL,
+            IDP_ROLE VARCHAR (255) NOT NULL ,
+            SP_ROLE VARCHAR (255) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID));
+
+ALTER TABLE SP_ROLE_MAPPING ADD CONSTRAINT ROLEID_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+DROP TABLE IF EXISTS SP_REQ_PATH_AUTH;
+DROP SEQUENCE IF EXISTS SP_REQ_PATH_AUTH_SEQ;
+CREATE SEQUENCE SP_REQ_PATH_AUTH_SEQ;
+CREATE TABLE SP_REQ_PATH_AUTHENTICATOR (
+            ID INTEGER DEFAULT NEXTVAL('SP_REQ_PATH_AUTH_SEQ'),
+            TENANT_ID INTEGER NOT NULL,
+            AUTHENTICATOR_NAME VARCHAR (255) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            PRIMARY KEY (ID));
+
+ALTER TABLE SP_REQ_PATH_AUTHENTICATOR ADD CONSTRAINT REQ_AUTH_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+DROP TABLE IF EXISTS SP_PROV_CONNECTOR;
+DROP SEQUENCE IF EXISTS SP_PROV_CONNECTOR_SEQ;
+CREATE SEQUENCE SP_PROV_CONNECTOR_SEQ;
+CREATE TABLE SP_PROVISIONING_CONNECTOR (
+            ID INTEGER DEFAULT NEXTVAL('SP_PROV_CONNECTOR_SEQ'),
+            TENANT_ID INTEGER NOT NULL,
+            IDP_NAME VARCHAR (255) NOT NULL ,
+            CONNECTOR_NAME VARCHAR (255) NOT NULL ,
+            APP_ID INTEGER NOT NULL,
+            IS_JIT_ENABLED CHAR(1) NOT NULL DEFAULT '0',
+            BLOCKING CHAR(1) NOT NULL DEFAULT '0',
+            PRIMARY KEY (ID));
+
+ALTER TABLE SP_PROVISIONING_CONNECTOR ADD CONSTRAINT PRO_CONNECTOR_APPID_CONSTRAINT FOREIGN KEY (APP_ID) REFERENCES SP_APP (ID) ON DELETE CASCADE;
+
+DROP TABLE IF EXISTS IDP;
+DROP SEQUENCE IF EXISTS IDP_SEQ;
+CREATE SEQUENCE IDP_SEQ;
+CREATE TABLE IDP (
+                  ID INTEGER DEFAULT NEXTVAL('IDP_SEQ'),
+                  TENANT_ID INTEGER,
+                  NAME VARCHAR(254) NOT NULL,
+                  IS_ENABLED CHAR(1) NOT NULL DEFAULT '1',
+                  IS_PRIMARY CHAR(1) NOT NULL DEFAULT '0',
+                  HOME_REALM_ID VARCHAR(254),
+                  IMAGE BYTEA,
+                  CERTIFICATE BYTEA,
+                  ALIAS VARCHAR(254),
+                  INBOUND_PROV_ENABLED CHAR (1) NOT NULL DEFAULT '0',
+                  INBOUND_PROV_USER_STORE_ID VARCHAR(254),
+                  USER_CLAIM_URI VARCHAR(254),
+                  ROLE_CLAIM_URI VARCHAR(254),
+                  DESCRIPTION VARCHAR (1024),
+                  DEFAULT_AUTHENTICATOR_NAME VARCHAR(254),
+                  DEFAULT_PRO_CONNECTOR_NAME VARCHAR(254),
+                  PROVISIONING_ROLE VARCHAR(128),
+                  IS_FEDERATION_HUB CHAR(1) NOT NULL DEFAULT '0',
+                  IS_LOCAL_CLAIM_DIALECT CHAR(1) NOT NULL DEFAULT '0',
+                      DISPLAY_NAME VARCHAR(255),
+                  PRIMARY KEY (ID),
+                  UNIQUE (TENANT_ID, NAME));
+
+INSERT INTO IDP (TENANT_ID, NAME, HOME_REALM_ID) VALUES (-1234, 'LOCAL', 'localhost');
+
+DROP TABLE IF EXISTS IDP_ROLE;
+DROP SEQUENCE IF EXISTS IDP_ROLE_SEQ;
+CREATE SEQUENCE IDP_ROLE_SEQ;
+CREATE TABLE IDP_ROLE (
+                  ID INTEGER DEFAULT NEXTVAL('IDP_ROLE_SEQ'),
+                  IDP_ID INTEGER,
+                  TENANT_ID INTEGER,
+                  ROLE VARCHAR(254),
+                  PRIMARY KEY (ID),
+                  UNIQUE (IDP_ID, ROLE),
+                  FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE);
+
+DROP TABLE IF EXISTS IDP_ROLE_MAPPING;
+DROP SEQUENCE IF EXISTS IDP_ROLE_MAPPING_SEQ;
+CREATE SEQUENCE IDP_ROLE_MAPPING_SEQ;
+CREATE TABLE IDP_ROLE_MAPPING (
+                  ID INTEGER DEFAULT NEXTVAL('IDP_ROLE_MAPPING_SEQ'),
+                  IDP_ROLE_ID INTEGER,
+                  TENANT_ID INTEGER,
+                  USER_STORE_ID VARCHAR (253),
+                  LOCAL_ROLE VARCHAR(253),
+                  PRIMARY KEY (ID),
+                  UNIQUE (IDP_ROLE_ID, TENANT_ID, USER_STORE_ID, LOCAL_ROLE),
+                  FOREIGN KEY (IDP_ROLE_ID) REFERENCES IDP_ROLE(ID) ON DELETE CASCADE);
+
+DROP TABLE IF EXISTS IDP_CLAIM;
+DROP SEQUENCE IF EXISTS IDP_CLAIM_SEQ;
+CREATE SEQUENCE IDP_CLAIM_SEQ;
+CREATE TABLE IDP_CLAIM (
+                  ID INTEGER DEFAULT NEXTVAL('IDP_CLAIM_SEQ'),
+                  IDP_ID INTEGER,
+                  TENANT_ID INTEGER,
+                  CLAIM VARCHAR(254),
+                  PRIMARY KEY (ID),
+                  UNIQUE (IDP_ID, CLAIM),
+                  FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE);
+
+DROP TABLE IF EXISTS IDP_CLAIM_MAPPING;
+DROP SEQUENCE IF EXISTS IDP_CLAIM_MAPPING_SEQ;
+CREATE SEQUENCE IDP_CLAIM_MAPPING_SEQ;
+CREATE TABLE IDP_CLAIM_MAPPING (
+                  ID INTEGER DEFAULT NEXTVAL('IDP_CLAIM_MAPPING_SEQ'),
+                  IDP_CLAIM_ID INTEGER,
+                  TENANT_ID INTEGER,
+                  LOCAL_CLAIM VARCHAR(253),
+                DEFAULT_VALUE VARCHAR(255),
+            IS_REQUESTED VARCHAR(128) DEFAULT '0',
+                  PRIMARY KEY (ID),
+                  UNIQUE (IDP_CLAIM_ID, TENANT_ID, LOCAL_CLAIM),
+                  FOREIGN KEY (IDP_CLAIM_ID) REFERENCES IDP_CLAIM(ID) ON DELETE CASCADE);
+
+DROP TABLE IF EXISTS IDP_AUTHENTICATOR;
+DROP SEQUENCE IF EXISTS IDP_AUTHENTICATOR_SEQ;
+CREATE SEQUENCE IDP_AUTHENTICATOR_SEQ;
+CREATE TABLE IDP_AUTHENTICATOR (
+            ID INTEGER DEFAULT NEXTVAL('IDP_AUTHENTICATOR_SEQ'),
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            NAME VARCHAR(255) NOT NULL,
+            IS_ENABLED CHAR (1) DEFAULT '1',
+            DISPLAY_NAME VARCHAR(255),
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, NAME),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE);
+
+INSERT INTO IDP_AUTHENTICATOR (TENANT_ID, IDP_ID, NAME) VALUES (-1234, 1, 'samlsso');
+INSERT INTO IDP_AUTHENTICATOR (TENANT_ID, IDP_ID, NAME) VALUES (-1234, 1, 'IDPProperties');
+
+DROP TABLE IF EXISTS IDP_AUTHENTICATOR_PROP;
+DROP SEQUENCE IF EXISTS IDP_AUTHENTICATOR_PROP_SEQ;
+CREATE SEQUENCE IDP_AUTHENTICATOR_PROP_SEQ;
+CREATE TABLE IDP_AUTHENTICATOR_PROPERTY (
+            ID INTEGER DEFAULT NEXTVAL('IDP_AUTHENTICATOR_PROP_SEQ'),
+            TENANT_ID INTEGER,
+            AUTHENTICATOR_ID INTEGER,
+            PROPERTY_KEY VARCHAR(255) NOT NULL,
+            PROPERTY_VALUE VARCHAR(2047),
+            IS_SECRET CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, AUTHENTICATOR_ID, PROPERTY_KEY),
+            FOREIGN KEY (AUTHENTICATOR_ID) REFERENCES IDP_AUTHENTICATOR(ID) ON DELETE CASCADE);
+
+INSERT INTO  IDP_AUTHENTICATOR_PROPERTY (TENANT_ID, AUTHENTICATOR_ID, PROPERTY_KEY,PROPERTY_VALUE, IS_SECRET ) VALUES (-1234, 1 , 'IdPEntityId', 'localhost', '0');
+
+DROP TABLE IF EXISTS IDP_PROV_CONFIG;
+DROP SEQUENCE IF EXISTS IDP_PROV_CONFIG_SEQ;
+CREATE SEQUENCE IDP_PROV_CONFIG_SEQ;
+CREATE TABLE IDP_PROVISIONING_CONFIG (
+            ID INTEGER DEFAULT NEXTVAL('IDP_PROV_CONFIG_SEQ'),
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            PROVISIONING_CONNECTOR_TYPE VARCHAR(255) NOT NULL,
+            IS_ENABLED CHAR (1) DEFAULT '0',
+            IS_BLOCKING CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, PROVISIONING_CONNECTOR_TYPE),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE);
+
+DROP TABLE IF EXISTS IDP_PROV_CONFIG_PROP;
+DROP SEQUENCE IF EXISTS IDP_PROV_CONFIG_PROP_SEQ;
+CREATE SEQUENCE IDP_PROV_CONFIG_PROP_SEQ;
+CREATE TABLE IDP_PROV_CONFIG_PROPERTY (
+            ID INTEGER DEFAULT NEXTVAL('IDP_PROV_CONFIG_PROP_SEQ'),
+            TENANT_ID INTEGER,
+            PROVISIONING_CONFIG_ID INTEGER,
+            PROPERTY_KEY VARCHAR(255) NOT NULL,
+            PROPERTY_VALUE VARCHAR(2048),
+            PROPERTY_BLOB_VALUE BYTEA,
+            PROPERTY_TYPE CHAR(32) NOT NULL,
+            IS_SECRET CHAR (1) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, PROVISIONING_CONFIG_ID, PROPERTY_KEY),
+            FOREIGN KEY (PROVISIONING_CONFIG_ID) REFERENCES IDP_PROVISIONING_CONFIG(ID) ON DELETE CASCADE);
+
+DROP TABLE IF EXISTS IDP_PROV_ENTITY;
+DROP SEQUENCE IF EXISTS IDP_PROV_ENTITY_SEQ;
+CREATE SEQUENCE IDP_PROV_ENTITY_SEQ;
+CREATE TABLE IDP_PROVISIONING_ENTITY (
+            ID INTEGER DEFAULT NEXTVAL('IDP_PROV_ENTITY_SEQ'),
+            PROVISIONING_CONFIG_ID INTEGER,
+            ENTITY_TYPE VARCHAR(255) NOT NULL,
+            ENTITY_LOCAL_USERSTORE VARCHAR(255) NOT NULL,
+            ENTITY_NAME VARCHAR(255) NOT NULL,
+            ENTITY_VALUE VARCHAR(255),
+            TENANT_ID INTEGER,
+            PRIMARY KEY (ID),
+            UNIQUE (ENTITY_TYPE, TENANT_ID, ENTITY_LOCAL_USERSTORE, ENTITY_NAME, PROVISIONING_CONFIG_ID),
+            UNIQUE (PROVISIONING_CONFIG_ID, ENTITY_TYPE, ENTITY_VALUE),
+            FOREIGN KEY (PROVISIONING_CONFIG_ID) REFERENCES IDP_PROVISIONING_CONFIG(ID) ON DELETE CASCADE);
+
+DROP TABLE IF EXISTS IDP_LOCAL_CLAIM;
+DROP SEQUENCE IF EXISTS IDP_LOCAL_CLAIM_SEQ;
+CREATE SEQUENCE IDP_LOCAL_CLAIM_SEQ;
+CREATE TABLE IF NOT EXISTS IDP_LOCAL_CLAIM(
+            ID INTEGER DEFAULT NEXTVAL('IDP_LOCAL_CLAIM_SEQ'),
+            TENANT_ID INTEGER,
+            IDP_ID INTEGER,
+            CLAIM_URI VARCHAR(255) NOT NULL,
+            DEFAULT_VALUE VARCHAR(255),
+              IS_REQUESTED VARCHAR(128) DEFAULT '0',
+            PRIMARY KEY (ID),
+            UNIQUE (TENANT_ID, IDP_ID, CLAIM_URI),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE);
+
+DROP TABLE IF EXISTS IDN_ASSOCIATED_ID;
+DROP SEQUENCE IF EXISTS IDN_ASSOCIATED_ID_SEQ;
+CREATE SEQUENCE IDN_ASSOCIATED_ID_SEQ;
+CREATE TABLE IDN_ASSOCIATED_ID (
+            ID INTEGER DEFAULT NEXTVAL('IDN_ASSOCIATED_ID_SEQ'),
+          IDP_USER_ID VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER DEFAULT -1234,
+          IDP_ID INTEGER NOT NULL,
+            DOMAIN_NAME VARCHAR(255) NOT NULL,
+          USER_NAME VARCHAR(255) NOT NULL,
+          PRIMARY KEY (ID),
+            UNIQUE(IDP_USER_ID, TENANT_ID, IDP_ID),
+            FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE
+);
+
+DROP TABLE IF EXISTS IDN_USER_ACCOUNT_ASSOCIATION;
+CREATE TABLE IDN_USER_ACCOUNT_ASSOCIATION (
+            ASSOCIATION_KEY VARCHAR(255) NOT NULL,
+            TENANT_ID INTEGER,
+            DOMAIN_NAME VARCHAR(255) NOT NULL,
+            USER_NAME VARCHAR(255) NOT NULL,
+            PRIMARY KEY (TENANT_ID, DOMAIN_NAME, USER_NAME));
+
+DROP TABLE IF EXISTS FIDO_DEVICE_STORE;
+CREATE TABLE FIDO_DEVICE_STORE (
+        TENANT_ID INTEGER,
+        DOMAIN_NAME VARCHAR(255) NOT NULL,
+        USER_NAME VARCHAR(45) NOT NULL,
+      TIME_REGISTERED TIMESTAMP,
+        KEY_HANDLE VARCHAR(200) NOT NULL,
+        DEVICE_DATA VARCHAR(2048) NOT NULL,
+      PRIMARY KEY (TENANT_ID, DOMAIN_NAME, USER_NAME, KEY_HANDLE));
+
+DROP TABLE IF EXISTS WF_REQUEST;
+CREATE TABLE WF_REQUEST (
+    UUID VARCHAR (45),
+    CREATED_BY VARCHAR (255),
+    TENANT_ID INTEGER DEFAULT -1,
+    OPERATION_TYPE VARCHAR (50),
+    CREATED_AT TIMESTAMP,
+    UPDATED_AT TIMESTAMP,
+    STATUS VARCHAR (30),
+    REQUEST BYTEA,
+    PRIMARY KEY (UUID)
+);
+
+DROP TABLE IF EXISTS WF_BPS_PROFILE;
+CREATE TABLE WF_BPS_PROFILE (
+    PROFILE_NAME VARCHAR(45),
+    HOST_URL VARCHAR(45),
+    USERNAME VARCHAR(45),
+    PASSWORD VARCHAR(255),
+    CALLBACK_HOST VARCHAR (45),
+    CALLBACK_USERNAME VARCHAR (45),
+    CALLBACK_PASSWORD VARCHAR (255),
+    TENANT_ID VARCHAR (45),
+    PRIMARY KEY (PROFILE_NAME, TENANT_ID)
+);
+
+DROP TABLE IF EXISTS WF_WORKFLOW;
+CREATE TABLE WF_WORKFLOW(
+    ID VARCHAR (45),
+    WF_NAME VARCHAR (45),
+    DESCRIPTION VARCHAR (255),
+    TEMPLATE_ID VARCHAR (45),
+    IMPL_ID VARCHAR (45),
+    TENANT_ID VARCHAR (45),
+    PRIMARY KEY (ID)
+);
+
+DROP TABLE IF EXISTS WF_WORKFLOW_ASSOCIATION;
+DROP SEQUENCE IF EXISTS WF_WORKFLOW_ASSOCIATION_PK_SEQ;
+CREATE SEQUENCE WF_WORKFLOW_ASSOCIATION_PK_SEQ;
+CREATE TABLE WF_WORKFLOW_ASSOCIATION(
+    ID INTEGER DEFAULT NEXTVAL('WF_WORKFLOW_ASSOCIATION_PK_SEQ'),
+    ASSOC_NAME VARCHAR (45),
+    EVENT_ID VARCHAR(45),
+    ASSOC_CONDITION VARCHAR (2000),
+    WORKFLOW_ID VARCHAR (45),
+    IS_ENABLED CHAR (1) DEFAULT '1',
+    PRIMARY KEY(ID),
+    FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE
+);
+
+DROP TABLE IF EXISTS WF_WORKFLOW_CONFIG_PARAM;
+CREATE TABLE WF_WORKFLOW_CONFIG_PARAM(
+    WORKFLOW_ID VARCHAR (45),
+    PARAM_NAME VARCHAR (45),
+    PARAM_VALUE VARCHAR (1000),
+    PRIMARY KEY (WORKFLOW_ID, PARAM_NAME),
+    FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE
+);
+
+DROP TABLE IF EXISTS WF_REQUEST_ENTITY_RELATIONSHIP;
+CREATE TABLE WF_REQUEST_ENTITY_RELATIONSHIP(
+  REQUEST_ID VARCHAR (45),
+  ENTITY_NAME VARCHAR (255),
+  ENTITY_TYPE VARCHAR (50),
+  TENANT_ID INTEGER DEFAULT -1,
+  PRIMARY KEY(REQUEST_ID, ENTITY_NAME, ENTITY_TYPE, TENANT_ID),
+  FOREIGN KEY (REQUEST_ID) REFERENCES WF_REQUEST(UUID)ON DELETE CASCADE
+);
+
+DROP TABLE IF EXISTS WORKFLOW_REQUEST_RELATION;
+CREATE TABLE WORKFLOW_REQUEST_RELATION(
+  RELATIONSHIP_ID VARCHAR (45),
+  WORKFLOW_ID VARCHAR (45),
+  REQUEST_ID VARCHAR (45),
+  UPDATED_AT TIMESTAMP,
+  STATUS VARCHAR (30),
+  PRIMARY KEY (RELATIONSHIP_ID),
+  FOREIGN KEY (WORKFLOW_ID) REFERENCES WF_WORKFLOW(ID)ON DELETE CASCADE,
+  FOREIGN KEY (REQUEST_ID) REFERENCES WF_REQUEST(UUID)ON DELETE CASCADE
+);
+
+-- End of IDENTITY Tables--
+
+CREATE SEQUENCE AM_SUBSCRIBER_SEQUENCE START WITH 1 INCREMENT BY 1;
+CREATE TABLE AM_SUBSCRIBER (
+    SUBSCRIBER_ID INTEGER DEFAULT nextval('am_subscriber_sequence'),
+    USER_ID VARCHAR(255) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    EMAIL_ADDRESS VARCHAR(256) NULL,
+    DATE_SUBSCRIBED DATE NOT NULL,
+    CREATED_BY VARCHAR(100),
+    CREATED_TIME DATE,
+    UPDATED_BY VARCHAR(100),
+    UPDATED_TIME DATE,
+    PRIMARY KEY (SUBSCRIBER_ID),
+    UNIQUE (TENANT_ID,USER_ID)
+)
+;
+
+CREATE SEQUENCE AM_APPLICATION_SEQUENCE START WITH 1 INCREMENT BY 1 ;
+CREATE TABLE AM_APPLICATION (
+    APPLICATION_ID INTEGER DEFAULT nextval('am_application_sequence'),
+    NAME VARCHAR(100),
+    SUBSCRIBER_ID INTEGER,
+    APPLICATION_TIER VARCHAR(50) DEFAULT 'Unlimited',
+    CALLBACK_URL VARCHAR(512),
+    DESCRIPTION VARCHAR(512),
+	APPLICATION_STATUS VARCHAR(50) DEFAULT 'APPROVED',
+    GROUP_ID VARCHAR(100),
+    CREATED_BY VARCHAR(100),
+    CREATED_TIME DATE,
+    UPDATED_BY VARCHAR(100),
+    UPDATED_TIME DATE,
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY(APPLICATION_ID),
+    UNIQUE (NAME,SUBSCRIBER_ID)
+)
+;
+
+CREATE SEQUENCE AM_API_SEQUENCE START WITH 1 INCREMENT BY 1;
+CREATE TABLE AM_API (
+    API_ID INTEGER DEFAULT nextval('am_api_sequence'),
+    API_PROVIDER VARCHAR(256),
+    API_NAME VARCHAR(256),
+    API_VERSION VARCHAR(30),
+    CONTEXT VARCHAR(256),
+    CONTEXT_TEMPLATE VARCHAR(256),
+    CREATED_BY VARCHAR(100),
+    CREATED_TIME DATE,
+    UPDATED_BY VARCHAR(100),
+    UPDATED_TIME DATE,
+    PRIMARY KEY(API_ID),
+    UNIQUE (API_PROVIDER,API_NAME,API_VERSION)
+)
+;
+
+CREATE SEQUENCE AM_API_URL_MAPPING_SEQUENCE START WITH 1 INCREMENT BY 1;
+CREATE TABLE AM_API_URL_MAPPING (
+    URL_MAPPING_ID INTEGER DEFAULT nextval('am_api_url_mapping_sequence'),
+    API_ID INTEGER NOT NULL,
+    HTTP_METHOD VARCHAR(20) NULL,
+    AUTH_SCHEME VARCHAR(50) NULL,
+    URL_PATTERN VARCHAR(512) NULL,
+    THROTTLING_TIER varchar(512) DEFAULT NULL,
+    MEDIATION_SCRIPT BYTEA,
+    PRIMARY KEY(URL_MAPPING_ID)
+)
+;
+
+CREATE SEQUENCE AM_SUBSCRIPTION_SEQUENCE START WITH 1 INCREMENT BY 1;
+CREATE TABLE AM_SUBSCRIPTION (
+    SUBSCRIPTION_ID INTEGER DEFAULT nextval('am_subscription_sequence'),
+    TIER_ID VARCHAR(50),
+    API_ID INTEGER,
+    LAST_ACCESSED DATE NULL,
+    APPLICATION_ID INTEGER,
+    SUB_STATUS VARCHAR(50),
+    SUBS_CREATE_STATE VARCHAR(50) DEFAULT 'SUBSCRIBE',
+    CREATED_BY VARCHAR(100),
+    CREATED_TIME DATE,
+    UPDATED_BY VARCHAR(100),
+    UPDATED_TIME DATE,
+    FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY (SUBSCRIPTION_ID)
+)
+;
+
+CREATE TABLE AM_SUBSCRIPTION_KEY_MAPPING (
+    SUBSCRIPTION_ID INTEGER,
+    ACCESS_TOKEN VARCHAR(512),
+    KEY_TYPE VARCHAR(512) NOT NULL,
+    FOREIGN KEY(SUBSCRIPTION_ID) REFERENCES AM_SUBSCRIPTION(SUBSCRIPTION_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY(SUBSCRIPTION_ID,ACCESS_TOKEN)
+)
+;
+
+CREATE TABLE AM_APPLICATION_KEY_MAPPING (
+    APPLICATION_ID INTEGER,
+    CONSUMER_KEY VARCHAR(512),
+    KEY_TYPE VARCHAR(512) NOT NULL,
+    CREATE_MODE VARCHAR(30) DEFAULT 'CREATED',
+    STATE VARCHAR(30),
+    FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY(APPLICATION_ID,KEY_TYPE)
+)
+;
+
+CREATE SEQUENCE AM_APPLICATION_REGISTRATION_SEQUENCE START WITH 1 INCREMENT BY 1;
+CREATE TABLE IF NOT EXISTS AM_APPLICATION_REGISTRATION (
+    REG_ID INTEGER DEFAULT nextval('am_application_registration_sequence'),
+    SUBSCRIBER_ID INT,
+    WF_REF VARCHAR(255) NOT NULL,
+    APP_ID INT,
+    TOKEN_TYPE VARCHAR(30),
+    TOKEN_SCOPE VARCHAR(256) DEFAULT 'default',
+    INPUTS VARCHAR(1000),
+    ALLOWED_DOMAINS VARCHAR(256),
+    VALIDITY_PERIOD BIGINT,
+    UNIQUE (SUBSCRIBER_ID,APP_ID,TOKEN_TYPE),
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    FOREIGN KEY(APP_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY (REG_ID)
+)
+;
+
+
+
+CREATE SEQUENCE AM_API_LC_EVENT_SEQUENCE START WITH 1 INCREMENT BY 1;
+CREATE TABLE AM_API_LC_EVENT (
+    EVENT_ID INTEGER DEFAULT nextval('am_api_lc_event_sequence'),
+    API_ID INTEGER NOT NULL,
+    PREVIOUS_STATE VARCHAR(50),
+    NEW_STATE VARCHAR(50) NOT NULL,
+    USER_ID VARCHAR(255) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    EVENT_DATE DATE NOT NULL,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY (EVENT_ID)
+)
+;
+
+CREATE TABLE AM_APP_KEY_DOMAIN_MAPPING (
+   CONSUMER_KEY VARCHAR(255),
+   AUTHZ_DOMAIN VARCHAR(255) DEFAULT 'ALL',
+   PRIMARY KEY (CONSUMER_KEY,AUTHZ_DOMAIN)
+)
+;
+
+CREATE SEQUENCE AM_API_COMMENTS_SEQUENCE START WITH 1 INCREMENT BY 1;
+CREATE TABLE AM_API_COMMENTS (
+    COMMENT_ID INTEGER DEFAULT nextval('am_api_comments_sequence'),
+    COMMENT_TEXT VARCHAR(512),
+    COMMENTED_USER VARCHAR(255),
+    DATE_COMMENTED DATE NOT NULL,
+    API_ID INTEGER NOT NULL,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY (COMMENT_ID)
+)
+;
+
+CREATE SEQUENCE AM_WORKFLOWS_SEQUENCE START WITH 1 INCREMENT BY 1;
+CREATE TABLE AM_WORKFLOWS(
+    WF_ID INTEGER DEFAULT nextval('am_workflows_sequence'),
+    WF_REFERENCE VARCHAR(255) NOT NULL,
+    WF_TYPE VARCHAR(255) NOT NULL,
+    WF_STATUS VARCHAR(255) NOT NULL,
+    WF_CREATED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    WF_UPDATED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP ,
+    WF_STATUS_DESC VARCHAR(1000),
+    TENANT_ID INTEGER,
+    TENANT_DOMAIN VARCHAR(255),
+    WF_EXTERNAL_REFERENCE VARCHAR(255) NOT NULL,
+    PRIMARY KEY (WF_ID),
+    UNIQUE (WF_EXTERNAL_REFERENCE)
+)
+;
+
+CREATE SEQUENCE AM_API_RATINGS_SEQUENCE START WITH 1 INCREMENT BY 1;
+CREATE TABLE AM_API_RATINGS (
+    RATING_ID INTEGER DEFAULT nextval('am_api_ratings_sequence'),
+    API_ID INTEGER,
+    RATING INTEGER,
+    SUBSCRIBER_ID INTEGER,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY (RATING_ID)
+)
+;
+
+CREATE SEQUENCE AM_TIER_PERMISSIONS_SEQUENCE START WITH 1 INCREMENT BY 1;
+CREATE TABLE AM_TIER_PERMISSIONS (
+    TIER_PERMISSIONS_ID INTEGER DEFAULT nextval('am_tier_permissions_sequence'),
+    TIER VARCHAR(50) NOT NULL,
+    PERMISSIONS_TYPE VARCHAR(50) NOT NULL,
+    ROLES VARCHAR(512) NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    PRIMARY KEY(TIER_PERMISSIONS_ID)
+);
+
+CREATE SEQUENCE AM_EXTERNAL_STORES_SEQUENCE START WITH 1 INCREMENT BY 1;
+CREATE TABLE AM_EXTERNAL_STORES (
+    APISTORE_ID INTEGER DEFAULT nextval('am_external_stores_sequence'),
+    API_ID INTEGER,
+    STORE_ID VARCHAR(255) NOT NULL,
+    STORE_DISPLAY_NAME VARCHAR(255) NOT NULL,
+    STORE_ENDPOINT VARCHAR(255) NOT NULL,
+    STORE_TYPE VARCHAR(255) NOT NULL,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    PRIMARY KEY (APISTORE_ID)
+)
+;
+
+DROP TABLE IF EXISTS AM_API_SCOPES;
+CREATE TABLE IF NOT EXISTS AM_API_SCOPES (
+   API_ID  INTEGER NOT NULL,
+   SCOPE_ID  INTEGER NOT NULL,
+   FOREIGN KEY (API_ID) REFERENCES AM_API (API_ID) ON DELETE CASCADE  ON UPDATE CASCADE,
+   FOREIGN KEY (SCOPE_ID) REFERENCES IDN_OAUTH2_SCOPE (SCOPE_ID) ON DELETE CASCADE ON UPDATE CASCADE
+);
+
+DROP TABLE IF EXISTS AM_API_DEFAULT_VERSION;
+DROP SEQUENCE IF EXISTS AM_API_DEFAULT_VERSION_PK_SEQ;
+CREATE SEQUENCE AM_API_DEFAULT_VERSION_PK_SEQ;
+CREATE TABLE AM_API_DEFAULT_VERSION (
+            DEFAULT_VERSION_ID INTEGER DEFAULT NEXTVAL('am_api_default_version_pk_seq'), 
+            API_NAME VARCHAR(256) NOT NULL ,
+            API_PROVIDER VARCHAR(256) NOT NULL , 
+            DEFAULT_API_VERSION VARCHAR(30) , 
+            PUBLISHED_DEFAULT_API_VERSION VARCHAR(30) ,
+            PRIMARY KEY (DEFAULT_VERSION_ID)
+);
+
+
+CREATE INDEX IDX_SUB_APP_ID ON AM_SUBSCRIPTION (APPLICATION_ID, SUBSCRIPTION_ID)
+;
+commit;
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 07167f2c..e78af55e 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -23,6 +23,7 @@
                 <!--<exclude>**/master-datasources.xml</exclude>-->
                 <exclude>**/carbon.xml</exclude>
                 <exclude>**/registry.xml</exclude>
+                <exclude>**/identity.xml</exclude>
                 <exclude>**/client-truststore.jks</exclude>
                 <exclude>**/wso2carbon.jks</exclude>
                 <exclude>**/WSO2AM_DB.h2.db</exclude>
@@ -46,6 +47,40 @@
                 <exclude>**/cipher-text.properties</exclude>
                 <exclude>**/cipher-tool.properties</exclude>
                 <exclude>**/lib/org.wso2.ciphertool-1.0.0-wso2v3.jar</exclude>
+
+                <!-- Remove multiple versions of same jar for 1.10.x-->
+                <exclude>**/repository/components/plugins/js_1.6.0.R7-wso2v1.jar</exclude>
+                <exclude>**/repository/components/plugins/json_1.0.0.wso2v1.jar</exclude>
+                <exclude>**/repository/components/plugins/wss4j_1.5.11.wso2v9.jar</exclude>
+                <exclude>**/repository/components/plugins/nimbus-jose-jwt_2.26.1.wso2v2.jar</exclude>
+                <exclude>**/repository/components/plugins/net.minidev.json-smart_1.2.0.jar</exclude>
+                <!--<exclude>**/repository/components/plugins/wss4j_1.5.11.wso2v10.jar</exclude>-->
+                <exclude>**/repository/components/plugins/rampart-trust_1.6.1.wso2v14.jar</exclude>
+                <exclude>**/repository/components/plugins/rampart-policy_1.6.1.wso2v14.jar</exclude>
+                <exclude>**/repository/components/plugins/rampart-core_1.6.1.wso2v14.jar</exclude>
+                <exclude>**/repository/components/plugins/commons-io_2.0.0.wso2v2.jar</exclude>
+                <exclude>**/repository/components/plugins/com.google.gson_2.1.0.jar</exclude>
+                <exclude>**/repository/components/plugins/com.google.gson_2.2.4.jar</exclude>
+                <!--<exclude>**/repository/components/plugins/org.wso2.carbon.captcha.mgt_4.2.0.jar</exclude>-->
+                <exclude>**/repository/components/plugins/guava_12.0.0.wso2v1.jar</exclude>
+                <exclude>**/repository/components/plugins/wadl-core_1.1.3.wso2v2.jar</exclude>
+                <!--<exclude>**/repository/components/plugins/waffle_1.4.0.wso2v1.jar</exclude>-->
+                <!--<exclude>**/repository/components/plugins/compass_2.0.1.wso2v2.jar</exclude>-->
+                <!--<exclude>**/repository/components/plugins/poi_3.9.0.wso2v1.jar</exclude>-->
+
+                <exclude>**/lib/endorsed/xalan*.jar</exclude>
+                <exclude>**/lib/endorsed/xercesImpl*.jar</exclude>
+                <exclude>**/lib/endorsed/xml-apis*.jar</exclude>
+                <exclude>**/conf/thrift-authentication.xml</exclude>
+                <exclude>**/repository/components/features/org.wso2.carbon.apimgt.store_${apim.feature.version}/store/**</exclude>
+                <exclude>**/repository/components/features/org.wso2.carbon.apimgt.store_${apim.feature.version}/admin-dashboard/**</exclude>
+                <exclude>**/repository/components/features/org.wso2.carbon.apimgt.store_${apim.feature.version}/workflow-admin/**</exclude>
+                <exclude>**/repository/components/features/org.wso2.carbon.apimgt.publisher_${apim.feature.version}/publisher/**</exclude>
+                <exclude>**/repository/components/features/org.wso2.carbon.apimgt.core_${apim.feature.version}/libs/**</exclude>
+
+                <exclude>**/repository/components/plugins/asm-all_4.1.0.wso2v1.jar</exclude>
+
+
             </excludes>
         </fileSet>
 
@@ -89,6 +124,28 @@
             </excludes>
             <!--============ Added with ES Features ===============-->
         </fileSet>
+
+        <fileSet>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.platform.version}/repository/conf/identity/</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
+            <includes>
+                <include>**/identity.xml</include>
+                <include>**/entitlement.properties</include>
+            </includes>
+        </fileSet>
+
+
+        <!-- Start API Manager related -->
+        <fileSet>
+            <directory>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.platform.version}/dbscripts/identity/application-mgt/
+            </directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/identity/application-mgt</outputDirectory>
+            <includes>
+                <include>**/**.sql</include>
+            </includes>
+        </fileSet>
+
         <fileSet>
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
@@ -161,7 +218,6 @@
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security/</outputDirectory>
             <includes>
-                <include>**/entitlement.properties</include>
                 <include>**/trusted-idp-config.xml</include>
                 <!--============ Added with ES Features ===============-->
                 <include>**/cipher-text.properties</include>
@@ -170,25 +226,8 @@
                 <!--============ Added with ES Features ===============-->
             </includes>
         </fileSet>
-        <fileSet>
-            <directory>
-                src/repository/conf/identity/
-            </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory>
-            <includes>
-                <include>**/**</include>
-            </includes>
-        </fileSet>
-        <!-- Moved to distribution pom to copy before install samples-->
-        <!--<fileSet>-->
-            <!--<directory>src/repository/conf/datasources</directory>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources-->
-            <!--</outputDirectory>-->
-            <!--<includes>-->
-                <!--<include>**/master-datasources.xml</include>-->
-                <!--<include>**/cdm-datasources.xml</include>-->
-            <!--</includes>-->
-        <!--</fileSet>-->
+
+
         <fileSet>
             <directory>src/repository/resources</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources</outputDirectory>
@@ -196,13 +235,6 @@
                 <include>*/**</include>
             </includes>
         </fileSet>
-        <!--data-bridge configuration-->
-        <!--<fileSet>-->
-            <!--<directory>src/repository/conf/data-bridge</directory>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge-->
-            <!--</outputDirectory>-->
-            <!--<fileMode>755</fileMode>-->
-        <!--</fileSet>-->
         <fileSet>
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider
@@ -235,6 +267,16 @@
             </includes>
         </fileSet>
 
+        <fileSet>
+            <directory>
+                src/api-resource/resources/sql/
+            </directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/apimgt</outputDirectory>
+            <includes>
+                <include>**/**.sql</include>
+            </includes>
+        </fileSet>
+
         <!--Copying modules-->
         <fileSet>
             <directory>
@@ -275,18 +317,6 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources
             </outputDirectory>
         </fileSet>
-
-
-        <!-- Copying Mobile plugin management related dbscripts -->
-        <!--<fileSet>-->
-            <!--<directory>-->
-                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.mobile.device.mgt.version}/dbscripts/cdm/plugins-->
-            <!--</directory>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/cdm/plugins</outputDirectory>-->
-            <!--<includes>-->
-                <!--<include>*/**</include>-->
-            <!--</includes>-->
-        <!--</fileSet>-->
         <fileSet>
             <directory>src/statistics/carbonapps/</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps
@@ -294,24 +324,6 @@
             <fileMode>755</fileMode>
         </fileSet>
 
-        <!-- Copying MDM Jaggery app -->
-        <!--fileSet>
-            <directory>src/repository/jaggeryapps/</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps
-            </outputDirectory>
-            <fileMode>755</fileMode>
-        </fileSet-->
-    	<!-- Copying Device Cloud webapp -->
-    	<!--<fileSet>-->
-            <!--<directory>src/repository/webapps/</directory>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps-->
-            <!--</outputDirectory>-->
-        <!--</fileSet>-->
-
-        <!--========================================================================================================-->
-        <!-- Enterprise Store Features -->
-
-        <!--============ Added with ES Features ===============-->
         <fileSet>
             <directory>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps
@@ -391,34 +403,7 @@
                 <include>**/**</include>
             </includes>
         </fileSet>
-        <!--============ Added with ES Features ===============-->
 
-        <!--Copied to ANOTHER DIR (conf/ folder) in CDMF-->
-        <fileSet>
-            <directory>src/repository/conf</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory>
-            <includes>
-                <include>**/sso-idp-config.xml</include>
-            </includes>
-        </fileSet>
-        <!--============ Added with ES Features ===============-->
-
-        <fileSet>
-            <directory>src/repository/conf/identity</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory>
-            <includes>
-                <include>**/**</include>
-            </includes>
-        </fileSet>
-        <!--============ Added with ES Features ===============-->
-
-        <fileSet>
-            <directory>src/repository/conf/bam</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/bam</outputDirectory>
-            <includes>
-                <include>**/es-bam.xml</include>
-            </includes>
-        </fileSet>
         <!--============ Added with ES Features ===============-->
 
         <fileSet>
@@ -443,26 +428,18 @@
                 <include>shindig.war</include>
             </includes>
         </fileSet>
+
         <!--============ Added with ES Features ===============-->
 
-        <fileSet>
-            <directory>src/repository/bam</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/bam/</outputDirectory>
-            <includes>
-                <include>**/**</include>
-            </includes>
-        </fileSet>
-        <!--============ Added with ES Features ===============-->
-
-        <fileSet>
-            <directory>src/repository/conf/security</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory>
-            <includes>
-                <include>**/application-authenticators.xml</include>
-                <!-- Replacement for application-authenticators.xml -->
-                <include>**/application-authentication.xml</include>
-            </includes>
-        </fileSet>
+        <!--<fileSet>-->
+            <!--<directory>src/repository/conf/security</directory>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory>-->
+            <!--<includes>-->
+                <!--<include>**/application-authenticators.xml</include>-->
+                <!--&lt;!&ndash; Replacement for application-authenticators.xml &ndash;&gt;-->
+                <!--<include>**/application-authentication.xml</include>-->
+            <!--</includes>-->
+        <!--</fileSet>-->
 
         <!--============ Added with ES Features ===============-->
 			<!--Copies publisher specific config files that needs to be overriden for the CDMF-STORE. -->
@@ -501,7 +478,7 @@
 
         <!--============ Added with API Features ===============-->
         <fileSet>
-            <directory>src/repository/conf/resources/customsequences</directory>
+            <directory>src/api-resource/customsequences</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/customsequences</outputDirectory>
             <includes>
                 <include>**/**.xml</include>
@@ -582,48 +559,56 @@
                 <include>org.apache.rampart:rampart:mar</include>
             </includes>
         </dependencySet>
+
+
+        <!-- use the new tool to create a bundles -->
+        <dependencySet>
+            <outputDirectory>${pom.artifactId}-${pom.version}/lib/core/WEB-INF/lib</outputDirectory>
+            <includes>
+                <include>org.wso2.carbon:org.wso2.carbon.mediator.bridge:jar</include>
+            </includes>
+        </dependencySet>
+
+        <dependencySet>
+            <outputDirectory>${pom.artifactId}-${pom.version}/lib/core/WEB-INF/lib/</outputDirectory>
+            <includes><include>org.apache.qpid.wso2:qpid-client:jar</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>${pom.artifactId}-${pom.version}/samples/axis2Client/client_repo/modules</outputDirectory>
+            <includes>
+                <include>org.apache.axis2:addressing:mar</include>
+                <include>org.apache.rampart:rampart:mar</include>
+                <include>org.apache.sandesha2:sandesha2:mar</include>
+            </includes>
+            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>${pom.artifactId}-${pom.version}/samples/axis2Server/repository/modules</outputDirectory>
+            <includes>
+                <include>org.apache.axis2:addressing:mar</include>
+                <include>org.apache.rampart:rampart:mar</include>
+                <include>org.apache.sandesha2:sandesha2:mar</include>
+            </includes>
+            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/axis2/client/lib</outputDirectory>
+            <includes>
+                <include>bouncycastle:bcprov-jdk15:jar</include>
+            </includes>
+            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/client/modules</outputDirectory>
+            <includes>
+                <include>org.apache.rampart:rampart:mar</include>
+            </includes>
+        </dependencySet>
     </dependencySets>
 
     <files>
-        <!--file>
-            <source>../mobile-agents/android/jax-rs/target/mdm-android-agent.war</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
-            </outputDirectory>
-            <fileMode>755</fileMode>
-        </file>
         <file>
-            <source>../mobile-agents/windows/jax-rs/target/mdm-windows-agent.war</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
-            </outputDirectory>
-            <fileMode>755</fileMode>
-        </file>
-        <file>
-            <source>../rest-api/target/mdm-admin.war</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
-            </outputDirectory>
-            <fileMode>755</fileMode>
-        </file>
-        <file>
-            <source>
-                ../tools/mdm-android-agent-archetype/target/mdm-android-agent-archetype-${mdm.android.agent.archetype.version}.jar
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/tools
-            </outputDirectory>
-            <fileMode>755</fileMode>
-        </file>
-        <file>
-            <source>../tools/mdm-android-agent-archetype/README.txt</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/tools
-            </outputDirectory>
-            <fileMode>755</fileMode>
-        </file>
-        <file>
-            <source>../tools/mdm-android-agent-archetype/android-agent.sh</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/tools
-            </outputDirectory>
-            <fileMode>755</fileMode>
-        </file-->
-        <!-- <file>
              <source>
                  ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml
              </source>
@@ -638,7 +623,7 @@
              <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory>
              <filtered>true</filtered>
              <fileMode>644</fileMode>
-         </file>-->
+         </file>
         <file>
             <source>src/repository/conf/tomcat/context.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory>
@@ -678,13 +663,6 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <!--        <file>
-                    <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
-                    </source>
-                    <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
-                    <filtered>true</filtered>
-                    <fileMode>644</fileMode>
-                </file>-->
         <file>
             <source>INSTALL.txt</source>
             <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
@@ -754,9 +732,9 @@
 
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/msg-mgt.properties
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/msg-mgt.properties
             </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
 
@@ -764,15 +742,9 @@
         <!-- Copying thrift-authentication.xml -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/thrift-authentication.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/thrift-authentication.xml
             </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
-        <file>
-            <source>src/repository/conf/application-authenticators.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security/</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
@@ -782,20 +754,6 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <file>
-            <source>src/repository/conf/identity.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
-            <fileMode>644</fileMode>
-        </file>
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat
-            </outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
 
         <!--cdm config file-->
         <file>
@@ -858,26 +816,6 @@
             <fileMode>644</fileMode>
         </file>
 
-        <!--cdm plugin config file-->
-        <!--file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/mobile-config.xml
-            </source>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/conf/etc/device-mgt-plugin-org.wso2.carbon.device.mgt.iot.common.config.server.configs/mobile
-            </outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file-->
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat
-            </outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
 
         <!-- Copying H2 database related files corresponding to default API management repository schema -->
         <file>
@@ -889,15 +827,6 @@
             <fileMode>644</fileMode>
         </file>
 
-        <!--<file>-->
-            <!--<source>-->
-                <!--target/wso2carbon-core-${carbon.kernel.version}/repository/database/FireAlarmDM_DB.h2.db-->
-            <!--</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
-            <!--<destName>FireAlarmDM_DB.h2.db</destName>-->
-            <!--<fileMode>644</fileMode>-->
-        <!--</file>-->
-
         <!-- Copying H2 database related files corresponding to default Device management repository schema -->
 
         <file>
@@ -942,34 +871,6 @@
             <fileMode>644</fileMode>
         </file>
 
-        <!--========================================================================================================-->
-        <!-- Enterprise Store Features -->
-
-        <!--============ Added with ES Features ===============-->
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/governance.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
-
-        <!--============ Added with ES Features ===============-->
-        <file>
-            <source>src/repository/conf/registry.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
-            <filtered>true</filtered>
-        </file>
-
-        <!--============ Added with ES Features ===============-->
-        <file>
-            <source>src/repository/conf/multitenancy/cloud-services-desc.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy/</outputDirectory>
-            <filtered>true</filtered>
-        </file>
-
-        <!--============ Added with ES Features ===============-->
         <file>
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties
@@ -980,14 +881,46 @@
 
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity-mgt.properties
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/governance.xml
             </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
 
+        <!--========================================================================================================-->
+        <!-- Enterprise Store Features -->
+
+
+
+
         <!--============ Added with ES Features ===============-->
+        <!--<file>-->
+            <!--<source>src/repository/conf/registry.xml</source>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>-->
+            <!--<filtered>true</filtered>-->
+        <!--</file>-->
+
+        <!--&lt;!&ndash;============ Added with ES Features ===============&ndash;&gt;-->
+        <!--<file>-->
+            <!--<source>src/repository/conf/multitenancy/cloud-services-desc.xml</source>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy/</outputDirectory>-->
+            <!--<filtered>true</filtered>-->
+        <!--</file>-->
+
+        <!--&lt;!&ndash;============ Added with ES Features ===============&ndash;&gt;-->
+
+
+        <!--<file>-->
+            <!--<source>-->
+                <!--../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity-mgt.properties-->
+            <!--</source>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>-->
+            <!--<filtered>true</filtered>-->
+            <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
+
+        <!--&lt;!&ndash;============ Added with ES Features ===============&ndash;&gt;-->
         <file>
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/email/email-admin-config.xml
@@ -997,7 +930,7 @@
             <fileMode>644</fileMode>
         </file>
 
-        <!--============ Added with ES Features ===============-->
+
         <file>
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/claim-config.xml
@@ -1007,12 +940,12 @@
             <fileMode>644</fileMode>
         </file>
 
-        <!--============ Added with ES Features ===============-->
-        <file>
-            <source>src/repository/database/WSO2IDENTITY_DB.h2.db</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
-            <fileMode>644</fileMode>
-        </file>
+        <!--&lt;!&ndash;============ Added with ES Features ===============&ndash;&gt;-->
+        <!--<file>-->
+            <!--<source>src/repository/database/WSO2IDENTITY_DB.h2.db</source>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>-->
+            <!--<fileMode>644</fileMode>-->
+        <!--</file>-->
 
         <!--============ Added with ES Features ===============-->
         <file>
@@ -1150,7 +1083,7 @@
             <fileMode>755</fileMode>
         </file>
 
-        <!-- Analytics REST APIs WebApp -->
+         <!--Analytics REST APIs WebApp -->
         <file>
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/analytics.war
@@ -1161,6 +1094,13 @@
             <fileMode>644</fileMode>
         </file>
 
+        <file>
+            <source>src/repository/conf/synapse.properties</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <destName>synapse.properties</destName>
+            <filtered>true</filtered>
+        </file>
+
 
 
 
diff --git a/modules/distribution/src/repository/conf/axis2/axis2.xml b/modules/distribution/src/repository/conf/axis2/axis2.xml
index 3b795a2a..4ac9c84f 100644
--- a/modules/distribution/src/repository/conf/axis2/axis2.xml
+++ b/modules/distribution/src/repository/conf/axis2/axis2.xml
@@ -1,68 +1,55 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http:www.wso2.org) All Rights Reserved.
+  ~  Copyright (c) 2005-2010, WSO2 Inc. (http://wso2.com) All Rights Reserved.
   ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
+  ~  WSO2 Inc. licenses this file to you under the Apache License,
+  ~  Version 2.0 (the "License"); you may not use this file except
+  ~  in compliance with the License.
+  ~  You may obtain a copy of the License at
   ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
   -->
 
 <axisconfig name="AxisJava2.0">
 
     <!-- ================================================= -->
-    <!-- Globally engaged modules -->
+    <!--                  Parameters                       -->
     <!-- ================================================= -->
-    <module ref="addressing"/>
 
-    <!-- ================================================= -->
-    <!-- Parameters -->
-    <!-- ================================================= -->
-    <parameter name="hotdeployment">${hotdeployment}</parameter>
-    <parameter name="hotupdate">${hotupdate}</parameter>
-    <parameter name="enableMTOM" locked="false">optional</parameter>
-    <parameter name="cacheAttachments">true</parameter>
-    <parameter name="attachmentDIR">work/mtom</parameter>
-    <parameter name="sizeThreshold">4000</parameter>
+    <!-- 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>
 
-    <parameter name="EnableChildFirstClassLoading">${childfirstCL}</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>
 
-    <!--
-    The exposeServiceMetadata parameter decides whether the metadata (WSDL, schema, policy) of
-    the services deployed on Axis2 should be visible when ?wsdl, ?wsdl2, ?xsd, ?policy requests
-    are received.
-    This parameter can be defined in the axi2.xml file, in which case this will be applicable
-    globally, or in the services.xml files, in which case, it will be applicable to the
-    Service groups and/or services, depending on the level at which the parameter is declared.
-    This value of this parameter defaults to true.
-    -->
-    <parameter name="exposeServiceMetadata">true</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>
 
-    <!--
-    Defines how the persistence of WS-ReliableMessaging is handled
-
-    Possible value are: inmemory & persistent
-    -->
-    <!-- Following parameter will completely disable REST handling in both the servlets-->
+    <!-- Completely disable REST handling in Axis2/Synapse if the value is true -->
     <parameter name="disableREST" locked="false">false</parameter>
 
-    <parameter name="Sandesha2StorageManager">inmemory</parameter>
+    <!-- Sandesha2 persistance storage manager -->
+    <parameter name="Sandesha2StorageManager" locked="false">inmemory</parameter>
 
-    <!-- This deployment interceptor will be called whenever before a module is initialized or
-     service is deployed -->
-    <listener class="org.wso2.carbon.core.deployment.DeploymentInterceptor"/>
-
-    <!-- setting servicePath. contextRoot is defined in the carbon.xml file -->
-    <!-- modification of this variable should be accompanied by the change in 'ServerURL' in carbon.xml file -->
-    <parameter name="servicePath">services</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>
@@ -70,69 +57,84 @@
     <!--the directory in which modules are deployed inside axis2 repository-->
     <parameter name="ModulesDirectory">axis2modules</parameter>
 
-    <parameter name="userAgent" locked="true">
-        @product.name@-@product.version@
-    </parameter>
-    <parameter name="server" locked="true">
-        @product.name@-@product.version@
-    </parameter>
+    <!-- User agent and the server details to be used in the http communication -->
+    <parameter name="userAgent" locked="true">WSO2 IOT 1.0.0-SNAPSHOT</parameter>
+    <parameter name="server" locked="true">WSO2 IOT 1.0.0-SNAPSHOT</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>
 
-    <!--During a fault, stacktrace can be sent with the fault message. The following flag will control -->
-    <!--that behaviour.-->
-    <parameter name="sendStacktraceDetailsWithFaults">false</parameter>
+    <!-- If there aren't any information available to find out the fault reason, we set the -->
+    <!-- message of the exception as the faultreason/Reason. But when a fault is thrown from -->
+    <!-- a service or some where, it will be wrapped by different levels. Due to this the -->
+    <!-- initial exception message can be lost. If this flag is set then, Axis2 tries to get -->
+    <!-- the first exception and set its message as the faultreason/Reason. -->
+    <parameter name="DrillDownToRootCauseForFaultReason" locked="false">false</parameter>
 
-    <!--If there aren't any information available to find out the fault reason, we set the message of the expcetion-->
-    <!--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>
+    <!-- Set the flag to true if you want to enable transport level session management -->
+    <parameter name="manageTransportSession" locked="false">true</parameter>
 
-    <!--Set the flag to true if you want to enable transport level session mangment-->
-    <parameter name="manageTransportSession">true</parameter>
+    <!-- This will give out the timout of the configuration contexts, in milliseconds -->
+    <parameter name="ConfigContextTimeoutInterval" locked="false">30000</parameter>
 
-    <!-- Synapse Configuration file -->
+    <!-- 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">WSO2 Carbon Server</parameter>
+    <parameter name="SynapseConfig.ServerName" locked="false">localhost</parameter>
 
-    <!--By default, JAXWS services are created by reading annotations. WSDL and schema are generated-->
-    <!--using a separate WSDL generator only when ?wsdl is called. Therefore, even if you engage-->
-    <!--policies etc.. to AxisService, it doesn't appear in the WSDL. By setting the following property-->
-    <!--to true, you can create the AxisService using the generated WSDL and remove the need for a-->
-    <!--WSDL generator. When ?wsdl is called, WSDL is generated in the normal way.-->
-    <parameter name="useGeneratedWSDLinJAXWS">${jaxwsparam}</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-->
+    <!-- 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  -->
+    <!-- POJO service deployer for Class -->
     <!--<deployer extension="class" class="org.apache.axis2.deployment.POJODeployer" directory="pojoservices"/>-->
 
-    <!-- JAXWS service deployer  -->
+    <!-- JAXWS service deployer -->
     <!--<deployer extension=".jar" class="org.apache.axis2.jaxws.framework.JAXWSDeployer" directory="servicejars"/>-->
-    <!-- ================================================= -->
-    <!-- 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 ovride this for particular service by adding the same element with your requirement-->
 
+    <!-- ================================================= -->
+    <!--                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"/>
@@ -142,6 +144,13 @@
                          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-www-form-urlencoded"
                           class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
@@ -153,167 +162,259 @@
                           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.axis2.json.JSONMessageFormatter"/>
+                          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="application/xml"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
-        <!--messageFormatter contentType="text/html"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
-        <!--messageFormatter contentType="application/soap+xml"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
+                        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"/-->
+						 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/xml"
                         class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
         <messageBuilder contentType="application/x-www-form-urlencoded"
-                        class="org.apache.axis2.builder.XFormURLEncodedBuilder"/>
+                        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.axis2.json.JSONOMBuilder"/>
+                        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.JSONOMBuilder"/>
+                        class="org.apache.axis2.json.JSONBuilder"/>
+        <!--messageBuilder contentType="text/javascript"
+                        class="org.apache.axis2.json.JSONStreamBuilder"/-->
+
+        <!--See  https://wso2.org/jira/browse/ESBJAVA-1725 before enabling bellow line -->
+        <!--messageBuilder contentType=".*"
+							class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
 
         <!--messageBuilder contentType="application/xml"
-     		        class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
-        <!--messageBuilder contentType="application/x-www-form-urlencoded"
-                        class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
-        <!--messageBuilder contentType="multipart/form-data"
-                        class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
-        <!--messageBuilder contentType="multipart/related"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
-        <!--messageBuilder contentType="application/soap+xml"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
-        <!--messageBuilder contentType="text/plain"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
-        <!--messageBuilder contentType="text/xml"
-                       class="org.wso2.carbon.relay.BinaryRelayBuilder"/-->
-        <!--messageFormatter contentType="text/plain"
-                        class="org.apache.axis2.format.PlainTextBuilder"/-->
+							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"/-->
+                        class="org.apache.synapse.format.hessian.HessianMessageBuilder"/>
+        <messageBuilder contentType=""
+                         class="org.apache.synapse.format.hessian.HessianMessageBuilder"/-->
     </messageBuilders>
 
-
     <!-- ================================================= -->
-    <!-- In Transports -->
+    <!--             Transport Ins (Listeners)             -->
     <!-- ================================================= -->
-    <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 any proxy like Apache2 mod_proxy or any load balancer. The port on the proxy server like Apache is 80
-       in this case.
-        -->
-        <!--<parameter name="proxyPort">80</parameter>-->
-    </transportReceiver>
+    <!--<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>-->
+        <!--&lt;!&ndash;parameter name="bind-address" locked="false">hostname or IP address</parameter&ndash;&gt;-->
+        <!--&lt;!&ndash;parameter name="WSDLEPRPrefix" locked="false">https://apachehost:port/somepath</parameter&ndash;&gt;-->
+        <!--<parameter name="httpGetProcessor" locked="false">org.wso2.carbon.mediation.transport.handlers.PassThroughNHttpGetProcessor</parameter>-->
+        <!--&lt;!&ndash;<parameter name="priorityConfigFile" locked="false">location of priority configuration file</parameter>&ndash;&gt;-->
+    <!--</transportReceiver>-->
 
-    <!--Please uncomment this in Multiple Instance Scenario if you want to use NIO Transport Recievers and 
- 	Remove the current transport REceivers in axis2.xml -->
+    <!-- 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>
-    </transportReceiver>
-    
-    <transportReceiver name="https" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSSLListener">
+        <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>-->
+        <!--&lt;!&ndash;parameter name="bind-address" locked="false">hostname or IP address</parameter&ndash;&gt;-->
+        <!--&lt;!&ndash;parameter name="WSDLEPRPrefix" locked="false">https://apachehost:port/somepath</parameter&ndash;&gt;-->
+        <!--<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>-->
+        <!--&lt;!&ndash;<parameter name="SSLVerifyClient">require</parameter>-->
+            <!--supports optional|require or defaults to none &ndash;&gt;-->
+    <!--</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="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>
-    </transportReceiver-->
+        <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="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>
+    <!--<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>-->
 
-        <!--
-       Uncomment the following to enable any proxy like Apache2 mod_proxy or any load balancer. The port on a proxy server like Apache is 443
-       in this case.
-        -->
-        <!--<parameter name="proxyPort">443</parameter>-->
-    </transportReceiver>
+    <!--<transportReceiver name="vfs" class="org.apache.synapse.transport.vfs.VFSTransportListener"/>-->
 
-    <!--
-       Uncomment the following segment to enable TCP transport.
-       Note : Addressing module should be engaged for TCP transport to work
-    -->
-    <!--<transportReceiver name="tcp"
-                       class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port">6667</parameter>
-    </transportReceiver>-->
+    <!--<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>-->
 
-    <!--
-     To Enable Mail Transport Listener, please uncomment the following.
-    -->
-    <!--<transportReceiver name="mailto" class="org.apache.axis2.transport.mail.MailTransportListener">
+    <!--<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>-->
 
-    </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">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
+    <!--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">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</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">
-        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</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>-->
 
@@ -341,75 +442,50 @@
         </parameter>
     </transportReceiver-->
 
-    <!--Uncomment this and configure as appropriate for JMS transport support with WSO2 MB 2.x.x -->
-    <!--transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
-        <parameter name="myTopicConnectionFactory" locked="false">
-           <parameter name="java.naming.factory.initial" locked="false">org.wso2.andes.jndi.PropertiesFileInitialContextFactory</parameter>
-            <parameter name="java.naming.provider.url" locked="false">repository/conf/jndi.properties</parameter>
-            <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter>
-            <parameter name="transport.jms.ConnectionFactoryType" locked="false">topic</parameter>
-        </parameter>
+    <!--Uncomment this for FIX transport support
+    <transportReceiver name="fix" class="org.apache.synapse.transport.fix.FIXTransportListener"/>
+    -->
 
-        <parameter name="myQueueConnectionFactory" locked="false">
-            <parameter name="java.naming.factory.initial" locked="false">org.wso2.andes.jndi.PropertiesFileInitialContextFactory</parameter>
-            <parameter name="java.naming.provider.url" locked="false">repository/conf/jndi.properties</parameter>
-            <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
-           <parameter name="transport.jms.ConnectionFactoryType" locked="false">queue</parameter>
-        </parameter>
+    <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>
 
-        <parameter name="default" locked="false">
-            <parameter name="java.naming.factory.initial" locked="false">org.wso2.andes.jndi.PropertiesFileInitialContextFactory</parameter>
-            <parameter name="java.naming.provider.url" locked="false">repository/conf/jndi.properties</parameter>
-            <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
-            <parameter name="transport.jms.ConnectionFactoryType" locked="false">queue</parameter>
-        </parameter>
-    </transportReceiver-->
+    <!--
+   Uncomment 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>
 
     <!-- ================================================= -->
-    <!-- Out Transports -->
+    <!--             Transport Outs (Senders)              -->
     <!-- ================================================= -->
 
-    <transportSender name="tcp"
-                     class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
-    <transportReceiver name="local"
-                       class="org.wso2.carbon.core.transports.local.CarbonLocalTransportReceiver"/>
-    <transportSender name="local"
-                     class="org.wso2.carbon.core.transports.local.CarbonLocalTransportSender"/>
-    <!--<transportSender name="jms"
-                     class="org.apache.axis2.transport.jms.JMSSender"/>-->
-    <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>
+    <!--<transportSender name="http" class="org.apache.synapse.transport.passthru.PassThroughHttpSender">-->
+        <!--<parameter name="non-blocking" locked="false">true</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>-->
-
-    <!--Please uncomment this in Multiple Instance Scenario if you want to use NIO sender -->
-    <!--  
-    <transportSender name="http" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSender">
+    <!-- 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">
@@ -428,166 +504,125 @@
                 <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>-->
+        <!--&lt;!&ndash;<parameter name="HostnameVerifier">DefaultAndLocalhost</parameter>&ndash;&gt;-->
+        <!--&lt;!&ndash;supports Strict|AllowAll|DefaultAndLocalhost or the default if none specified &ndash;&gt;-->
+    <!--</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>
-    </transportSender>
-	-->
+        <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"/-->
 
 
     <!-- ================================================= -->
-    <!-- Phases  -->
+    <!--                Clustering                         -->
     <!-- ================================================= -->
-    <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"/>
-
-        <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>
-        </phase>
-        <phase name="Addressing">
-            <handler name="AddressingBasedDispatcher"
-                     class="org.wso2.carbon.core.multitenancy.MultitenantAddressingBasedDispatcher">
-                <order phase="Addressing"/>
-            </handler>
-        </phase>
-        <phase name="Ghost">
-            <handler name="GhostDispatcher"
-                     class="org.wso2.carbon.core.dispatchers.GhostDispatcher"/>
-        </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>
-        <!--  System pre defined phases       -->
-        <phase name="RMPhase"/>
-        <phase name="OpPhase"/>
-        <!--   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"/>
-        <phase name="RMPhase"/>
-        <phase name="OpPhase"/>
-        <!--      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="PolicyDetermination"/>
-        <phase name="MessageOut"/>
-        <phase name="Security"/>
-
-        <!--
-           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"/>
-        <!--Following phase is added to publish stats -->
-        <phase name="StatReporting"/>
-    </phaseOrder>
-    <phaseOrder type="InFaultFlow">
-        <!--  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"/>
-
-        <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>
-        </phase>
-
-        <phase name="Addressing">
-            <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
-                <order phase="Addressing"/>
-            </handler>
-        </phase>
-        <phase name="Ghost">
-            <handler name="GhostDispatcher"
-                     class="org.wso2.carbon.core.dispatchers.GhostDispatcher"/>
-        </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"/>
-        <phase name="OpPhase"/>
-        <!--      user can add his own phases to this area  -->
-        <phase name="OperationInFaultPhase"/>
-    </phaseOrder>
-    <phaseOrder type="OutFaultFlow">
-        <!-- Handlers related to unified-endpoint component are added to the UEPPhase -->
-        <phase name="UEPPhase"/>
-        <phase name="RMPhase"/>
-        <!--      user can add his own phases to this area  -->
-        <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"/>
-        <!--Following phase is added to publish stats -->
-        <phase name="StatReporting"/>
-    </phaseOrder>
-
+    <!--
+     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">
 
@@ -692,11 +727,211 @@
         can be defined in this section.
         -->
         <groupManagement enable="false">
-            <applicationDomain name="wso2.as.domain"
-                               description="AS group"
+            <applicationDomain name="wso2.apim.domain"
+                               description="APIM group"
                                agent="org.wso2.carbon.core.clustering.hazelcast.HazelcastGroupManagementAgent"
                                subDomain="worker"
                                port="2222"/>
         </groupManagement>
     </clustering>
-</axisconfig>
\ No newline at end of file
+
+    <!-- ================================================= -->
+    <!--                   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>
diff --git a/modules/distribution/src/repository/conf/identity/identity-providers/default.xml b/modules/distribution/src/repository/conf/identity/identity-providers/default.xml
deleted file mode 100644
index 3d1faa52..00000000
--- a/modules/distribution/src/repository/conf/identity/identity-providers/default.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<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>
\ No newline at end of file
diff --git a/modules/distribution/src/repository/conf/identity/service-providers/default.xml b/modules/distribution/src/repository/conf/identity/service-providers/default.xml
deleted file mode 100644
index 83cb78a0..00000000
--- a/modules/distribution/src/repository/conf/identity/service-providers/default.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<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>
diff --git a/modules/distribution/src/repository/conf/identity/service-providers/sp_cdm.xml b/modules/distribution/src/repository/conf/identity/service-providers/sp_cdm.xml
deleted file mode 100644
index e6006ead..00000000
--- a/modules/distribution/src/repository/conf/identity/service-providers/sp_cdm.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<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>
diff --git a/modules/distribution/src/repository/conf/identity/service-providers/sp_dashboard.xml b/modules/distribution/src/repository/conf/identity/service-providers/sp_dashboard.xml
deleted file mode 100644
index c300d67c..00000000
--- a/modules/distribution/src/repository/conf/identity/service-providers/sp_dashboard.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<ServiceProvider>
-	<ApplicationID>2</ApplicationID>
-	<ApplicationName>wso2_sp_dashboard</ApplicationName>
-	<Description>Default Service Provider</Description>
-	<InboundAuthenticationConfig>
-		<InboundAuthenticationRequestConfigs>
-			<InboundAuthenticationRequestConfig>
-				<InboundAuthKey>wso2.my.dashboard</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>
diff --git a/modules/distribution/src/repository/conf/identity/service-providers/sp_mdm.xml b/modules/distribution/src/repository/conf/identity/service-providers/sp_mdm.xml
deleted file mode 100644
index 2b64586c..00000000
--- a/modules/distribution/src/repository/conf/identity/service-providers/sp_mdm.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<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>
diff --git a/modules/distribution/src/repository/conf/synapse.properties b/modules/distribution/src/repository/conf/synapse.properties
new file mode 100644
index 00000000..42080fc0
--- /dev/null
+++ b/modules/distribution/src/repository/conf/synapse.properties
@@ -0,0 +1,42 @@
+#
+#  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.
+#
+
+#synapse.threads.core = 20
+#synapse.threads.max = 100
+#synapse.threads.keepalive = 5
+#synapse.threads.qlen = 10
+#synapse.threads.group = synapse-thread-group
+#synapse.threads.idprefix = SynapseWorker
+
+synapse.sal.endpoints.sesssion.timeout.default=600000
+synapse.global_timeout_interval=120000
+#In memory statistics cleaning state
+statistics.clean.enable=false
+
+# Dependency tracking Synapse observer
+# Comment out to disable dependency management
+synapse.observers=org.wso2.carbon.mediation.dependency.mgt.DependencyTracker
+
+# User defined wsdlLocator/Schema Resolver Implementations.
+# synapse.wsdl.resolver=org.wso2.carbon.mediation.initializer.RegistryWSDLLocator
+# synapse.schema.resolver=org.wso2.carbon.mediation.initializer.RegistryXmlSchemaURIResolver
+
+# Uncomment following to support fallback XPATH 2.0 support with DOM and Saxon
+#synapse.xpath.dom.failover.enabled=true
+synapse.temp_data.chunk.size=3072
+#provides custom xpath function for securevault
+synapse.xpath.func.extensions=org.wso2.carbon.mediation.security.vault.xpath.SecureVaultLookupXPathFunctionProvider
+synapse.carbon.ext.tenant.info=org.wso2.carbon.mediation.initializer.handler.CarbonTenantInfoConfigurator
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 47a538af..c5cb1cda 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -135,7 +135,10 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.server.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
-                                 End of Device Management Features
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.enterprise.store.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                 <!--End of Device Management Features-->
 
                                 <!-- Jaggery Features -->
                                 <featureArtifactDef>
@@ -218,10 +221,10 @@
                                 <!-- End of Multitenancy Features -->
 
                                 <!-- Identity Features -->
-                                <!-- TODO: Verify this feature is needed -->
-                                <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.common.feature:${carbon.identity.version}
-                                </featureArtifactDef>
+                                <!--&lt;!&ndash; TODO: Verify this feature is needed &ndash;&gt;-->
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.common.feature:${carbon.identity.version}-->
+                                <!--</featureArtifactDef>-->
                                 <!-- TODO: Verify this feature is needed -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.idp.mgt.feature:${carbon.identity.version}
@@ -291,7 +294,7 @@
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.core.feature:${carbon.identity.version}
                                 </feaureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.self.registration.server.feature:${carbon.identity.version}
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.user.registration.server.feature:${carbon.identity.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.server.feature:${carbon.identity.version}
@@ -302,9 +305,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.identity.provider.server.feature:${carbon.identity.version}
                                 </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.identity:org.wso2.carbon.identity.relying.party.server.feature:${carbon.identity.version}
-                                </featureArtifactDef>
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.identity:org.wso2.carbon.identity.relying.party.server.feature:${carbon.identity.version}-->
+                                <!--</featureArtifactDef>-->
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity:org.wso2.carbon.um.ws.service.client.feature:${carbon.identity.version}
                                 </featureArtifactDef>
@@ -369,6 +372,12 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.store.feature:${carbon.api.mgt.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.gateway.feature:${carbon.api.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.startup.publisher.feature:${carbon.api.mgt.version}
+                                </featureArtifactDef>
                                 <!-- End of API Management Features -->
 
                                 <!--- Notification Support: Mail -->
@@ -392,16 +401,6 @@
                                     org.wso2.carbon.registry:org.wso2.carbon.registry.task.feature:${carbon.registry.version}
                                 </featureArtifactDef>
 
-
-
-								<!--========================================================================================================-->
-								<!-- Enterprise Store Features -->
-
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.enterprise.store.feature:${carbon.device.mgt.version}
-                                </featureArtifactDef>
-
-
 								<!-- Jaggery Features -->
 								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
 								<featureArtifactDef>
@@ -508,10 +507,10 @@
 
 								<!-- End of Enterprise Store Features -->
 								<!--=====================================================================================================-->
-
                                 <featureArtifactDef>
                                     org.wso2.carbon.mediation:org.apache.synapse.wso2.feature:${carbon.mediation.version}
                                 </featureArtifactDef>
+
                                 <featureArtifactDef>
                                     org.wso2.carbon.mediation:org.wso2.carbon.mediation.initializer.feature:${carbon.mediation.version}
                                 </featureArtifactDef>
@@ -521,19 +520,34 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.mediation:org.apache.synapse.transport.nhttp.feature:${carbon.mediation.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.application.mgt.synapse.server.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.application.deployer.synapse.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.mediation:org.wso2.carbon.inbound.endpoints.server.feature:${carbon.mediation.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.mediation:org.wso2.carbon.mediation.ntask.feature:${carbon.mediation.version}
                                 </featureArtifactDef>
-                                <!--<featureArtifactDef>-->
-                                    <!--org.wso2.carbon.mediation:org.wso2.carbon.mediation.admin.feature:${carbon.mediation.version}-->
-                                <!--</featureArtifactDef>-->
-                                <!--<featureArtifactDef>-->
-                                    <!--org.wso2.carbon.deployment:org.wso2.carbon.service.mgt.server.feature:${carbon.deployment.version}-->
-                                <!--</featureArtifactDef>-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.mediation.admin.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.deployment:org.wso2.carbon.service.mgt.server.feature:${carbon.deployment.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.mediators.server.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.mediation.configadmin.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
 
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.relay.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
                                 <!--APIM feature-->
                                 <featureArtifactDef>
                                     org.wso2.carbon.commons:org.wso2.carbon.system.statistics.feature:${carbon.commons.version}
@@ -659,6 +673,7 @@
                                 </featureArtifactDef>
                                 <!-- END - Tools -->
                                 <!--End of DAS Feature-->
+
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -718,6 +733,10 @@
                                     <id>org.wso2.carbon.device.mgt.analytics.server.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.enterprise.store.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
                                 <!-- End of Device Management Features -->
 
                                 <!-- Jaggery Features -->
@@ -760,24 +779,14 @@
                                     <id>org.wso2.carbon.webapp.mgt.feature.group</id>
                                     <version>${carbon.deployment.version}</version>
                                 </feature>
-                                <!--<feature>
-                                    <id>org.wso2.carbon.webapp.mgt.server.feature.group</id>
-                                    <version>${carbon.deployment.version}</version>
-                                </feature>-->
                                 <feature>
                                     <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
                                     <version>${carbon.deployment.version}</version>
                                 </feature>
                                 <!-- End of Carbon Deployment Features -->
 
-                                <!-- Carbon Utils Features -->
-                                <!-- End of Carbon Utils Features -->
-
                                 <!-- Carbon Commons Features -->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.databridge.datapublisher.feature.group</id>-->
-                                    <!--<version>${carbon.commons.version}</version>-->
-                                <!--</feature>-->
+
                                 <feature>
                                     <id>org.wso2.carbon.event.server.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -794,11 +803,6 @@
                                     <id>org.wso2.carbon.ntask.core.feature.group</id>
                                     <version>${carbon.commons.version}</version>
                                 </feature>
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.user.mgt.feature.group</id>-->
-                                    <!--<version>${carbon.commons.version}</version>-->
-                                <!--</feature>-->
-                                <!--End of Carbon Commons Features-->
 
                                 <!-- Carbon Multitenancy Features -->
                                 <feature>
@@ -821,17 +825,6 @@
                                     <id>org.wso2.carbon.tenant.deployment.feature.group</id>
                                     <version>${carbon.multitenancy.version}</version>
                                 </feature>
-                                <!-- TODO: Verify this feature is needed -->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.tenant.mgt.core.feature.group</id>-->
-                                    <!--<version>${carbon.multitenancy.version}</version>-->
-                                <!--</feature>-->
-                                <!-- TODO: Verify this feature is needed -->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.tenant.mgt.server.feature.group</id>-->
-                                    <!--<version>${carbon.multitenancy.version}</version>-->
-                                <!--</feature>-->
-                                <!-- End of Carbon Multitenancy Features -->
 
                                 <!-- Identity Features -->
                                 <feature>
@@ -862,37 +855,19 @@
                                     <id>org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                <!--feature>
-                                    <id>org.wso2.stratos.identity.saml2.sso.mgt.feature.group</id>
-                                    <version>${carbon.platform.version}</version>
-                                </feature-->
-                                <!-- TODO: Verify this feature is needed -->
                                 <feature>
                                     <id>org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                <!-- TODO: Verify this feature is needed -->
                                 <feature>
                                     <id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                <!-- TODO: Verify this feature is needed -->
-                                <feature>
-                                    <id>org.wso2.carbon.identity.oauth.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
-                                </feature>
-                                <!-- TODO: Verify this feature is needed -->
-                                <feature>
-                                    <id>org.wso2.carbon.identity.oauth.common.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
-                                </feature>
-                                <!-- TODO: Verify this feature is needed -->
                                 <feature>
                                     <id>org.wso2.carbon.idp.mgt.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
                                 <!-- SSO Features -->
-                                <!-- TODO: Verify this feature is needed -->
                                 <feature>
                                     <id>org.wso2.carbon.identity.authenticator.saml2.sso.feature.group</id>
                                     <version>${carbon.identity.version}</version>
@@ -918,12 +893,10 @@
                                     <id>org.wso2.carbon.identity.mgt.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                <!-- TODO: Verify this feature is needed -->
                                 <feature>
                                     <id>org.wso2.carbon.identity.application.mgt.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                <!-- TODO: Verify this feature is needed -->
                                 <feature>
                                     <id>org.wso2.carbon.claim.mgt.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
@@ -932,23 +905,16 @@
                                     <id>org.wso2.carbon.identity.notification.mgt.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                <!-- TODO: Verify this feature is needed -->
                                 <feature>
                                     <id>org.wso2.carbon.claim.mgt.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                <!-- End of SSO Fix -->
-                                <!--Commented to remove SAML SSO menu item-->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.identity.sso.saml.feature.group</id>-->
-                                    <!--<version>${carbon.identity.version}</version>-->
-                                <!--</feature>-->
                                 <feature>
                                     <id>org.wso2.carbon.identity.core.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.identity.self.registration.server.feature.group</id>
+                                    <id>org.wso2.carbon.identity.user.registration.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
                                 <feature>
@@ -959,10 +925,6 @@
                                     <id>org.wso2.carbon.identity.provider.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.identity.relying.party.server.feature.group</id>
-                                    <version>${carbon.identity.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.um.ws.service.server.feature.group</id>
                                     <version>${carbon.identity.version}</version>
@@ -1029,10 +991,6 @@
                                     <id>org.wso2.carbon.registry.extensions.feature.group</id>
                                     <version>${carbon.governance.version}</version>
                                 </feature>
-								<feature>
-									<id>org.wso2.carbon.registry.ui.menu.governance.feature.group</id>
-									<version>${carbon.registry.version}</version>
-								</feature>
                                 <feature>
                                     <id>org.wso2.carbon.registry.extensions.server.feature.group</id>
                                     <version>${carbon.governance.version}</version>
@@ -1061,6 +1019,14 @@
                                     <id>org.wso2.carbon.apimgt.store.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.startup.publisher.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.mediation.initializer.feature.group</id>
                                     <version>${carbon.mediation.version}</version>
@@ -1077,6 +1043,14 @@
                                     <id>org.apache.synapse.wso2.feature.group</id>
                                     <version>${carbon.mediation.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.mgt.synapse.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.deployer.synapse.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
                                 <!-- TCP transport Synapse -->
                                 <feature>
                                     <id>org.apache.axis2.transport.tcp.feature.group</id>
@@ -1090,14 +1064,27 @@
                                     <id>org.wso2.carbon.mediation.ntask.feature.group</id>
                                     <version>${carbon.mediation.version}</version>
                                 </feature>
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.mediation.admin.feature.group</id>-->
-                                    <!--<version>${carbon.mediation.version}</version>-->
-                                <!--</feature>-->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.service.mgt.server.feature.group</id>-->
-                                    <!--<version>${carbon.deployment.version}</version>-->
-                                <!--</feature>-->
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.admin.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediators.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.service.mgt.server.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>org.wso2.carbon.relay.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.configadmin.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
                                 <!-- End of API Management Features -->
 
                                 <!-- Notification Support: Mail -->
@@ -1107,121 +1094,113 @@
                                 </feature>
 
 
-
-
-                                <!-- Device  Store Features -->
+                                <!-- Jaggery Features -->
                                 <feature>
-                                    <id>org.wso2.carbon.device.mgt.enterprise.store.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
+                                    <id>org.jaggeryjs.modules.caramel.feature.group</id>
+                                    <version>${caramel.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.handlebars.feature.group</id>
+                                    <version>${handlebars.feature.version}</version>
+                                </feature>
+                                <!-- End of Jaggery Features -->
+
+                                <!-- Carbon Deployment Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.webapp.mgt.server.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <!-- End of Carbon Deployment Features -->
+
+
+                                <!-- Store Features -->
+                                <!--+++++++++++++++++++++++++++++++++++++++++++++++-->
+
+                                <feature>
+                                    <id>org.wso2.carbon.store.feature.group</id>
+                                    <version>${carbon.store.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.store.modules.event.feature.group</id>
+                                    <version>${carbon.store.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.store.modules.login.feature.group</id>
+                                    <version>${carbon.store.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.store.modules.permission.feature.group</id>
+                                    <version>${carbon.store.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.store.modules.registration.feature.group</id>
+                                    <version>${carbon.store.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.store.modules.bampublisher.feature.group</id>
+                                    <version>${carbon.store.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.store.modules.store.feature.group</id>
+                                    <version>${carbon.store.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.store.modules.ues.feature.group</id>
+                                    <version>${carbon.store.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.store.modules.account-management.feature.group</id>
+                                    <version>${carbon.store.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.store.modules.rxt.feature.group</id>
+                                    <version>${carbon.store.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.store.modules.utils.feature.group</id>
+                                    <version>${carbon.store.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.store.modules.lifecycle.feature.group</id>
+                                    <version>${carbon.store.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.social.feature.group</id>
+                                    <version>${carbon.social.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.store.extensions.assets.gadget.feature.group</id>
+                                    <version>${carbon.store.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.store.extensions.assets.site.feature.group</id>
+                                    <version>${carbon.store.version}</version>
                                 </feature>
 
-								<!-- Jaggery Features -->
-								<feature>
-									<id>org.jaggeryjs.modules.caramel.feature.group</id>
-									<version>${caramel.feature.version}</version>
-								</feature>
-								<feature>
-									<id>org.jaggeryjs.modules.handlebars.feature.group</id>
-									<version>${handlebars.feature.version}</version>
-								</feature>
-								<!-- End of Jaggery Features -->
+                                <!--+++++++++++++++++++++++++++++++++++++++++++++++-->
+                                <!-- End of Store Features -->
 
-								<!-- Carbon Deployment Features -->
-								<feature>
-									<id>org.wso2.carbon.webapp.mgt.server.feature.group</id>
-									<version>${carbon.deployment.version}</version>
-								</feature>
-								<!-- End of Carbon Deployment Features -->
+                                <!-- Commons Features -->
+                                <!--+++++++++++++++++++++++++++++++++++++++++++++++-->
+                                <feature>
+                                    <id>org.wso2.carbon.event.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <!--+++++++++++++++++++++++++++++++++++++++++++++++-->
+                                <!-- End of Commons Features -->
 
-
-								<!-- Store Features -->
-								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
-
-								<feature>
-									<id>org.wso2.carbon.store.feature.group</id>
-									<version>${carbon.store.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.store.modules.event.feature.group</id>
-									<version>${carbon.store.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.store.modules.login.feature.group</id>
-									<version>${carbon.store.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.store.modules.permission.feature.group</id>
-									<version>${carbon.store.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.store.modules.registration.feature.group</id>
-									<version>${carbon.store.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.store.modules.bampublisher.feature.group</id>
-									<version>${carbon.store.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.store.modules.store.feature.group</id>
-									<version>${carbon.store.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.store.modules.ues.feature.group</id>
-									<version>${carbon.store.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.store.modules.account-management.feature.group</id>
-									<version>${carbon.store.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.store.modules.rxt.feature.group</id>
-									<version>${carbon.store.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.store.modules.utils.feature.group</id>
-									<version>${carbon.store.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.store.modules.lifecycle.feature.group</id>
-									<version>${carbon.store.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.carbon.social.feature.group</id>
-									<version>${carbon.social.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.carbon.store.extensions.assets.gadget.feature.group</id>
-									<version>${carbon.store.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.carbon.store.extensions.assets.site.feature.group</id>
-									<version>${carbon.store.version}</version>
-								</feature>
-
-								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
-								<!-- End of Store Features -->
-
-								<!-- Commons Features -->
-								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
-								<feature>
-									<id>org.wso2.carbon.event.feature.group</id>
-									<version>${carbon.commons.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
-									<version>${carbon.commons.version}</version>
-								</feature>
-								<!--+++++++++++++++++++++++++++++++++++++++++++++++-->
-								<!-- End of Commons Features -->
-
-								<feature>
-									<id>org.wso2.carbon.dashboards.shindig.feature.group</id>
-									<version>${carbon.dashboards.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.ciphertool.feature.group</id>
-									<version>${ciphertool.version}</version>
-								</feature>
+                                <feature>
+                                    <id>org.wso2.carbon.dashboards.shindig.feature.group</id>
+                                    <version>${carbon.dashboards.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.ciphertool.feature.group</id>
+                                    <version>${ciphertool.version}</version>
+                                </feature>
                                 <!-- End of Enterprise Store Features -->
                                 <!--APIM feature-->
                                 <feature>
@@ -1373,7 +1352,7 @@
                                     <version>${carbon.event-processing.version}</version>
                                 </feature>
                                 <!--END - Tools-->
-							</features>
+                            </features>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/pom.xml b/pom.xml
index 23cea62b..b7ecec4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -472,12 +472,12 @@
                 <groupId>org.wso2.carbon.apimgt</groupId>
                 <artifactId>org.wso2.carbon.apimgt.core</artifactId>
                 <version>${carbon.api.mgt.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.mediation.initializer</artifactId>
-                    </exclusion>
-                </exclusions>
+                <!--<exclusions>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.mediation.initializer</artifactId>-->
+                    <!--</exclusion>-->
+                <!--</exclusions>-->
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.apimgt</groupId>
@@ -494,112 +494,112 @@
                 <groupId>org.wso2.carbon.apimgt</groupId>
                 <artifactId>org.wso2.carbon.apimgt.impl</artifactId>
                 <version>${carbon.api.mgt.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.mediation.initializer</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.woden.wso2</groupId>
-                        <artifactId>woden</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.user.core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon.governance</groupId>
-                        <artifactId>org.wso2.carbon.governance.api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.registry.ws.client</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.identity.core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.identity.oauth</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.apimgt.keymgt.client</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.poi</groupId>
-                        <artifactId>poi-ooxml</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.rest.api.stub</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.json.wso2</groupId>
-                        <artifactId>json</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.h2database.wso2</groupId>
-                        <artifactId>h2-database-engine</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.apimgt.handlers.security.stub</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.user.mgt.stub</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.um.ws.api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.mediation.dependency.mgt</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.google.code.gson</groupId>
-                        <artifactId>gson</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.mediation.registry</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>httpmime</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.event.core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.sequences.stub</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.mediation.security.stub</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.registry.indexing</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.apimgt.keymgt.stub</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.securevault</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.googlecode.json-simple.wso2</groupId>
-                        <artifactId>json-simple</artifactId>
-                    </exclusion>
-                </exclusions>
+                <!--<exclusions>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.mediation.initializer</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.apache.woden.wso2</groupId>-->
+                        <!--<artifactId>woden</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.user.core</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon.governance</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.governance.api</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.registry.ws.client</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.identity.core</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.identity.oauth</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.apimgt.keymgt.client</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.apache.poi</groupId>-->
+                        <!--<artifactId>poi-ooxml</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.rest.api.stub</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.json.wso2</groupId>-->
+                        <!--<artifactId>json</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>com.h2database.wso2</groupId>-->
+                        <!--<artifactId>h2-database-engine</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.apimgt.handlers.security.stub</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.user.mgt.stub</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.um.ws.api</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.mediation.dependency.mgt</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>com.google.code.gson</groupId>-->
+                        <!--<artifactId>gson</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.mediation.registry</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.apache.httpcomponents</groupId>-->
+                        <!--<artifactId>httpmime</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.event.core</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.sequences.stub</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.mediation.security.stub</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.registry.indexing</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.apimgt.keymgt.stub</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.wso2.carbon</groupId>-->
+                        <!--<artifactId>org.wso2.carbon.securevault</artifactId>-->
+                    <!--</exclusion>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>com.googlecode.json-simple.wso2</groupId>-->
+                        <!--<artifactId>json-simple</artifactId>-->
+                    <!--</exclusion>-->
+                <!--</exclusions>-->
             </dependency>
 
             <!--CXF dependencies (needed for web apps)-->
@@ -811,7 +811,7 @@
         <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
 
         <!--Jaggery -->
-        <jaggery.version>0.10.2</jaggery.version>
+        <jaggery.version>0.12.0-M1</jaggery.version>
         <jaggery.extensions.version>1.4.0</jaggery.extensions.version>
         <jaggery.extensions.sso.version>1.4.0</jaggery.extensions.sso.version>
         <jaggery.extensions.carbon.version>1.4.0</jaggery.extensions.carbon.version>
@@ -823,8 +823,8 @@
         <markdown.feature.version>1.4.0</markdown.feature.version>
 
         <!-- Store Features -->
-        <carbon.store.version>2.3.6</carbon.store.version>
-        <carbon.social.version>2.3.6</carbon.social.version>
+        <carbon.store.version>2.3.8-SNAPSHOT</carbon.store.version>
+        <carbon.social.version>2.3.8-SNAPSHOT</carbon.social.version>
 
         <!-- Additional Stuff from ES Features -->
         <carbon.dashboards.version>1.0.0</carbon.dashboards.version>
@@ -856,10 +856,10 @@
         <carbon.deployment.version>4.5.2</carbon.deployment.version>
 
         <!-- Carbon Identity -->
-        <carbon.identity.version>4.5.6</carbon.identity.version>
+        <carbon.identity.version>4.6.0-SNAPSHOT</carbon.identity.version>
 
         <!-- Carbon Multi-tenancy -->
-        <carbon.multitenancy.version>4.4.1</carbon.multitenancy.version>
+        <carbon.multitenancy.version>4.5.0-m1</carbon.multitenancy.version>
 
         <!-- Carbon Registry -->
         <carbon.registry.version>4.4.8</carbon.registry.version>
@@ -876,7 +876,7 @@
         <carbon.iot.device.mgt.version>1.0.0-SNAPSHOT</carbon.iot.device.mgt.version>
 
         <!-- carbon mediation -->
-        <carbon.mediation.version>4.4.5</carbon.mediation.version>
+        <carbon.mediation.version>4.4.10</carbon.mediation.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>4.3.0-SNAPSHOT</carbon.api.mgt.version>
@@ -891,7 +891,7 @@
         <bouncycastle.version>1.49</bouncycastle.version>
         <apache.wss4j.version>2.0.0</apache.wss4j.version>
         <codehaus.plexus.version>3.0.21</codehaus.plexus.version>
-        <axis2-transports.wso2.version>1.1.0-wso2v12</axis2-transports.wso2.version>
+        <axis2-transports.wso2.version>1.1.0-wso2v17</axis2-transports.wso2.version>
 
         <!--DAS-->
         <carbon.analytics.version>1.0.3</carbon.analytics.version>
@@ -899,9 +899,6 @@
         <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
         <shindig.version>1.0.0</shindig.version>
         <carbon.event-processing.version>2.0.5</carbon.event-processing.version>
-        <das.release.version>3.0.0-SNAPSHOT</das.release.version>
-        <carbon.data.version>4.3.1-SNAPSHOT</carbon.data.version>
-        <carbon.dashboard.version>1.0.1-SNAPSHOT</carbon.dashboard.version>
 
 
         <orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient>