diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployerTest.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployerTest.java
index 294a636eb9..4c407bce10 100644
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployerTest.java
+++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/DeviceTypePluginDeployerTest.java
@@ -10,7 +10,6 @@ import org.testng.annotations.Test;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.extensions.device.type.template.DeviceTypeConfigIdentifier;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
-
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Field;
@@ -47,8 +46,9 @@ public class DeviceTypePluginDeployerTest {
     }
 
     private void initializeCarbonContext() throws IOException, RegistryException {
+
         if (System.getProperty("carbon.home") == null) {
-            File file = new File("src/test/resources/carbon-home");
+            File file = new File("src/test/resources");
             if (file.exists()) {
                 System.setProperty("carbon.home", file.getAbsolutePath());
 
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/dbscripts/h2.sql b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/dbscripts/h2.sql
deleted file mode 100644
index f6b31c78d9..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/dbscripts/h2.sql
+++ /dev/null
@@ -1,429 +0,0 @@
-CREATE TABLE IF NOT EXISTS REG_CLUSTER_LOCK (
-             REG_LOCK_NAME VARCHAR (20),
-             REG_LOCK_STATUS VARCHAR (20),
-             REG_LOCKED_TIME TIMESTAMP,
-             REG_TENANT_ID INTEGER DEFAULT 0,
-             PRIMARY KEY (REG_LOCK_NAME)
-);
-
-CREATE TABLE IF NOT EXISTS REG_LOG (
-             REG_LOG_ID INTEGER AUTO_INCREMENT,
-             REG_PATH VARCHAR (2000),
-             REG_USER_ID VARCHAR (31) NOT NULL,
-             REG_LOGGED_TIME TIMESTAMP NOT NULL,
-             REG_ACTION INTEGER NOT NULL,
-             REG_ACTION_DATA VARCHAR (500),
-             REG_TENANT_ID INTEGER DEFAULT 0,
-             PRIMARY KEY (REG_LOG_ID, REG_TENANT_ID)
-);
-
-CREATE INDEX IF NOT EXISTS REG_LOG_IND_BY_REG_LOGTIME ON REG_LOG(REG_LOGGED_TIME, REG_TENANT_ID);
-
-CREATE TABLE IF NOT EXISTS REG_PATH(
-             REG_PATH_ID INTEGER NOT NULL AUTO_INCREMENT,
-             REG_PATH_VALUE VARCHAR(2000) NOT NULL,
-             REG_PATH_PARENT_ID INT,
-             REG_TENANT_ID INTEGER DEFAULT 0,
-             CONSTRAINT PK_REG_PATH PRIMARY KEY(REG_PATH_ID, REG_TENANT_ID)
-);
-CREATE INDEX IF NOT EXISTS REG_PATH_IND_BY_NAME ON REG_PATH(REG_PATH_VALUE, REG_TENANT_ID);
-CREATE INDEX IF NOT EXISTS REG_PATH_IND_BY_PARENT_ID ON REG_PATH(REG_PATH_PARENT_ID, REG_TENANT_ID);
-
-
-CREATE TABLE IF NOT EXISTS REG_CONTENT (
-             REG_CONTENT_ID INTEGER NOT NULL AUTO_INCREMENT,
-             REG_CONTENT_DATA LONGBLOB,
-             REG_TENANT_ID INTEGER DEFAULT 0,
-             CONSTRAINT PK_REG_CONTENT PRIMARY KEY(REG_CONTENT_ID, REG_TENANT_ID)
-);
-
-CREATE TABLE IF NOT EXISTS REG_CONTENT_HISTORY (
-             REG_CONTENT_ID INTEGER NOT NULL,
-             REG_CONTENT_DATA LONGBLOB,
-             REG_DELETED   SMALLINT,
-             REG_TENANT_ID INTEGER DEFAULT 0,
-             CONSTRAINT PK_REG_CONTENT_HISTORY PRIMARY KEY(REG_CONTENT_ID, REG_TENANT_ID)
-);
-
-CREATE TABLE IF NOT EXISTS REG_RESOURCE (
-            REG_PATH_ID         INTEGER NOT NULL,
-            REG_NAME            VARCHAR(256),
-            REG_VERSION         INTEGER NOT NULL AUTO_INCREMENT,
-            REG_MEDIA_TYPE      VARCHAR(500),
-            REG_CREATOR         VARCHAR(31) NOT NULL,
-            REG_CREATED_TIME    TIMESTAMP NOT NULL,
-            REG_LAST_UPDATOR    VARCHAR(31),
-            REG_LAST_UPDATED_TIME    TIMESTAMP NOT NULL,
-            REG_DESCRIPTION     VARCHAR(1000),
-            REG_CONTENT_ID      INTEGER,
-            REG_TENANT_ID INTEGER DEFAULT 0,
-            REG_UUID VARCHAR(100) NOT NULL,
-            CONSTRAINT PK_REG_RESOURCE PRIMARY KEY(REG_VERSION, REG_TENANT_ID)
-);
-
-ALTER TABLE REG_RESOURCE ADD CONSTRAINT IF NOT EXISTS REG_RESOURCE_FK_BY_PATH_ID FOREIGN KEY (REG_PATH_ID, REG_TENANT_ID) REFERENCES REG_PATH (REG_PATH_ID, REG_TENANT_ID);
-ALTER TABLE REG_RESOURCE ADD CONSTRAINT IF NOT EXISTS REG_RESOURCE_FK_BY_CONTENT_ID FOREIGN KEY (REG_CONTENT_ID, REG_TENANT_ID) REFERENCES REG_CONTENT (REG_CONTENT_ID, REG_TENANT_ID);
-CREATE INDEX IF NOT EXISTS REG_RESOURCE_IND_BY_NAME ON REG_RESOURCE(REG_NAME, REG_TENANT_ID);
-CREATE INDEX IF NOT EXISTS REG_RESOURCE_IND_BY_PATH_ID_NAME ON REG_RESOURCE(REG_PATH_ID, REG_NAME, REG_TENANT_ID);
-CREATE INDEX IF NOT EXISTS REG_RESOURCE_IND_BY_UUID ON REG_RESOURCE(REG_UUID);
-CREATE INDEX IF NOT EXISTS REG_RESOURCE_IND_BY_TENANT ON REG_RESOURCE(REG_TENANT_ID, REG_UUID);
-CREATE INDEX IF NOT EXISTS REG_RESOURCE_IND_BY_TYPE ON REG_RESOURCE(REG_TENANT_ID, REG_MEDIA_TYPE);
-
-CREATE TABLE IF NOT EXISTS REG_RESOURCE_HISTORY (
-            REG_PATH_ID         INTEGER NOT NULL,
-            REG_NAME            VARCHAR(256),
-            REG_VERSION         INTEGER NOT NULL,
-            REG_MEDIA_TYPE      VARCHAR(500),
-            REG_CREATOR         VARCHAR(31) NOT NULL,
-            REG_CREATED_TIME    TIMESTAMP NOT NULL,
-            REG_LAST_UPDATOR    VARCHAR(31),
-            REG_LAST_UPDATED_TIME    TIMESTAMP NOT NULL,
-            REG_DESCRIPTION     VARCHAR(1000),
-            REG_CONTENT_ID      INTEGER,
-            REG_DELETED         SMALLINT,
-            REG_TENANT_ID INTEGER DEFAULT 0,
-            REG_UUID VARCHAR(100) NOT NULL,
-            CONSTRAINT PK_REG_RESOURCE_HISTORY PRIMARY KEY(REG_VERSION, REG_TENANT_ID)
-);
-
-ALTER TABLE REG_RESOURCE_HISTORY ADD CONSTRAINT IF NOT EXISTS REG_RESOURCE_HIST_FK_BY_PATHID FOREIGN KEY (REG_PATH_ID, REG_TENANT_ID) REFERENCES REG_PATH (REG_PATH_ID, REG_TENANT_ID);
-ALTER TABLE REG_RESOURCE_HISTORY ADD CONSTRAINT IF NOT EXISTS REG_RESOURCE_HIST_FK_BY_CONTENT_ID FOREIGN KEY (REG_CONTENT_ID, REG_TENANT_ID) REFERENCES REG_CONTENT_HISTORY (REG_CONTENT_ID, REG_TENANT_ID);
-CREATE INDEX IF NOT EXISTS REG_RESOURCE_HISTORY_IND_BY_NAME ON REG_RESOURCE_HISTORY(REG_NAME, REG_TENANT_ID);
-CREATE INDEX IF NOT EXISTS REG_RESOURCE_HISTORY_IND_BY_PATH_ID_NAME ON REG_RESOURCE(REG_PATH_ID, REG_NAME, REG_TENANT_ID);
-
-CREATE TABLE IF NOT EXISTS REG_COMMENT (
-            REG_ID        INTEGER NOT NULL AUTO_INCREMENT,
-            REG_COMMENT_TEXT      VARCHAR(500) NOT NULL,
-            REG_USER_ID           VARCHAR(31) NOT NULL,
-            REG_COMMENTED_TIME    TIMESTAMP NOT NULL,
-            REG_TENANT_ID INTEGER DEFAULT 0,
-            CONSTRAINT PK_REG_COMMENT PRIMARY KEY(REG_ID, REG_TENANT_ID)
-);
-
-CREATE TABLE IF NOT EXISTS REG_RESOURCE_COMMENT (
-            REG_COMMENT_ID          INTEGER NOT NULL,
-            REG_VERSION             INTEGER,
-            REG_PATH_ID             INTEGER,
-            REG_RESOURCE_NAME       VARCHAR(256),
-            REG_TENANT_ID INTEGER DEFAULT 0
-);
-
-ALTER TABLE REG_RESOURCE_COMMENT ADD CONSTRAINT IF NOT EXISTS REG_RESOURCE_COMMENT_FK_BY_PATH_ID FOREIGN KEY (REG_PATH_ID, REG_TENANT_ID) REFERENCES REG_PATH (REG_PATH_ID, REG_TENANT_ID);
-ALTER TABLE REG_RESOURCE_COMMENT ADD CONSTRAINT IF NOT EXISTS REG_RESOURCE_COMMENT_FK_BY_COMMENT_ID FOREIGN KEY (REG_COMMENT_ID, REG_TENANT_ID) REFERENCES REG_COMMENT (REG_ID, REG_TENANT_ID);
-CREATE INDEX IF NOT EXISTS REG_RESOURCE_COMMENT_IND_BY_PATH_ID_AND_RESOURCE_NAME ON REG_RESOURCE_COMMENT(REG_PATH_ID, REG_RESOURCE_NAME, REG_TENANT_ID);
-CREATE INDEX IF NOT EXISTS REG_RESOURCE_COMMENT_IND_BY_VERSION ON REG_RESOURCE_COMMENT(REG_VERSION, REG_TENANT_ID);
-
-CREATE TABLE IF NOT EXISTS REG_RATING (
-            REG_ID     INTEGER NOT NULL AUTO_INCREMENT,
-            REG_RATING        INTEGER NOT NULL,
-            REG_USER_ID       VARCHAR(31) NOT NULL,
-            REG_RATED_TIME    TIMESTAMP NOT NULL,
-            REG_TENANT_ID INTEGER DEFAULT 0,
-            CONSTRAINT PK_REG_RATING PRIMARY KEY(REG_ID, REG_TENANT_ID)
-);
-
-CREATE TABLE IF NOT EXISTS REG_RESOURCE_RATING (
-            REG_RATING_ID           INTEGER NOT NULL,
-            REG_VERSION             INTEGER,
-            REG_PATH_ID             INTEGER,
-            REG_RESOURCE_NAME       VARCHAR(256),
-            REG_TENANT_ID INTEGER DEFAULT 0
-);
-
-ALTER TABLE REG_RESOURCE_RATING ADD CONSTRAINT IF NOT EXISTS REG_RESOURCE_RATING_FK_BY_PATH_ID FOREIGN KEY (REG_PATH_ID, REG_TENANT_ID) REFERENCES REG_PATH (REG_PATH_ID, REG_TENANT_ID);
-ALTER TABLE REG_RESOURCE_RATING ADD CONSTRAINT IF NOT EXISTS REG_RESOURCE_RATING_FK_BY_RATING_ID FOREIGN KEY (REG_RATING_ID, REG_TENANT_ID) REFERENCES REG_RATING (REG_ID, REG_TENANT_ID);
-CREATE INDEX IF NOT EXISTS REG_RESOURCE_RATING_IND_BY_PATH_ID_AND_RESOURCE_NAME ON REG_RESOURCE_RATING(REG_PATH_ID, REG_RESOURCE_NAME, REG_TENANT_ID);
-CREATE INDEX IF NOT EXISTS REG_RESOURCE_RATING_IND_BY_VERSION ON REG_RESOURCE_RATING(REG_VERSION, REG_TENANT_ID);
-
-
-CREATE TABLE IF NOT EXISTS REG_TAG (
-            REG_ID         INTEGER NOT NULL AUTO_INCREMENT,
-            REG_TAG_NAME       VARCHAR(500) NOT NULL,
-            REG_USER_ID        VARCHAR(31) NOT NULL,
-            REG_TAGGED_TIME    TIMESTAMP NOT NULL,
-            REG_TENANT_ID INTEGER DEFAULT 0,
-            CONSTRAINT PK_REG_TAG PRIMARY KEY(REG_ID, REG_TENANT_ID)
-);
-
-CREATE TABLE IF NOT EXISTS REG_RESOURCE_TAG (
-            REG_TAG_ID              INTEGER NOT NULL,
-            REG_VERSION             INTEGER,
-            REG_PATH_ID             INTEGER,
-            REG_RESOURCE_NAME       VARCHAR(256),
-            REG_TENANT_ID INTEGER DEFAULT 0
-);
-
-ALTER TABLE REG_RESOURCE_TAG ADD CONSTRAINT IF NOT EXISTS REG_RESOURCE_TAG_FK_BY_PATH_ID FOREIGN KEY (REG_PATH_ID, REG_TENANT_ID) REFERENCES REG_PATH (REG_PATH_ID, REG_TENANT_ID);
-ALTER TABLE REG_RESOURCE_TAG ADD CONSTRAINT IF NOT EXISTS REG_RESOURCE_TAG_FK_BY_TAG_ID FOREIGN KEY (REG_TAG_ID, REG_TENANT_ID) REFERENCES REG_TAG (REG_ID, REG_TENANT_ID);
-CREATE INDEX IF NOT EXISTS REG_RESOURCE_TAG_IND_BY_PATH_ID_AND_RESOURCE_NAME ON REG_RESOURCE_TAG(REG_PATH_ID, REG_RESOURCE_NAME, REG_TENANT_ID);
-CREATE INDEX IF NOT EXISTS REG_RESOURCE_TAG_IND_BY_VERSION ON REG_RESOURCE_TAG(REG_VERSION, REG_TENANT_ID);
-
-CREATE TABLE IF NOT EXISTS REG_PROPERTY (
-            REG_ID         INTEGER NOT NULL AUTO_INCREMENT,
-            REG_NAME       VARCHAR(100) NOT NULL,
-            REG_VALUE        VARCHAR(1000),
-            REG_TENANT_ID INTEGER DEFAULT 0,
-            CONSTRAINT PK_REG_PROPERTY PRIMARY KEY(REG_ID, REG_TENANT_ID)
-);
-
-CREATE TABLE IF NOT EXISTS REG_RESOURCE_PROPERTY (
-            REG_PROPERTY_ID         INTEGER NOT NULL,
-            REG_VERSION             INTEGER,
-            REG_PATH_ID             INTEGER,
-            REG_RESOURCE_NAME       VARCHAR(256),
-            REG_TENANT_ID INTEGER DEFAULT 0
-);
-
-ALTER TABLE REG_RESOURCE_PROPERTY ADD CONSTRAINT IF NOT EXISTS REG_RESOURCE_PROPERTY_FK_BY_PATH_ID FOREIGN KEY (REG_PATH_ID, REG_TENANT_ID) REFERENCES REG_PATH (REG_PATH_ID, REG_TENANT_ID);
-ALTER TABLE REG_RESOURCE_PROPERTY ADD CONSTRAINT IF NOT EXISTS REG_RESOURCE_PROPERTY_FK_BY_TAG_ID FOREIGN KEY (REG_PROPERTY_ID, REG_TENANT_ID) REFERENCES REG_PROPERTY (REG_ID, REG_TENANT_ID);
-CREATE INDEX IF NOT EXISTS REG_RESOURCE_PROPERTY_IND_BY_PATH_ID_AND_RESOURCE_NAME ON REG_RESOURCE_PROPERTY(REG_PATH_ID, REG_RESOURCE_NAME, REG_TENANT_ID);
-CREATE INDEX IF NOT EXISTS REG_RESOURCE_PROPERTY_IND_BY_VERSION ON REG_RESOURCE_PROPERTY(REG_VERSION, REG_TENANT_ID);
-
-CREATE TABLE IF NOT EXISTS REG_ASSOCIATION (
-            REG_ASSOCIATION_ID INTEGER AUTO_INCREMENT,
-            REG_SOURCEPATH VARCHAR (2000) NOT NULL,
-            REG_TARGETPATH VARCHAR (2000) NOT NULL,
-            REG_ASSOCIATION_TYPE VARCHAR (2000) NOT NULL,
-            REG_TENANT_ID INTEGER DEFAULT 0,
-            PRIMARY KEY (REG_ASSOCIATION_ID, REG_TENANT_ID)
-);
-
-CREATE TABLE IF NOT EXISTS REG_SNAPSHOT (
-            REG_SNAPSHOT_ID     INTEGER NOT NULL AUTO_INCREMENT,
-            REG_PATH_ID            INTEGER NOT NULL,
-            REG_RESOURCE_NAME VARCHAR (256),
-            REG_RESOURCE_VIDS     LONGBLOB NOT NULL,
-            REG_TENANT_ID INTEGER DEFAULT 0,
-            CONSTRAINT PK_REG_SNAPSHOT PRIMARY KEY(REG_SNAPSHOT_ID, REG_TENANT_ID)
-);
-
-ALTER TABLE REG_SNAPSHOT ADD CONSTRAINT IF NOT EXISTS REG_SNAPSHOT_FK_BY_PATH_ID FOREIGN KEY (REG_PATH_ID, REG_TENANT_ID) REFERENCES REG_PATH (REG_PATH_ID, REG_TENANT_ID);
-CREATE INDEX IF NOT EXISTS REG_SNAPSHOT_IND_BY_PATH_ID_AND_RESOURCE_NAME ON REG_SNAPSHOT(REG_PATH_ID, REG_RESOURCE_NAME, REG_TENANT_ID);
-
--- ################################
--- USER MANAGER TABLES
--- ################################
-
-CREATE TABLE IF NOT EXISTS UM_TENANT (
-			UM_ID INTEGER NOT NULL AUTO_INCREMENT,
-			UM_DOMAIN_NAME VARCHAR(255) NOT NULL,
-	        UM_EMAIL VARCHAR(255),
-	        UM_ACTIVE BOOLEAN DEFAULT FALSE,
-	        UM_CREATED_DATE TIMESTAMP NOT NULL,
-	        UM_USER_CONFIG LONGBLOB NOT NULL,
-			PRIMARY KEY (UM_ID),
-			UNIQUE(UM_DOMAIN_NAME));
-
-CREATE TABLE IF NOT EXISTS UM_DOMAIN(
-            UM_DOMAIN_ID INTEGER NOT NULL AUTO_INCREMENT,
-            UM_DOMAIN_NAME VARCHAR(255),
-            UM_TENANT_ID INTEGER DEFAULT 0,
-            PRIMARY KEY (UM_DOMAIN_ID, UM_TENANT_ID)
-);
-
-CREATE INDEX IF NOT EXISTS INDEX_UM_TENANT_UM_DOMAIN_NAME ON UM_TENANT (UM_DOMAIN_NAME); 
-
-CREATE TABLE IF NOT EXISTS UM_USER (
-			UM_ID INTEGER NOT NULL AUTO_INCREMENT,
-			UM_USER_NAME VARCHAR(255) NOT NULL,
-			UM_USER_PASSWORD VARCHAR(255) NOT NULL,
-			UM_SALT_VALUE VARCHAR(31),
-			UM_REQUIRE_CHANGE BOOLEAN DEFAULT FALSE,
-            UM_CHANGED_TIME TIMESTAMP NOT NULL,
-			UM_TENANT_ID INTEGER DEFAULT 0,
-			PRIMARY KEY (UM_ID, UM_TENANT_ID),
-			UNIQUE(UM_USER_NAME, UM_TENANT_ID));
-
-CREATE TABLE IF NOT EXISTS UM_SYSTEM_USER (
-			UM_ID INTEGER NOT NULL AUTO_INCREMENT,
-			UM_USER_NAME VARCHAR(255) NOT NULL,
-			UM_USER_PASSWORD VARCHAR(255) NOT NULL,
-			UM_SALT_VALUE VARCHAR(31),
-			UM_REQUIRE_CHANGE BOOLEAN DEFAULT FALSE,
-            UM_CHANGED_TIME TIMESTAMP NOT NULL,
-			UM_TENANT_ID INTEGER DEFAULT 0,
-			PRIMARY KEY (UM_ID, UM_TENANT_ID),
-			UNIQUE(UM_USER_NAME, UM_TENANT_ID));
-
-CREATE TABLE IF NOT EXISTS UM_USER_ATTRIBUTE (
-			UM_ID INTEGER NOT NULL AUTO_INCREMENT,
-			UM_ATTR_NAME VARCHAR(255) NOT NULL,
-			UM_ATTR_VALUE VARCHAR(1024),
-            UM_PROFILE_ID VARCHAR(255),
-            UM_USER_ID INTEGER,
-            UM_TENANT_ID INTEGER DEFAULT 0,
-			PRIMARY KEY (UM_ID, UM_TENANT_ID),
-			FOREIGN KEY (UM_USER_ID, UM_TENANT_ID) REFERENCES UM_USER(UM_ID, UM_TENANT_ID));
-
-CREATE INDEX IF NOT EXISTS UM_USER_ID_INDEX ON UM_USER_ATTRIBUTE(UM_USER_ID);
-
-CREATE TABLE IF NOT EXISTS UM_ROLE (
-			UM_ID INTEGER NOT NULL AUTO_INCREMENT,
-			UM_ROLE_NAME VARCHAR(255) NOT NULL,
-			UM_TENANT_ID INTEGER DEFAULT 0,
-			UM_SHARED_ROLE BOOLEAN DEFAULT FALSE,
-			PRIMARY KEY (UM_ID, UM_TENANT_ID),
-			UNIQUE(UM_ROLE_NAME, UM_TENANT_ID));
-
-CREATE TABLE IF NOT EXISTS UM_MODULE(
-	UM_ID INTEGER  NOT NULL AUTO_INCREMENT,
-	UM_MODULE_NAME VARCHAR(100),
-	UNIQUE(UM_MODULE_NAME),
-	PRIMARY KEY(UM_ID)
-);
-
-CREATE TABLE IF NOT EXISTS UM_MODULE_ACTIONS(
-	UM_ACTION VARCHAR(255) NOT NULL,
-	UM_MODULE_ID INTEGER NOT NULL,
-	PRIMARY KEY(UM_ACTION, UM_MODULE_ID),
-	FOREIGN KEY (UM_MODULE_ID) REFERENCES UM_MODULE(UM_ID) ON DELETE CASCADE
-);
-
-CREATE TABLE IF NOT EXISTS UM_PERMISSION (
-			UM_ID INTEGER NOT NULL AUTO_INCREMENT,
-			UM_RESOURCE_ID VARCHAR(255) NOT NULL,
-			UM_ACTION VARCHAR(255) NOT NULL,
-			UM_TENANT_ID INTEGER DEFAULT 0,
-			UM_MODULE_ID INTEGER DEFAULT 0,
-			UNIQUE(UM_RESOURCE_ID,UM_ACTION, UM_TENANT_ID),
-			PRIMARY KEY (UM_ID, UM_TENANT_ID));
-
-CREATE INDEX IF NOT EXISTS INDEX_UM_PERMISSION_UM_RESOURCE_ID_UM_ACTION ON UM_PERMISSION (UM_RESOURCE_ID, UM_ACTION, UM_TENANT_ID);
-
-CREATE TABLE IF NOT EXISTS UM_ROLE_PERMISSION (
-			UM_ID INTEGER NOT NULL AUTO_INCREMENT,
-			UM_PERMISSION_ID INTEGER NOT NULL,
-			UM_ROLE_NAME VARCHAR(255) NOT NULL,
-            		UM_IS_ALLOWED SMALLINT NOT NULL,
-			UM_TENANT_ID INTEGER DEFAULT 0,
-			UM_DOMAIN_ID INTEGER,
-			FOREIGN KEY (UM_PERMISSION_ID, UM_TENANT_ID) REFERENCES UM_PERMISSION(UM_ID, UM_TENANT_ID) ON DELETE CASCADE,
-			FOREIGN KEY (UM_DOMAIN_ID, UM_TENANT_ID) REFERENCES UM_DOMAIN(UM_DOMAIN_ID, UM_TENANT_ID) ON DELETE CASCADE,
-			PRIMARY KEY (UM_ID, UM_TENANT_ID));
-
-CREATE TABLE IF NOT EXISTS UM_USER_PERMISSION (
-			UM_ID INTEGER NOT NULL AUTO_INCREMENT,
-			UM_PERMISSION_ID INTEGER NOT NULL,
-			UM_USER_NAME VARCHAR(255) NOT NULL,
-            UM_IS_ALLOWED SMALLINT NOT NULL,
-			UNIQUE (UM_PERMISSION_ID, UM_USER_NAME, UM_TENANT_ID),
-			UM_TENANT_ID INTEGER DEFAULT 0,
-			FOREIGN KEY (UM_PERMISSION_ID, UM_TENANT_ID) REFERENCES UM_PERMISSION(UM_ID, UM_TENANT_ID) ON DELETE CASCADE,
-			PRIMARY KEY (UM_ID, UM_TENANT_ID));
-
-CREATE TABLE IF NOT EXISTS UM_USER_ROLE (
-			UM_ID INTEGER NOT NULL AUTO_INCREMENT,
-			UM_ROLE_ID INTEGER NOT NULL,
-			UM_USER_ID INTEGER NOT NULL,
-			UM_TENANT_ID INTEGER DEFAULT 0,
-			UNIQUE (UM_USER_ID, UM_ROLE_ID, UM_TENANT_ID),
-			FOREIGN KEY (UM_ROLE_ID, UM_TENANT_ID) REFERENCES UM_ROLE(UM_ID, UM_TENANT_ID),
-			FOREIGN KEY (UM_USER_ID, UM_TENANT_ID) REFERENCES UM_USER(UM_ID, UM_TENANT_ID),
-			PRIMARY KEY (UM_ID, UM_TENANT_ID));
-
-
-CREATE TABLE IF NOT EXISTS UM_SHARED_USER_ROLE(
-    UM_ROLE_ID INTEGER NOT NULL,
-    UM_USER_ID INTEGER NOT NULL,
-    UM_USER_TENANT_ID INTEGER NOT NULL,
-    UM_ROLE_TENANT_ID INTEGER NOT NULL,
-    UNIQUE(UM_USER_ID,UM_ROLE_ID,UM_USER_TENANT_ID, UM_ROLE_TENANT_ID),
-    FOREIGN KEY(UM_ROLE_ID,UM_ROLE_TENANT_ID) REFERENCES UM_ROLE(UM_ID,UM_TENANT_ID) ON DELETE CASCADE ,
-    FOREIGN KEY(UM_USER_ID,UM_USER_TENANT_ID) REFERENCES UM_USER(UM_ID,UM_TENANT_ID) ON DELETE CASCADE 
-);
-
-CREATE TABLE IF NOT EXISTS UM_ACCOUNT_MAPPING(
-	UM_ID INTEGER NOT NULL AUTO_INCREMENT,
-	UM_USER_NAME VARCHAR(255) NOT NULL,
-	UM_TENANT_ID INTEGER NOT NULL,
-	UM_USER_STORE_DOMAIN VARCHAR(100),
-	UM_ACC_LINK_ID INTEGER NOT NULL,
-	UNIQUE(UM_USER_NAME, UM_TENANT_ID, UM_USER_STORE_DOMAIN, UM_ACC_LINK_ID),
-	FOREIGN KEY (UM_TENANT_ID) REFERENCES UM_TENANT(UM_ID) ON DELETE CASCADE,
-	PRIMARY KEY (UM_ID)
-);
-
-
-CREATE TABLE IF NOT EXISTS UM_DIALECT(
-            UM_ID INTEGER NOT NULL AUTO_INCREMENT,
-            UM_DIALECT_URI VARCHAR(255) NOT NULL,
-            UM_TENANT_ID INTEGER DEFAULT 0,
-            UNIQUE(UM_DIALECT_URI, UM_TENANT_ID),
-            PRIMARY KEY (UM_ID, UM_TENANT_ID)
-);
-
-
-CREATE TABLE IF NOT EXISTS UM_CLAIM(
-            UM_ID INTEGER NOT NULL AUTO_INCREMENT,
-            UM_DIALECT_ID INTEGER NOT NULL,
-            UM_CLAIM_URI VARCHAR(255) NOT NULL,
-            UM_DISPLAY_TAG VARCHAR(255),
-            UM_DESCRIPTION VARCHAR(255),
-            UM_MAPPED_ATTRIBUTE_DOMAIN VARCHAR(255),
-            UM_MAPPED_ATTRIBUTE VARCHAR(255),
-            UM_REG_EX VARCHAR(255),
-            UM_SUPPORTED SMALLINT,
-            UM_REQUIRED SMALLINT,
-            UM_DISPLAY_ORDER INTEGER,
-            UM_CHECKED_ATTRIBUTE SMALLINT,
-            UM_READ_ONLY SMALLINT,
-            UM_TENANT_ID INTEGER DEFAULT 0,
-            UNIQUE(UM_DIALECT_ID, UM_CLAIM_URI,UM_MAPPED_ATTRIBUTE_DOMAIN, UM_TENANT_ID),
-            FOREIGN KEY(UM_DIALECT_ID, UM_TENANT_ID) REFERENCES UM_DIALECT(UM_ID, UM_TENANT_ID),
-            PRIMARY KEY (UM_ID, UM_TENANT_ID)
-);
-
-CREATE TABLE IF NOT EXISTS UM_PROFILE_CONFIG(
-            UM_ID INTEGER NOT NULL AUTO_INCREMENT,
-            UM_DIALECT_ID INTEGER,
-            UM_PROFILE_NAME VARCHAR(255),
-            UM_TENANT_ID INTEGER DEFAULT 0,
-            FOREIGN KEY(UM_DIALECT_ID, UM_TENANT_ID) REFERENCES UM_DIALECT(UM_ID, UM_TENANT_ID),
-            PRIMARY KEY (UM_ID, UM_TENANT_ID)
-);
-
-
-CREATE TABLE IF NOT EXISTS UM_HYBRID_ROLE(
-            UM_ID INTEGER NOT NULL AUTO_INCREMENT,
-            UM_ROLE_NAME VARCHAR(255),
-            UM_TENANT_ID INTEGER DEFAULT 0,
-            PRIMARY KEY (UM_ID, UM_TENANT_ID)
-);
-
-CREATE TABLE IF NOT EXISTS UM_HYBRID_USER_ROLE(
-            UM_ID INTEGER NOT NULL AUTO_INCREMENT,
-            UM_USER_NAME VARCHAR(255),
-            UM_ROLE_ID INTEGER NOT NULL,
-            UM_TENANT_ID INTEGER DEFAULT 0,
-	    UM_DOMAIN_ID INTEGER,
-            UNIQUE (UM_USER_NAME, UM_ROLE_ID, UM_TENANT_ID,UM_DOMAIN_ID),
-            FOREIGN KEY (UM_ROLE_ID, UM_TENANT_ID) REFERENCES UM_HYBRID_ROLE(UM_ID, UM_TENANT_ID) ON DELETE CASCADE,
-	    FOREIGN KEY (UM_DOMAIN_ID, UM_TENANT_ID) REFERENCES UM_DOMAIN(UM_DOMAIN_ID, UM_TENANT_ID) ON DELETE CASCADE,
-            PRIMARY KEY (UM_ID, UM_TENANT_ID)
-);
-
-CREATE TABLE IF NOT EXISTS UM_HYBRID_REMEMBER_ME (
-            UM_ID INTEGER NOT NULL AUTO_INCREMENT,
-			UM_USER_NAME VARCHAR(255) NOT NULL,
-			UM_COOKIE_VALUE VARCHAR(1024),
-			UM_CREATED_TIME TIMESTAMP,
-            UM_TENANT_ID INTEGER DEFAULT 0,
-			PRIMARY KEY (UM_ID, UM_TENANT_ID)
-);
-
-CREATE TABLE IF NOT EXISTS UM_SYSTEM_ROLE(
-            UM_ID INTEGER NOT NULL AUTO_INCREMENT,
-            UM_ROLE_NAME VARCHAR(255),
-            UM_TENANT_ID INTEGER DEFAULT 0,
-            PRIMARY KEY (UM_ID, UM_TENANT_ID)
-);
-
-CREATE TABLE IF NOT EXISTS UM_SYSTEM_USER_ROLE(
-            UM_ID INTEGER NOT NULL AUTO_INCREMENT,
-            UM_USER_NAME VARCHAR(255),
-            UM_ROLE_ID INTEGER NOT NULL,
-            UM_TENANT_ID INTEGER DEFAULT 0,
-            UNIQUE (UM_USER_NAME, UM_ROLE_ID, UM_TENANT_ID),
-            FOREIGN KEY (UM_ROLE_ID, UM_TENANT_ID) REFERENCES UM_SYSTEM_ROLE(UM_ID, UM_TENANT_ID),
-            PRIMARY KEY (UM_ID, UM_TENANT_ID)
-);
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/license.rxt b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/license.rxt
deleted file mode 100644
index 3fa9d8b7c9..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/license.rxt
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<artifactType type="application/vnd.wso2-license+xml" shortName="license" singularLabel="License" pluralLabel="Licenses"
-              hasNamespace="false" iconSet="10">
-    <storagePath>/device-mgt/license/@{overview_name}/@{overview_language}/@{overview_version}</storagePath>
-    <nameAttribute>overview_name</nameAttribute>
-    <ui>
-        <list>
-            <column name="Device Type">
-                <data type="path" value="overview_name" href="@{storagePath}"/>
-            </column>
-            <column name="Language">
-                <data type="path" value="overview_language" href="@{storagePath}"/>
-            </column>
-            <column name="Version">
-                <data type="path" value="overview_version" href="@{storagePath}"/>
-            </column>
-        </list>
-    </ui>
-    <content>
-        <table name="Overview">
-            <field type="text" required="true">
-                <name>Name</name>
-            </field>
-            <field type="text" required="true">
-                <name>Language</name>
-            </field>
-            <field type="text" required="true">
-                <name>Version</name>
-            </field>
-            <field type="text">
-                <name>Validity From</name>
-            </field>
-            <field type="text">
-                <name>Validity To</name>
-            </field>
-            <field type="text-area">
-                <name>License</name>
-            </field>
-        </table>
-    </content>
-</artifactType>
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml
deleted file mode 100644
index bd4b1d8c4a..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/axis2/axis2.xml
+++ /dev/null
@@ -1,723 +0,0 @@
-<!--
-  ~ Copyright 2005-2017 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.
-  -->
-
-<axisconfig name="AxisJava2.0">
-
-    <!-- ================================================= -->
-    <!-- Globally engaged modules -->
-    <!-- ================================================= -->
-    <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>
-
-    <parameter name="EnableChildFirstClassLoading">${childfirstCL}</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 turned on with use the Accept header of the request to determine the contentType of the
-    response-->
-    <parameter name="httpContentNegotiation">true</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-->
-    <parameter name="disableREST" locked="false">false</parameter>
-
-    <parameter name="Sandesha2StorageManager">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>
-
-    <!--the directory in which .aar services are deployed inside axis2 repository-->
-    <parameter name="ServicesDirectory">axis2services</parameter>
-
-    <!--the directory in which modules are deployed inside axis2 repository-->
-    <parameter name="ModulesDirectory">axis2modules</parameter>
-
-    <parameter name="userAgent" locked="true">
-        @product.name@-@product.version@
-    </parameter>
-    <parameter name="server" locked="true">
-        @product.name@-@product.version@
-    </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 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 mangment-->
-    <parameter name="manageTransportSession">true</parameter>
-
-    <!-- Synapse Configuration file -->
-    <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>
-
-    <!--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>
-
-    <!-- Deployer for the dataservice. -->
-    <!--<deployer extensions="dbs" directory="dataservices" class="org.wso2.dataservices.DBDeployer"/>-->
-
-    <!-- Axis1 deployer for Axis2-->
-    <!--<deployer extensions="wsdd" class="org.wso2.carbon.axis1services.Axis1Deployer" directory="axis1services"/>-->
-
-    <!-- POJO service deployer for Jar -->
-    <!--<deployer extensions="jar" class="org.apache.axis2.deployment.POJODeployer" directory="pojoservices"/>-->
-
-    <!-- POJO service deployer for Class  -->
-    <!--<deployer extensions="class" class="org.apache.axis2.deployment.POJODeployer" directory="pojoservices"/>-->
-
-    <!-- JAXWS service deployer  -->
-    <!--<deployer extensions=".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-->
-
-    <messageReceivers>
-        <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only"
-                         class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"/>
-        <messageReceiver mep="http://www.w3.org/ns/wsdl/robust-in-only"
-                         class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"/>
-        <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out"
-                         class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
-    </messageReceivers>
-
-    <messageFormatters>
-        <messageFormatter contentType="application/x-www-form-urlencoded"
-                          class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
-        <messageFormatter contentType="multipart/form-data"
-                          class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
-        <messageFormatter contentType="application/xml"
-                          class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
-        <messageFormatter contentType="text/xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
-        <messageFormatter contentType="application/soap+xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
-
-        <!--JSON Message Formatters-->
-        <!--messageFormatter contentType="application/json"
-                          class="org.apache.axis2.json.JSONMessageFormatter"/-->
-        <messageFormatter contentType="application/json"
-                                  class="org.apache.axis2.json.gson.JsonFormatter" />
-        <messageFormatter contentType="application/json/badgerfish"
-                          class="org.apache.axis2.json.JSONBadgerfishMessageFormatter"/>
-        <!--messageFormatter contentType="text/javascript"
-                          class="org.apache.axis2.json.JSONMessageFormatter"/-->
-        <messageFormatter contentType="text/javascript"
-                                  class="org.apache.axis2.json.gson.JsonFormatter" />
-
-        <!--messageFormatter contentType="application/x-www-form-urlencoded"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
-        <!--messageFormatter contentType="multipart/form-data"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
-        <!--messageFormatter contentType="application/xml"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
-        <!--messageFormatter contentType="text/html"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
-        <!--messageFormatter contentType="application/soap+xml"
-                        class="org.wso2.carbon.relay.ExpandingMessageFormatter"/-->
-        <!--messageFormatter contentType="x-application/hessian"
-			class="org.apache.synapse.format.hessian.HessianMessageFormatter"/-->
-        <!--<messageFormatter contentType="">
-			class="org.apache.synapse.format.hessian.HessianMessageFormatter"/-->
-    </messageFormatters>
-
-    <messageBuilders>
-        <messageBuilder contentType="application/xml"
-                        class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
-        <messageBuilder contentType="application/x-www-form-urlencoded"
-                        class="org.apache.axis2.builder.XFormURLEncodedBuilder"/>
-        <messageBuilder contentType="multipart/form-data"
-                        class="org.apache.axis2.builder.MultipartFormDataBuilder"/>
-
-        <!--JSON Message Builders-->
-        <!--messageBuilder contentType="application/json"
-                        class="org.apache.axis2.json.JSONOMBuilder"/-->
-        <messageBuilder contentType="application/json"
-                                class="org.apache.axis2.json.gson.JsonBuilder" />
-        <messageBuilder contentType="application/json/badgerfish"
-                        class="org.apache.axis2.json.JSONBadgerfishOMBuilder"/>
-        <!--messageBuilder contentType="text/javascript"
-                        class="org.apache.axis2.json.JSONOMBuilder"/-->
-        <messageBuilder contentType="text/javascript"
-                                class="org.apache.axis2.json.gson.JsonBuilder" />
-
-        <!--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"/-->
-        <!--messageBuilder contentType="x-application/hessian"
-		       class="org.apache.synapse.format.hessian.HessianMessageBuilder"/-->
-    </messageBuilders>
-
-
-    <!-- ================================================= -->
-    <!-- In Transports -->
-    <!-- ================================================= -->
-    <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>
-
-    <!--Please uncomment this in Multiple Instance Scenario if you want to use NIO Transport Recievers and 
- 	Remove the current transport REceivers in axis2.xml -->
-    <!--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="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-->
-
-
-    <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 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>
-
-    <!--
-       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>-->
-
-    <!--
-     To Enable Mail Transport Listener, please uncomment the following.
-    -->
-    <!--<transportReceiver name="mailto" class="org.apache.axis2.transport.mail.MailTransportListener">
-
-    </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>
-        </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>
-
-        <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>
-    </transportReceiver>-->
-
-    <!--Uncomment this and configure as appropriate for JMS transport support with Apache Qpid -->
-    <!--transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
-        <parameter name="myTopicConnectionFactory" locked="false">
-            <parameter name="java.naming.factory.initial" locked="false">org.apache.qpid.jndi.PropertiesFileInitialContextFactory</parameter>
-            <parameter name="java.naming.provider.url" locked="false">repository/conf/jndi.properties</parameter>
-            <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter>
-            <parameter name="transport.jms.ConnectionFactoryType" locked="false">topic</parameter>
-        </parameter>
-
-        <parameter name="myQueueConnectionFactory" locked="false">
-            <parameter name="java.naming.factory.initial" locked="false">org.apache.qpid.jndi.PropertiesFileInitialContextFactory</parameter>
-            <parameter name="java.naming.provider.url" locked="false">repository/conf/jndi.properties</parameter>
-            <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
-            <parameter name="transport.jms.ConnectionFactoryType" locked="false">queue</parameter>
-        </parameter>
-
-        <parameter name="default" locked="false">
-            <parameter name="java.naming.factory.initial" locked="false">org.apache.qpid.jndi.PropertiesFileInitialContextFactory</parameter>
-            <parameter name="java.naming.provider.url" locked="false">repository/conf/jndi.properties</parameter>
-            <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
-            <parameter name="transport.jms.ConnectionFactoryType" locked="false">queue</parameter>
-        </parameter>
-    </transportReceiver-->
-
-    <!--Uncomment this and configure as appropriate for JMS transport support with WSO2 MB 2.x.x -->
-    <!--transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
-        <parameter name="myTopicConnectionFactory" locked="false">
-           <parameter name="java.naming.factory.initial" locked="false">org.wso2.andes.jndi.PropertiesFileInitialContextFactory</parameter>
-            <parameter name="java.naming.provider.url" locked="false">repository/conf/jndi.properties</parameter>
-            <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter>
-            <parameter name="transport.jms.ConnectionFactoryType" locked="false">topic</parameter>
-        </parameter>
-
-        <parameter name="myQueueConnectionFactory" locked="false">
-            <parameter name="java.naming.factory.initial" locked="false">org.wso2.andes.jndi.PropertiesFileInitialContextFactory</parameter>
-            <parameter name="java.naming.provider.url" locked="false">repository/conf/jndi.properties</parameter>
-            <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
-           <parameter name="transport.jms.ConnectionFactoryType" locked="false">queue</parameter>
-        </parameter>
-
-        <parameter name="default" locked="false">
-            <parameter name="java.naming.factory.initial" locked="false">org.wso2.andes.jndi.PropertiesFileInitialContextFactory</parameter>
-            <parameter name="java.naming.provider.url" locked="false">repository/conf/jndi.properties</parameter>
-            <parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
-            <parameter name="transport.jms.ConnectionFactoryType" locked="false">queue</parameter>
-        </parameter>
-    </transportReceiver-->
-
-
-    <!-- ================================================= -->
-    <!-- Out Transports -->
-    <!-- ================================================= -->
-
-    <!--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>
-
-    <!-- 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">
-        <parameter name="non-blocking" locked="false">true</parameter>
-    </transportSender>
-    <transportSender name="https" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSSLSender">
-        <parameter name="non-blocking" locked="false">true</parameter>
-        <parameter name="keystore" locked="false">
-            <KeyStore>
-                <Location>repository/resources/security/wso2carbon.jks</Location>
-                <Type>JKS</Type>
-                <Password>wso2carbon</Password>
-                <KeyPassword>wso2carbon</KeyPassword>
-            </KeyStore>
-        </parameter>
-        <parameter name="truststore" locked="false">
-            <TrustStore>
-                <Location>repository/resources/security/client-truststore.jks</Location>
-                <Type>JKS</Type>
-                <Password>wso2carbon</Password>
-            </TrustStore>
-        </parameter>
-    </transportSender>
-	-->
-
-
-    <!-- ================================================= -->
-    <!-- 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"/>
-
-        <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="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher" />
-            <handler name="JSONMessageHandler"
-                     class="org.apache.axis2.json.gson.JSONMessageHandler" />
-        </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="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="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>
-
-    <clustering class="org.wso2.carbon.core.clustering.hazelcast.HazelcastClusteringAgent"
-                enable="false">
-
-        <!--
-           This parameter indicates whether the cluster has to be automatically initalized
-           when the AxisConfiguration is built. If set to "true" the initialization will not be
-           done at that stage, and some other party will have to explictly initialize the cluster.
-        -->
-        <parameter name="AvoidInitiation">true</parameter>
-
-        <!--
-           The membership scheme used in this setup. The only values supported at the moment are
-           "multicast" and "wka"
-
-           1. multicast - membership is automatically discovered using multicasting
-           2. wka - Well-Known Address based multicasting. Membership is discovered with the help
-                    of one or more nodes running at a Well-Known Address. New members joining a
-                    cluster will first connect to a well-known node, register with the well-known node
-                    and get the membership list from it. When new members join, one of the well-known
-                    nodes will notify the others in the group. When a member leaves the cluster or
-                    is deemed to have left the cluster, it will be detected by the Group Membership
-                    Service (GMS) using a TCP ping mechanism.
-        -->
-        <parameter name="membershipScheme">multicast</parameter>
-        <!--<parameter name="licenseKey">xxx</parameter>-->
-        <!--<parameter name="mgtCenterURL">http://localhost:8081/mancenter/</parameter>-->
-
-        <!--
-         The clustering domain/group. Nodes in the same group will belong to the same multicast
-         domain. There will not be interference between nodes in different groups.
-        -->
-        <parameter name="domain">wso2.carbon.domain</parameter>
-
-        <!-- The multicast address to be used -->
-        <!--<parameter name="mcastAddress">228.0.0.4</parameter>-->
-
-        <!-- The multicast port to be used -->
-        <parameter name="mcastPort">45564</parameter>
-
-        <parameter name="mcastTTL">100</parameter>
-
-        <parameter name="mcastTimeout">60</parameter>
-
-        <!--
-           The IP address of the network interface to which the multicasting has to be bound to.
-           Multicasting would be done using this interface.
-        -->
-        <!--
-            <parameter name="mcastBindAddress">127.0.0.1</parameter>
-        -->
-        <!-- The host name or IP address of this member -->
-
-        <parameter name="localMemberHost">127.0.0.1</parameter>
-
-        <!--
-            The bind adress of this member. The difference between localMemberHost & localMemberBindAddress
-            is that localMemberHost is the one that is advertised by this member, while localMemberBindAddress
-            is the address to which this member is bound to.
-        -->
-        <!--
-        <parameter name="localMemberBindAddress">127.0.0.1</parameter>
-        -->
-
-        <!--
-        The TCP port used by this member. This is the port through which other nodes will
-        contact this member
-         -->
-        <parameter name="localMemberPort">4000</parameter>
-
-        <!--
-            The bind port of this member. The difference between localMemberPort & localMemberBindPort
-            is that localMemberPort is the one that is advertised by this member, while localMemberBindPort
-            is the port to which this member is bound to.
-        -->
-        <!--
-        <parameter name="localMemberBindPort">4001</parameter>
-        -->
-
-        <!--
-        Properties specific to this member
-        -->
-        <parameter name="properties">
-            <property name="backendServerURL" value="https://${hostName}:${httpsPort}/services/"/>
-            <property name="mgtConsoleURL" value="https://${hostName}:${httpsPort}/"/>
-            <property name="subDomain" value="worker"/>
-        </parameter>
-
-        <!--
-        Uncomment the following section to load custom Hazelcast data serializers.
-        -->
-        <!--
-        <parameter name="hazelcastSerializers">
-            <serializer typeClass="java.util.TreeSet">org.wso2.carbon.hazelcast.serializer.TreeSetSerializer
-            </serializer>
-            <serializer typeClass="java.util.Map">org.wso2.carbon.hazelcast.serializer.MapSerializer</serializer>
-        </parameter>
-        -->
-
-        <!--
-           The list of static or well-known members. These entries will only be valid if the
-           "membershipScheme" above is set to "wka"
-        -->
-        <members>
-            <member>
-                <hostName>127.0.0.1</hostName>
-                <port>4000</port>
-            </member>
-        </members>
-
-        <!--
-        Enable the groupManagement entry if you need to run this node as a cluster manager.
-        Multiple application domains with different GroupManagementAgent implementations
-        can be defined in this section.
-        -->
-        <groupManagement enable="false">
-            <applicationDomain name="wso2.as.domain"
-                               description="AS group"
-                               agent="org.wso2.carbon.core.clustering.hazelcast.HazelcastGroupManagementAgent"
-                               subDomain="worker"
-                               port="2222"/>
-        </groupManagement>
-    </clustering>
-</axisconfig>
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml
deleted file mode 100644
index 40f3e07c32..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/axis2/axis2_client.xml
+++ /dev/null
@@ -1,300 +0,0 @@
-<!--
-  ~ Copyright 2005-2017 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.
-  -->
-
-<axisconfig name="AxisJava2.0">
-    <!-- ================================================= -->
-    <!-- Parameters -->
-    <!-- ================================================= -->
-    <parameter name="hotdeployment">true</parameter>
-    <parameter name="hotupdate">false</parameter>
-    <parameter name="enableMTOM">false</parameter>
-
-    <!-- commons-http-client defaultMaxConnPerHost -->
-    <parameter name="defaultMaxConnPerHost">500</parameter>
-    <!-- commons-http-client maxTotalConnections -->
-    <parameter name="maxTotalConnections">15000</parameter>
-
-    <!--If turned on with use the Accept header of the request to determine the contentType of the
-    response-->
-    <parameter name="httpContentNegotiation">false</parameter>
-
-    <!--During a fault, stacktrace can be sent with the fault message. The following flag will control -->
-    <!--that behaviour.-->
-    <parameter name="sendStacktraceDetailsWithFaults">true</parameter>
-
-    <!--If there aren't any information available to find out the fault reason, we set the message of the exception-->
-    <!--as the faultreason/Reason. But when a fault is thrown from a service or some where, it will be -->
-    <!--wrapped by different levels. Due to this the initial exception message can be lost. If this flag-->
-    <!--is set then, Axis2 tries to get the first exception and set its message as the faultreason/Reason.-->
-    <parameter name="DrillDownToRootCauseForFaultReason">false</parameter>
-
-    <!--This is the user name and password of admin console-->
-    <parameter name="userName">admin</parameter>
-    <parameter name="password">axis2</parameter>
-
-    <!--To override repository/services you need to uncomment following parameter and value SHOULD be absolute file path.-->
-    <!--ServicesDirectory only works on the following cases-->
-    <!---File based configurator and in that case the value should be a file URL (http:// not allowed)-->
-    <!---When creating URL Based configurator with URL “file://”  -->
-    <!--- War based configurator with expanded case , -->
-
-    <!--All the other scenarios it will be ignored.-->
-    <!--<parameter name="ServicesDirectory">service</parameter>-->
-    <!--To override repository/modules you need to uncomment following parameter and value SHOULD be absolute file path-->
-    <!--<parameter name="ModulesDirectory">modules</parameter>-->
-
-    <!--Following params will set the proper context paths for invocations. All the endpoints will have a commons context-->
-    <!--root which can configured using the following contextRoot parameter-->
-    <!--<parameter name="contextRoot">axis2</parameter>-->
-
-    <!--Our HTTP endpoints can handle both REST and SOAP. Following parameters can be used to distinguish those endpoints-->
-    <!--<parameter name="servicePath">services</parameter>-->
-    <!--<parameter name="restPath">rest</parameter>-->
-
-    <!-- Following parameter will completely disable REST handling in Axis2-->
-    <parameter name="disableREST" locked="false">false</parameter>
-
-    <!--POJO deployer , this will alow users to drop .class file and make that into a service-->
-    <deployer extension=".class" directory="pojo" class="org.apache.axis2.deployment.POJODeployer"/>
-
-    <!-- Following parameter will set the host name for the epr-->
-    <!--<parameter name="hostname" locked="true">myhost.com</parameter>-->
-
-    <!-- ================================================= -->
-    <!-- Message Receivers -->
-    <!-- ================================================= -->
-    <!--This is the Default Message Receiver for the system , if you want to have MessageReceivers for -->
-    <!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
-    <!--any operation -->
-    <!--Note : You can override this for particular service by adding the same element with your requirement-->
-    <messageReceivers>
-        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
-                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
-        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
-                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
-        <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only"
-                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
-        <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out"
-                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
-    </messageReceivers>
-
-    <!-- ================================================= -->
-    <!-- Message Formatter -->
-    <!-- ================================================= -->
-    <!--Following content type to message formatter mapping can be used to implement support for different message -->
-    <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
-    <messageFormatters>
-        <messageFormatter contentType="application/x-www-form-urlencoded"
-                          class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
-        <messageFormatter contentType="multipart/form-data"
-                          class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
-        <messageFormatter contentType="application/xml"
-                          class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
-        <messageFormatter contentType="text/xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
-        <messageFormatter contentType="application/soap+xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
-	<!--JSON Message Formatters-->
-        <messageFormatter contentType="application/json"
-                          class="org.apache.axis2.json.JSONMessageFormatter"/>
-        <messageFormatter contentType="application/json/badgerfish"
-                          class="org.apache.axis2.json.JSONBadgerfishMessageFormatter"/>
-        <messageFormatter contentType="text/javascript"
-                          class="org.apache.axis2.json.JSONMessageFormatter"/>
-    </messageFormatters>
-
-    <!-- ================================================= -->
-    <!-- Message Builders -->
-    <!-- ================================================= -->
-    <!--Following content type to builder mapping can be used to implement support for different message -->
-    <!--formats in Axis2. These message formats are expected to be resolved based on the content type. -->
-    <messageBuilders>
-        <messageBuilder contentType="application/xml"
-                        class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
-        <messageBuilder contentType="application/x-www-form-urlencoded"
-                        class="org.apache.axis2.builder.XFormURLEncodedBuilder"/>
-	<!--JSON Message Builders-->
-        <messageBuilder contentType="application/json"
-                        class="org.apache.axis2.json.JSONOMBuilder"/>
-        <messageBuilder contentType="application/json/badgerfish"
-                        class="org.apache.axis2.json.JSONBadgerfishOMBuilder"/>
-        <messageBuilder contentType="text/javascript"
-                        class="org.apache.axis2.json.JSONOMBuilder"/>
-        <!--Left commented because it adds the depandancy of servlet-api to other modules.
-        Please uncomment to Receive messages in multipart/form-data format-->
-        <!--<messageBuilder contentType="multipart/form-data"-->
-        <!--class="org.apache.axis2.builder.MultipartFormDataBuilder"/>-->
-    </messageBuilders>
-
-    <!-- ================================================= -->
-    <!-- Target Resolvers -->
-    <!-- ================================================= -->
-    <!-- Uncomment the following and specify the class name for your TargetResolver to add -->
-    <!-- a TargetResolver. TargetResolvers are used to process the To EPR for example to -->
-    <!-- choose a server in a cluster -->
-    <!--<targetResolvers>-->
-    <!--<targetResolver class="" />-->
-    <!--</targetResolvers>-->
-
-
-    <!-- ================================================= -->
-    <!-- Transport Ins -->
-    <!-- ================================================= -->
-    <transportReceiver name="http"
-                       class="org.apache.axis2.transport.http.SimpleHTTPServer">
-        <parameter name="port">6071</parameter>
-        <!--If you want to give your own host address for EPR generation-->
-        <!--uncomment following parameter , and set as you required.-->
-        <!--<parameter name="hostname">http://myApp.com/ws</parameter>-->
-    </transportReceiver>
-
-    <!--Uncomment if you want to have TCP transport support-->
-    <!--<transportReceiver name="tcp"
-                       class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port">6061</parameter>-->
-    <!--If you want to give your own host address for EPR generation-->
-    <!--uncomment following parameter , and set as you required.-->
-    <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
-    <!--</transportReceiver>-->
-
-    <!-- ================================================= -->
-    <!-- Transport Outs -->
-    <!-- ================================================= -->
-
-    <!--<transportSender name="jms"-->
-    <!--class="org.apache.axis2.transport.jms.JMSSender"/>-->
-    <!--transportSender name="tcp"
-                     class="org.apache.axis2.transport.tcp.TCPTransportSender"/-->
-    <transportSender name="local"
-                     class="org.apache.axis2.transport.local.LocalTransportSender"/>
-    <transportSender name="http"
-                     class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding">chunked</parameter>
-        <parameter name="SO_TIMEOUT">60000</parameter>
-        <parameter name="CONNECTION_TIMEOUT">60000</parameter>
-    </transportSender>
-    <transportSender name="https"
-                     class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding">chunked</parameter>
-        <parameter name="SO_TIMEOUT">60000</parameter>
-        <parameter name="CONNECTION_TIMEOUT">60000</parameter>
-    </transportSender>
-    <!--<transportSender name="java"-->
-    <!--class="org.apache.axis2.transport.java.JavaTransportSender"/>-->
-
-
-    <!-- ================================================= -->
-    <!--  SOAP Role Configuration                          -->
-    <!-- ================================================= -->
-    <!-- Use the following pattern to configure this axis2
-         instance to act in particular roles. Note that in
-         the absence of any configuration, Axis2 will act 
-         only in the ultimate receiver role -->
-    <!--
-    <SOAPRoleConfiguration isUltimateReceiver="true">
-    	<role>http://my/custom/role</role>
-    </SOAPRoleConfiguration>
-	-->
-
-    <!-- ================================================= -->
-    <!-- Phases  -->
-    <!-- ================================================= -->
-    <phaseOrder type="InFlow">
-        <!--  System pre-defined phases       -->
-        <phase name="Transport">
-            <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
-                <order phase="Transport"/>
-            </handler>
-            <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
-                <order phase="Transport"/>
-            </handler>
-        </phase>
-        <phase name="Addressing">
-            <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
-                <order phase="Addressing"/>
-            </handler>
-        </phase>
-        <phase name="Security"/>
-        <phase name="PreDispatch"/>
-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
-            <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
-            <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
-            <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
-            <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
-
-            <handler name="HTTPLocationBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
-        </phase>
-        <phase name="RMPhase"/>
-        <!--  System pre defined phases       -->
-        <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
-        <phase name="OperationInPhase"/>
-    </phaseOrder>
-    <phaseOrder type="OutFlow">
-        <!--      user can add his own phases to this area  -->
-        <phase name="OperationOutPhase"/>
-        <!--system predefined phase-->
-        <!--these phase will run irrespective of the service-->
-        <phase name="RMPhase"/>
-        <phase name="PolicyDetermination"/>
-        <phase name="MessageOut"/>
-        <phase name="Security"/>
-    </phaseOrder>
-    <phaseOrder type="InFaultFlow">
-        <phase name="Addressing">
-            <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
-                <order phase="Addressing"/>
-            </handler>
-        </phase>
-        <phase name="Security"/>
-        <phase name="PreDispatch"/>
-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
-            <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
-            <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
-            <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
-            <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
-
-            <handler name="HTTPLocationBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
-        </phase>
-        <phase name="RMPhase"/>
-        <!--      user can add his own phases to this area  -->
-        <phase name="OperationInFaultPhase"/>
-    </phaseOrder>
-    <phaseOrder type="OutFaultFlow">
-        <!--      user can add his own phases to this area  -->
-        <phase name="OperationOutFaultPhase"/>
-        <phase name="RMPhase"/>
-        <phase name="PolicyDetermination"/>
-        <phase name="MessageOut"/>
-        <phase name="Security"/>
-	<phase name="Transport"/>
-    </phaseOrder>
-</axisconfig>
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml
deleted file mode 100644
index 6f49f62ed9..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/axis2/tenant-axis2.xml
+++ /dev/null
@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-  ~ Copyright 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.
-  -->
-
-<axisconfig name="AxisJava2.0">
-    <!-- ================================================= -->
-    <!-- Parameters -->
-    <!-- ================================================= -->
-    <parameter name="hotdeployment">true</parameter>
-    <parameter name="hotupdate">true</parameter>
-    <parameter name="enableMTOM">optional</parameter>
-
-    <!--If turned on with use the Accept header of the request to determine the contentType of the
-    response-->
-    <parameter name="httpContentNegotiation">true</parameter>
-
-    <!--If true, then artifacts(services, modules etc) are not loaded when a tenant is loaded.
-    So service deployment, module deployment etc. will not happen. So the tenant loading time will
-    be fast.-->
-    <parameter name="DisableArtifactLoading">false</parameter>
-
-    <!--During a fault, stacktrace can be sent with the fault message. The following flag will control -->
-    <!--that behaviour.-->
-    <parameter name="sendStacktraceDetailsWithFaults">true</parameter>
-
-    <!--If there aren't any information available to find out the fault reason, we set the message of the exception-->
-    <!--as the faultreason/Reason. But when a fault is thrown from a service or some where, it will be -->
-    <!--wrapped by different levels. Due to this the initial exception message can be lost. If this flag-->
-    <!--is set then, Axis2 tries to get the first exception and set its message as the faultreason/Reason.-->
-    <parameter name="DrillDownToRootCauseForFaultReason">false</parameter>
-
-    <!-- Following parameter will completely disable REST handling in Axis2-->
-    <parameter name="disableREST" locked="false">false</parameter>
-
-    <!--the directory in which .aar services are deployed inside axis2 repository-->
-    <parameter name="ServicesDirectory">axis2services</parameter>
-
-    <!--POJO deployer , this will alow users to drop .class file and make that into a service-->
-    <deployer extension=".class" directory="pojo" class="org.apache.axis2.deployment.POJODeployer"/>
-    <deployer extension=".jar" directory="transports"
-              class="org.apache.axis2.deployment.TransportDeployer"/>
-
-    <!-- Following parameter will set the host name for the epr-->
-    <!--<parameter name="hostname" locked="true">myhost.com</parameter>-->
-
-    <!-- ================================================= -->
-    <!-- Message Receivers -->
-    <!-- ================================================= -->
-    <!--This is the Default Message Receiver for the system , if you want to have MessageReceivers for -->
-    <!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
-    <!--any operation -->
-    <!--Note : You can override this for particular service by adding the same element with your requirement-->
-    <messageReceivers>
-        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
-                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
-        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
-                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
-        <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only"
-                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
-        <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out"
-                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
-        <messageReceiver mep="http://www.w3.org/ns/wsdl/in-only"
-                         class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"/>
-        <messageReceiver mep="http://www.w3.org/ns/wsdl/robust-in-only"
-                         class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"/>
-        <messageReceiver mep="http://www.w3.org/ns/wsdl/in-out"
-                         class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
-    </messageReceivers>
-
-    <!-- ================================================= -->
-    <!-- Message Formatter -->
-    <!-- ================================================= -->
-    <!--Following content type to message formatter mapping can be used to implement support for different message -->
-    <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
-    <messageFormatters>
-        <messageFormatter contentType="application/x-www-form-urlencoded"
-                          class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
-        <messageFormatter contentType="multipart/form-data"
-                          class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
-        <messageFormatter contentType="application/xml"
-                          class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
-        <messageFormatter contentType="text/xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
-        <messageFormatter contentType="application/soap+xml"
-                          class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
-        <!--JSON Message Formatters-->
-        <!--messageFormatter contentType="application/json"
-                          class="org.apache.axis2.json.JSONMessageFormatter"/-->
-        <messageFormatter contentType="application/json"
-                                  class="org.apache.axis2.json.gson.JsonFormatter" />
-        <messageFormatter contentType="application/json/badgerfish"
-                          class="org.apache.axis2.json.JSONBadgerfishMessageFormatter"/>
-        <!--messageFormatter contentType="text/javascript"
-                          class="org.apache.axis2.json.JSONMessageFormatter"/-->
-        <messageFormatter contentType="text/javascript"
-                                  class="org.apache.axis2.json.gson.JsonFormatter" />
-    </messageFormatters>
-
-    <!-- ================================================= -->
-    <!-- Message Builders -->
-    <!-- ================================================= -->
-    <!--Following content type to builder mapping can be used to implement support for different message -->
-    <!--formats in Axis2. These message formats are expected to be resolved based on the content type. -->
-    <messageBuilders>
-        <messageBuilder contentType="application/xml"
-                        class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
-        <messageBuilder contentType="application/x-www-form-urlencoded"
-                        class="org.apache.axis2.builder.XFormURLEncodedBuilder"/>
-        <!--JSON Message Builders-->
-        <!--messageBuilder contentType="application/json"
-                        class="org.apache.axis2.json.JSONOMBuilder"/-->
-        <messageBuilder contentType="application/json"
-                                class="org.apache.axis2.json.gson.JsonBuilder" />
-        <messageBuilder contentType="application/json/badgerfish"
-                        class="org.apache.axis2.json.JSONBadgerfishOMBuilder"/>
-        <!--messageBuilder contentType="text/javascript"
-                        class="org.apache.axis2.json.JSONOMBuilder"/-->
-        <messageBuilder contentType="text/javascript"
-                                class="org.apache.axis2.json.gson.JsonBuilder" />
-        <!--Left commented because it adds the depandancy of servlet-api to other modules.
-        Please uncomment to Receive messages in multipart/form-data format-->
-        <!--<messageBuilder contentType="multipart/form-data"-->
-        <!--class="org.apache.axis2.builder.MultipartFormDataBuilder"/>-->
-    </messageBuilders>
-
-    <!-- ================================================= -->
-    <!-- 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"/>
-        <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="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher" />
-            <handler name="JSONMessageHandler"
-                     class="org.apache.axis2.json.gson.JSONMessageHandler" />
-        </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="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">
- 		<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">
-         <!--
-           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="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">
-        <!--      user can add his own phases to this area  -->
-		<phase name="UEPPhase"/>
-		<phase name="OperationOutFaultPhase"/>
-        <phase name="RMPhase"/>
-        <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>
-</axisconfig>
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/cdm-config.xml
deleted file mode 100644
index 9097a645cb..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/cdm-config.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ you may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<DeviceMgtConfiguration>
-    <ManagementRepository>
-        <DataSourceConfiguration>
-            <JndiLookupDefinition>
-                <Name>jdbc/DM_DS</Name>
-            </JndiLookupDefinition>
-        </DataSourceConfiguration>
-    </ManagementRepository>
-    <PushNotificationConfiguration>
-        <SchedulerBatchSize>1000</SchedulerBatchSize>
-        <SchedulerBatchDelayMills>60000</SchedulerBatchDelayMills>
-        <SchedulerTaskInitialDelay>60000</SchedulerTaskInitialDelay>
-        <SchedulerTaskEnabled>true</SchedulerTaskEnabled>
-        <PushNotificationProviders>
-            <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
-            <!--<Provider>org.wso2.carbon.device.mgt.mobile.impl.ios.apns.APNSBasedPushNotificationProvider</Provider>-->
-            <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
-			<Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.HTTPBasedPushNotificationProvider</Provider>
-            <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
-        </PushNotificationProviders>
-    </PushNotificationConfiguration>
-	<PullNotificationConfiguration>
-		<Enabled>false</Enabled>
-	</PullNotificationConfiguration>
-    <IdentityConfiguration>
-        <ServerUrl>https://localhost:9443</ServerUrl>
-        <AdminUsername>admin</AdminUsername>
-        <AdminPassword>admin</AdminPassword>
-    </IdentityConfiguration>
-    <PolicyConfiguration>
-        <MonitoringClass>org.wso2.carbon.policy.mgt</MonitoringClass>
-        <MonitoringEnable>true</MonitoringEnable>
-        <MonitoringFrequency>60000</MonitoringFrequency>
-        <MaxRetries>5</MaxRetries>
-        <MinRetriesToMarkUnreachable>8</MinRetriesToMarkUnreachable>
-        <MinRetriesToMarkInactive>20</MinRetriesToMarkInactive>
-        <!--Set the policy evaluation point name-->
-        <!--Simple ->  Simple policy evaluation point-->
-        <!--Merged ->  Merged policy evaluation point -->
-        <PolicyEvaluationPoint>Simple</PolicyEvaluationPoint>
-    </PolicyConfiguration>
-    <!-- Default Page size configuration for paginated DM APIs-->
-    <PaginationConfiguration>
-        <DeviceListPageSize>20</DeviceListPageSize>
-        <GroupListPageSize>20</GroupListPageSize>
-        <NotificationListPageSize>20</NotificationListPageSize>
-        <ActivityListPageSize>20</ActivityListPageSize>
-        <OperationListPageSize>20</OperationListPageSize>
-        <TopicListPageSize>20</TopicListPageSize>
-    </PaginationConfiguration>
-    <!--This specifies whether to enable the DeviceStatus Task in this node. In clustered setup only master node
-     should  have to run this task.-->
-    <DeviceStatusTaskConfig>
-        <Enable>true</Enable>
-    </DeviceStatusTaskConfig>
-    <!--This controls the in-memory device cache which is local to this node. Setting it enable will activate the
-    device caching for upto configured expiry-time in seconds. In clustered setup all worker nodes can enable the
-    device-cache to improve performance. -->
-    <DeviceCacheConfiguration>
-        <Enable>false</Enable>
-        <ExpiryTime>600</ExpiryTime>
-        <!--This configuration specifies the number of cache entries in device cache. default capacity is 10000 entries.
-        This can be configured to higher number if cache eviction happens due to large number of devices in the
-        server environment-->
-        <Capacity>10000</Capacity>
-    </DeviceCacheConfiguration>
-    <CertificateCacheConfiguration>
-        <Enable>false</Enable>
-        <ExpiryTime>86400</ExpiryTime>
-    </CertificateCacheConfiguration>
-    <GeoLocationConfiguration>
-        <isEnabled>false</isEnabled>
-        <PublishLocationOperationResponse>false</PublishLocationOperationResponse>
-    </GeoLocationConfiguration>
-    <DefaultGroupsConfiguration>BYOD,COPE</DefaultGroupsConfiguration>
-</DeviceMgtConfiguration>
-
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml
deleted file mode 100644
index 897e33581c..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/datasources/master-datasources.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<datasources-configuration xmlns:svns="http://org.wso2.securevault/configuration">
-  
-    <providers>
-        <provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider>
-    </providers>
-  
-    <datasources>
-      
-        <datasource>
-            <name>WSO2_CARBON_DB</name>
-            <description>The datasource used for registry and user manager</description>
-            <jndiConfig>
-                <name>jdbc/WSO2CarbonDB</name>
-            </jndiConfig>
-            <definition type="RDBMS">
-                <configuration>
-                    <url>jdbc:h2:repository/database/WSO2CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000</url>
-                    <username>wso2carbon</username>
-                    <password>wso2carbon</password>
-                    <driverClassName>org.h2.Driver</driverClassName>
-                    <maxActive>50</maxActive>
-                    <maxWait>60000</maxWait>
-                    <testOnBorrow>true</testOnBorrow>
-                    <validationQuery>SELECT 1</validationQuery>
-                    <validationInterval>30000</validationInterval>
-                    <defaultAutoCommit>false</defaultAutoCommit>
-                </configuration>
-            </definition>
-        </datasource>
-
-        <!-- For an explanation of the properties, see: http://people.apache.org/~fhanik/jdbc-pool/jdbc-pool.html -->
-        <!--datasource>
-            <name>SAMPLE_DATA_SOURCE</name>
-            <jndiConfig>
-                <name></name>
-                <environment>
-                    <property name="java.naming.factory.initial"></property>
-                    <property name="java.naming.provider.url"></property>
-                </environment>
-            </jndiConfig>
-            <definition type="RDBMS">
-                <configuration>
-
-                    <defaultAutoCommit></defaultAutoCommit>
-                    <defaultReadOnly></defaultReadOnly>
-                    <defaultTransactionIsolation>NONE|READ_COMMITTED|READ_UNCOMMITTED|REPEATABLE_READ|SERIALIZABLE</defaultTransactionIsolation>
-                    <defaultCatalog></defaultCatalog>
-                    <username></username>
-                    <password svns:secretAlias="WSO2.DB.Password"></password>
-                    <maxActive></maxActive>
-                    <maxIdle></maxIdle>
-                    <initialSize></initialSize>
-                    <maxWait></maxWait>
-
-                    <dataSourceClassName>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</dataSourceClassName>
-                    <dataSourceProps>
-                        <property name="url">jdbc:mysql://localhost:3306/Test1</property>
-                        <property name="user">root</property>
-                        <property name="password">123</property>
-                    </dataSourceProps>
-
-                </configuration>
-            </definition>
-        </datasource-->
-
-    </datasources>
-
-</datasources-configuration>
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt
deleted file mode 100644
index ffa7c79264..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/bundle-config/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-This directory supports adding third-pary config files to specific bundles during runtime. 
-
-Explanation: Each OSGi bundle has its own classLoader. Some thirdpary libs read configs from classPath. This scenario fails in OSGi runtime, since OSGi runtime does not share a common classPath for individual bundles. Bundling config files during the bundle creation process itself will solve the issue. However it limits the ability to edit the configs during restarts.
-
-Here we are providing a workaround for such scenarios. The given config file will get resolved to a fragment bundle and will get attached to the specified host bundle. The host bundle name(symbolic name) is resolved by looking at the directory structure. Hence host bundle name should be directory name of the config file directory.
-
-
-Example: The bundle with symbolic name, 'org.foo.bar' expects a config file named 'foobar.properties' from its classPath.
-
-create a directory named 'org.foo.bar' inside 'repository/conf/etc/bundle-config' - (this directory) and place the foobar.properties file.
-
-
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties
deleted file mode 100644
index f52d194001..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/carboncontext-osgi-services.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#osgi.service.1 = org.wso2.carbon.client.configcontext.provider.Axis2ClientConfigContextProvider
-#osgi.service.2 = org.wso2.carbon.user.core.UserManager
-#osgi.service.3 = org.wso2.carbon.user.api.UserRealmService
\ No newline at end of file
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml
deleted file mode 100644
index 3b5b3484bb..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/config-validation.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--configuration bit values should be given in Mega Bytes (1KB = 1024 bytes, 1MB = 1024 KB, 1GB = 1024 MB), CPU value in MHz-->
-<Configuration enabled="true">
-	<!--Configuration Validators to validate system configs against recommended config settings-->	
-	<Validator class="org.wso2.carbon.core.bootup.validator.SystemValidator">
-		<Parameter id="CPU">800</Parameter>
-		<Parameter id="RAM">2047</Parameter>
-		<Parameter id="swap">2047</Parameter>
-		<Parameter id="freeDisk">1024</Parameter>
-		<Parameter id="ulimit">4096</Parameter>
-        <Parameter id="certFingerprint">02:FB:AA:5F:20:64:49:4A:27:29:55:71:83:F7:46:CD</Parameter>
-	</Validator>
-	<Validator class="org.wso2.carbon.core.bootup.validator.JVMValidator">
-		<Parameter id="initHeapSize">256</Parameter>
-		<Parameter id="maxHeapSize">512</Parameter>
-		<Parameter id="maxPermGenSize">256</Parameter>
-	</Validator>
-	<Validator class="org.wso2.carbon.core.bootup.validator.RequiredSystemPropertiesValidator">
-		<Parameter id="p1">carbon.home</Parameter>
-		<Parameter id="p2">carbon.config.dir.path</Parameter>
-		<Parameter id="p3">axis2.home</Parameter>
-	</Validator>
-	<Validator class="org.wso2.carbon.core.bootup.validator.SupportedOSValidator">
-		<Parameter id="os1">Linux</Parameter>
-		<Parameter id="os2">Unix</Parameter>
-		<Parameter id="os3">Mac OS</Parameter>
-		<Parameter id="os4">Windows Server 2003</Parameter>
-		<Parameter id="os5">Windows XP</Parameter>
-		<Parameter id="os6">Windows Vista</Parameter>
-		<Parameter id="os7">Windows 7</Parameter>
-		<Parameter id="os8">Mac OS X</Parameter>
-		<Parameter id="os9">Windows Server 2008</Parameter>
-		<Parameter id="os10">Windows Server 2008 R2</Parameter>
-		<Parameter id="os11">AIX</Parameter>
-	</Validator>
-</Configuration>
-
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/jmx.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/jmx.xml
deleted file mode 100644
index b2bb2ac7a3..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/jmx.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-~ Copyright 2005-2017 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 file is used to configuring the JMX server. You can disable the JMX RMI server from starting
-   by setting the value of the StartRMIServer to false.
--->
-<JMX xmlns="http://wso2.org/projects/carbon/jmx.xml">
-    <StartRMIServer>true</StartRMIServer>
-
-    <!-- HostName, or Network interface to which this RMI server should be bound -->
-    <HostName>localhost</HostName>
-
-    <!--  ${Ports.JMX.RMIRegistryPort} is defined in the Ports section of the carbon.xml-->
-    <RMIRegistryPort>${Ports.JMX.RMIRegistryPort}</RMIRegistryPort>
-
-    <!--  ${Ports.JMX.RMIRegistryPort} is defined in the Ports section of the carbon.xml-->
-    <RMIServerPort>${Ports.JMX.RMIServerPort}</RMIServerPort>
-</JMX>
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/launch.ini b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/launch.ini
deleted file mode 100644
index 8b9f5ad190..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/launch.ini
+++ /dev/null
@@ -1,258 +0,0 @@
-# Eclipse Runtime Configuration Overrides
-# These properties are loaded prior to starting the framework and can also be used to override System Properties
-# @null is a special value used to override and clear the framework's copy of a System Property prior to starting the framework
-# "*" can be used together with @null to clear System Properties that match a prefix name.
-
-osgi.*=@null
-org.osgi.*=@null
-eclipse.*=@null
-
-osgi.parentClassloader=app
-osgi.contextClassLoaderParent=app
-
-# When osgi.clean is set to "true", any cached data used by the OSGi framework 
-# will be wiped clean. This will clean the caches used to store bundle 
-# dependency resolution and eclipse extension registry data. Using this 
-# option will force OSGi framework to reinitialize these caches.
-# The following setting is put in place to get rid of the problems
-# faced when re-starting the system. Please note that, when this setting is 
-# true, if you manually start a bundle, it would not be available when 
-# you re-start the system. To avid this, copy the bundle jar to the plugins 
-# folder, before you re-start the system. 
-osgi.clean=true
-
-# Uncomment the following line to turn on Eclipse Equinox debugging. 
-# You may also edit the osgi-debug.options file and fine tune the debugging 
-# options to suite your needs. 
-#osgi.debug=./repository/conf/osgi-debug.options
-
-# Following system property allows us to control the public JDK packages exported through the system bundle.
-org.osgi.framework.system.packages=javax.accessibility,\
-javax.activity,\
-javax.crypto,\
-javax.crypto.interfaces,\
-javax.crypto.spec,\
-javax.imageio,\
-javax.imageio.event,\
-javax.imageio.metadata,\
-javax.imageio.plugins.bmp,\
-javax.imageio.plugins.jpeg,\
-javax.imageio.spi,\
-javax.imageio.stream,\
-javax.jms,\
-javax.management,\
-javax.management.loading,\
-javax.management.modelmbean,\
-javax.management.monitor,\
-javax.management.openmbean,\
-javax.management.relation,\
-javax.management.remote,\
-javax.management.remote.rmi,\
-javax.management.timer,\
-javax.naming,\
-javax.naming.directory,\
-javax.naming.event,\
-javax.naming.ldap,\
-javax.naming.spi,\
-javax.net,\
-javax.net.ssl,\
-javax.print,\
-javax.print.attribute,\
-javax.print.attribute.standard,\
-javax.print.event,\
-javax.rmi,\
-javax.rmi.CORBA,\
-javax.rmi.ssl,\
-javax.script,\
-javax.security.auth,\
-javax.security.auth.callback,\
-javax.security.auth.kerberos,\
-javax.security.auth.login,\
-javax.security.auth.spi,\
-javax.security.auth.x500,\
-javax.security.cert,\
-javax.security.sasl,\
-javax.sound.midi,\
-javax.sound.midi.spi,\
-javax.sound.sampled,\
-javax.sound.sampled.spi,\
-javax.sql,\
-javax.sql.rowset,\
-javax.sql.rowset.serial,\
-javax.sql.rowset.spi,\
-javax.swing,\
-javax.swing.border,\
-javax.swing.colorchooser,\
-javax.swing.event,\
-javax.swing.filechooser,\
-javax.swing.plaf,\
-javax.swing.plaf.basic,\
-javax.swing.plaf.metal,\
-javax.swing.plaf.multi,\
-javax.swing.plaf.synth,\
-javax.swing.table,\
-javax.swing.text,\
-javax.swing.text.html,\
-javax.swing.text.html.parser,\
-javax.swing.text.rtf,\
-javax.swing.tree,\
-javax.swing.undo,\
-javax.transaction,\
-javax.transaction.xa,\
-javax.xml.namespace,\
-javax.xml.parsers,\
-javax.xml.stream,\
-javax.xml.stream.events,\
-javax.xml.stream.util,\
-javax.xml.transform,\
-javax.xml.transform.stream,\
-javax.xml.transform.dom,\
-javax.xml.transform.sax,\
-javax.xml,\
-javax.xml.validation,\
-javax.xml.datatype,\
-javax.xml.xpath,\
-javax.activation,\
-com.sun.activation.registries,\
-com.sun.activation.viewers,\
-org.ietf.jgss,\
-org.omg.CORBA,\
-org.omg.CORBA_2_3,\
-org.omg.CORBA_2_3.portable,\
-org.omg.CORBA.DynAnyPackage,\
-org.omg.CORBA.ORBPackage,\
-org.omg.CORBA.portable,\
-org.omg.CORBA.TypeCodePackage,\
-org.omg.CosNaming,\
-org.omg.CosNaming.NamingContextExtPackage,\
-org.omg.CosNaming.NamingContextPackage,\
-org.omg.Dynamic,\
-org.omg.DynamicAny,\
-org.omg.DynamicAny.DynAnyFactoryPackage,\
-org.omg.DynamicAny.DynAnyPackage,\
-org.omg.IOP,\
-org.omg.IOP.CodecFactoryPackage,\
-org.omg.IOP.CodecPackage,\
-org.omg.Messaging,\
-org.omg.PortableInterceptor,\
-org.omg.PortableInterceptor.ORBInitInfoPackage,\
-org.omg.PortableServer,\
-org.omg.PortableServer.CurrentPackage,\
-org.omg.PortableServer.POAManagerPackage,\
-org.omg.PortableServer.POAPackage,\
-org.omg.PortableServer.portable,\
-org.omg.PortableServer.ServantLocatorPackage,\
-org.omg.SendingContext,\
-org.omg.stub.java.rmi,\
-org.w3c.dom,\
-org.w3c.dom.bootstrap,\
-org.w3c.dom.css,\
-org.w3c.dom.events,\
-org.w3c.dom.html,\
-org.w3c.dom.ls,\
-org.w3c.dom.ranges,\
-org.w3c.dom.stylesheets,\
-org.w3c.dom.traversal,\
-org.w3c.dom.views ,\
-org.xml.sax,\
-org.xml.sax.ext,\
-org.xml.sax.helpers,\
-org.apache.xerces.xpointer,\
-org.apache.xerces.xni.grammars,\
-org.apache.xerces.impl.xs.util,\
-org.apache.xerces.jaxp.validation,\
-org.apache.xerces.impl.dtd.models,\
-org.apache.xerces.impl.xpath,\
-org.apache.xerces.dom3.as,\
-org.apache.xerces.impl.dv.xs,\
-org.apache.xerces.util,\
-org.apache.xerces.impl.xs.identity,\
-org.apache.xerces.impl.xs.opti,\
-org.apache.xerces.jaxp,\
-org.apache.xerces.impl.dv,\
-org.apache.xerces.xs.datatypes,\
-org.apache.xerces.dom.events,\
-org.apache.xerces.impl.msg,\
-org.apache.xerces.xni,\
-org.apache.xerces.impl.xs,\
-org.apache.xerces.impl,\
-org.apache.xerces.impl.io,\
-org.apache.xerces.xinclude,\
-org.apache.xerces.jaxp.datatype,\
-org.apache.xerces.parsers,\
-org.apache.xerces.impl.dv.util,\
-org.apache.xerces.xni.parser,\
-org.apache.xerces.impl.xs.traversers,\
-org.apache.xerces.impl.dv.dtd,\
-org.apache.xerces.xs,\
-org.apache.xerces.impl.dtd,\
-org.apache.xerces.impl.validation,\
-org.apache.xerces.impl.xs.models,\
-org.apache.xerces.impl.xpath.regex,\
-org.apache.xml.serialize,\
-org.apache.xerces.dom,\
-org.apache.xalan,\
-org.apache.xalan.xslt,\
-org.apache.xalan.templates,\
-org.apache.xalan.xsltc,\
-org.apache.xalan.xsltc.cmdline,\
-org.apache.xalan.xsltc.cmdline.getopt,\
-org.apache.xalan.xsltc.trax,\
-org.apache.xalan.xsltc.dom,\
-org.apache.xalan.xsltc.runtime,\
-org.apache.xalan.xsltc.runtime.output,\
-org.apache.xalan.xsltc.util,\
-org.apache.xalan.xsltc.compiler,\
-org.apache.xalan.xsltc.compiler.util,\
-org.apache.xalan.serialize,\
-org.apache.xalan.client,\
-org.apache.xalan.res,\
-org.apache.xalan.transformer,\
-org.apache.xalan.extensions,\
-org.apache.xalan.lib,\
-org.apache.xalan.lib.sql,\
-org.apache.xalan.processor,\
-org.apache.xalan.trace,\
-org.apache.xml.dtm,\
-org.apache.xml.dtm.ref,\
-org.apache.xml.dtm.ref.sax2dtm,\
-org.apache.xml.dtm.ref.dom2dtm,\
-org.apache.xml.utils,\
-org.apache.xml.utils.res,\
-org.apache.xml.res,\
-org.apache.xml.serializer,\
-org.apache.xml.serializer.utils,\
-org.apache.xpath,\
-org.apache.xpath.domapi,\
-org.apache.xpath.objects,\
-org.apache.xpath.patterns,\
-org.apache.xpath.jaxp,\
-org.apache.xpath.res,\
-org.apache.xpath.operations,\
-org.apache.xpath.functions,\
-org.apache.xpath.axes,\
-org.apache.xpath.compiler,\
-org.apache.xml.resolver,\
-org.apache.xml.resolver.tools,\
-org.apache.xml.resolver.helpers,\
-org.apache.xml.resolver.readers,\
-org.apache.xml.resolver.etc,\
-org.apache.xml.resolver.apps,\
-javax.xml.ws,\
-javax.xml.ws.handler,\
-javax.xml.ws.handler.soap,\
-javax.xml.ws.http,\
-javax.xml.ws.soap,\
-javax.xml.ws.spi,\
-javax.xml.ws.spi.http,\
-javax.xml.ws.wsaddressing,\
-javax.xml.bind,\
-javax.xml.bind.annotation,\
-javax.xml.bind.annotation.adapters,\
-javax.annotation,\
-javax.jws,\
-javax.jws.soap,\
-com.sun.xml.internal.messaging.saaj.soap.ver1_1,\
-com.sun.xml.internal.messaging.saaj.soap,\
-com.sun.tools.internal.ws.spi,\
-org.wso2.carbon.bootstrap
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties
deleted file mode 100644
index 7b63190ae4..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/logging-bridge.properties
+++ /dev/null
@@ -1,65 +0,0 @@
-############################################################
-#  	Default Logging Configuration File
-#
-# You can use a different file by specifying a filename
-# with the java.util.logging.config.file system property.  
-# For example java -Djava.util.logging.config.file=myfile
-############################################################
-
-############################################################
-#  	Global properties
-#   NOTE: this configuration file use to get the handler list,
-#   Properties(except level property) define for each handler
-#   may be not available because LogRecords handover to log4j
-#   appenders in runtime.
-############################################################
-
-# "handlers" specifies a comma separated list of log Handler 
-# classes.  These handlers will be installed during VM startup.
-# Note that these classes must be on the system classpath.
-# By default we only configure a ConsoleHandler, which will only
-# show messages at the INFO and above levels.
-#handlers= java.util.logging.ConsoleHandler
-
-# To also add the FileHandler, use the following line instead.
-#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
-# Add org.wso2.carbon.bootstrap.logging.handlers.LogEventHandler to handlers if you need to push java logs to LOGEVENT appender
-
-handlers=  org.wso2.carbon.bootstrap.logging.handlers.LoggingConsoleHandler, org.wso2.carbon.bootstrap.logging.handlers.LoggingFileHandler
-
-# Default global logging level.
-# This specifies which kinds of events are logged across
-# all loggers.  For any given facility this global level
-# can be overriden by a facility specific level
-# Note that the ConsoleHandler also has a separate level
-# setting to limit messages printed to the console.
-.level= INFO
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-#
-
-############################################################
-# This FileHandler pushed LogRecords to a log4j FileAppander in runtime
-org.wso2.carbon.bootstrap.logging.handlers.LoggingFileHandler.level = INFO
-#org.wso2.carbon.bootstrap.logging.handlers.LoggingFileHandler.formatter = java.util.logging.SimpleFormatter
-
-# This ConsoleHandler pushed LogRecords to q log4j ConsoleAppander in runtime
-org.wso2.carbon.bootstrap.logging.handlers.LoggingConsoleHandler.level = INFO
-#org.wso2.carbon.bootstrap.logging.handlers.LoggingConsoleHandler.formatter = java.util.logging.SimpleFormatter
-
-
-############################################################
-# Facility specific properties.
-# Provides extra control for each logger.
-############################################################
-
-# For example, set the com.xyz.foo logger to only log SEVERE
-# messages:
-#com.xyz.foo.level = SEVERE
-org.apache.coyote.level = SEVERE
-org.apache.catalina.level = SEVERE
-com.hazelcast.level = SEVERE
-
-
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/mime.mappings b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/mime.mappings
deleted file mode 100755
index 97a5c5a5fc..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/mime.mappings
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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 file is to define the human readable media type for a mime type. 
-# Eg:- 
-# text/plain                                      txt text
-application/wsdl+xml				WSDL
-application/x-xsd+xml				Schema
-application/policy+xml				Policy
-application/vnd.wso2-service+xml	Service
-application/vnd.wso2-hyperlink		Hyperlink
-application/vnd.wso2.endpoint		Endpoint
-application/vnd.wso2-api+xml		API
-application/vnd.wso2-uri+xml		URI
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/mime.types b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/mime.types
deleted file mode 100644
index 21c386da00..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/mime.types
+++ /dev/null
@@ -1,734 +0,0 @@
-#
-# Copyright 2005-2009 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.
-#
-
-# Media type for wsdl files. This is not defined in the original mime.types file.
-chemical/x-alchemy				alc
-application/andrew-inset			ez
-application/wsdl+xml				wsdl
-application/vnd.sun.wadl+xml	wadl
-application/activemessage
-application/applefile
-application/atomicmail
-application/batch-SMTP
-application/beep+xml
-application/cals-1840
-application/commonground
-application/cu-seeme				cu
-application/cybercash
-application/dca-rft
-application/dec-dx
-application/docbook+xml
-application/dsptype				tsp
-application/dvcs
-application/edi-consent
-application/edi-x12
-application/edifact
-application/eshop
-application/font-tdpfr
-application/futuresplash			spl
-application/ghostview
-application/hta					hta
-application/http
-application/hyperstudio
-application/iges
-application/index
-application/index.cmd
-application/index.obj
-application/index.response
-application/index.vnd
-application/iotp
-application/ipp
-application/isup
-application/java-archive			jar
-application/java-serialized-object		ser
-application/java-vm				class
-application/mac-binhex40			hqx
-application/mac-compactpro			cpt
-application/macwriteii
-application/marc
-application/mathematica				nb
-application/mathematica-old
-application/msaccess				mdb
-application/msword				doc dot
-application/news-message-id
-application/news-transmission
-application/ocsp-request
-application/ocsp-response
-application/octet-stream			bin
-application/oda					oda
-application/ogg					ogg
-application/parityfec
-application/pdf					pdf
-application/pgp-encrypted
-application/pgp-keys				key
-application/pgp-signature			pgp
-application/pics-rules				prf
-application/pkcs10
-application/pkcs7-mime
-application/pkcs7-signature
-application/pkix-cert
-application/pkix-crl
-application/pkixcmp
-application/policy+xml
-application/postscript				ps ai eps
-application/prs.alvestrand.titrax-sheet
-application/prs.cww
-application/prs.nprend
-application/qsig
-application/rar					rar
-application/rdf+xml				rdf
-application/remote-printing
-application/riscos
-application/rss+xml				rss
-application/rtf
-application/sdp
-application/set-payment
-application/set-payment-initiation
-application/set-registration
-application/set-registration-initiation
-application/sgml
-application/sgml-open-catalog
-application/sieve
-application/slate
-application/smil				smi smil
-application/timestamp-query
-application/timestamp-reply
-application/vemmi
-application/whoispp-query
-application/whoispp-response
-application/wita
-application/wordperfect				wpd
-application/wordperfect5.1			wp5
-application/x400-bp
-application/xhtml+xml				xhtml xht
-application/xml					xml xsl xslt jrxml
-application/xml-dtd
-application/xml-external-parsed-entity
-application/zip					zip
-application/vnd.3M.Post-it-Notes
-application/vnd.accpac.simply.aso
-application/vnd.accpac.simply.imp
-application/vnd.acucobol
-application/vnd.aether.imp
-application/vnd.anser-web-certificate-issue-initiation
-application/vnd.anser-web-funds-transfer-initiation
-application/vnd.audiograph
-application/vnd.bmi
-application/vnd.businessobjects
-application/vnd.canon-cpdl
-application/vnd.canon-lips
-application/vnd.cinderella			cdy
-application/vnd.claymore
-application/vnd.commerce-battelle
-application/vnd.commonspace
-application/vnd.comsocaller
-application/vnd.contact.cmsg
-application/vnd.cosmocaller
-application/vnd.ctc-posml
-application/vnd.cups-postscript
-application/vnd.cups-raster
-application/vnd.cups-raw
-application/vnd.cybank
-application/vnd.dna
-application/vnd.dpgraph
-application/vnd.dxr
-application/vnd.ecdis-update
-application/vnd.ecowin.chart
-application/vnd.ecowin.filerequest
-application/vnd.ecowin.fileupdate
-application/vnd.ecowin.series
-application/vnd.ecowin.seriesrequest
-application/vnd.ecowin.seriesupdate
-application/vnd.enliven
-application/vnd.epson.esf
-application/vnd.epson.msf
-application/vnd.epson.quickanime
-application/vnd.epson.salt
-application/vnd.epson.ssf
-application/vnd.ericsson.quickcall
-application/vnd.eudora.data
-application/vnd.fdf
-application/vnd.ffsns
-application/vnd.flographit
-application/vnd.framemaker
-application/vnd.fsc.weblaunch
-application/vnd.fujitsu.oasys
-application/vnd.fujitsu.oasys2
-application/vnd.fujitsu.oasys3
-application/vnd.fujitsu.oasysgp
-application/vnd.fujitsu.oasysprs
-application/vnd.fujixerox.ddd
-application/vnd.fujixerox.docuworks
-application/vnd.fujixerox.docuworks.binder
-application/vnd.fut-misnet
-application/vnd.grafeq
-application/vnd.groove-account
-application/vnd.groove-identity-message
-application/vnd.groove-injector
-application/vnd.groove-tool-message
-application/vnd.groove-tool-template
-application/vnd.groove-vcard
-application/vnd.hhe.lesson-player
-application/vnd.hp-HPGL
-application/vnd.hp-PCL
-application/vnd.hp-PCLXL
-application/vnd.hp-hpid
-application/vnd.hp-hps
-application/vnd.httphone
-application/vnd.hzn-3d-crossword
-application/vnd.ibm.MiniPay
-application/vnd.ibm.afplinedata
-application/vnd.ibm.modcap
-application/vnd.informix-visionary
-application/vnd.intercon.formnet
-application/vnd.intertrust.digibox
-application/vnd.intertrust.nncp
-application/vnd.intu.qbo
-application/vnd.intu.qfx
-application/vnd.irepository.package+xml
-application/vnd.is-xpr
-application/vnd.japannet-directory-service
-application/vnd.japannet-jpnstore-wakeup
-application/vnd.japannet-payment-wakeup
-application/vnd.japannet-registration
-application/vnd.japannet-registration-wakeup
-application/vnd.japannet-setstore-wakeup
-application/vnd.japannet-verification
-application/vnd.japannet-verification-wakeup
-application/vnd.koan
-application/vnd.lotus-1-2-3
-application/vnd.lotus-approach
-application/vnd.lotus-freelance
-application/vnd.lotus-notes
-application/vnd.lotus-organizer
-application/vnd.lotus-screencam
-application/vnd.lotus-wordpro
-application/vnd.mcd
-application/vnd.mediastation.cdkey
-application/vnd.meridian-slingshot
-application/vnd.mif
-application/vnd.minisoft-hp3000-save
-application/vnd.mitsubishi.misty-guard.trustweb
-application/vnd.mobius.daf
-application/vnd.mobius.dis
-application/vnd.mobius.msl
-application/vnd.mobius.plc
-application/vnd.mobius.txf
-application/vnd.motorola.flexsuite
-application/vnd.motorola.flexsuite.adsi
-application/vnd.motorola.flexsuite.fis
-application/vnd.motorola.flexsuite.gotap
-application/vnd.motorola.flexsuite.kmr
-application/vnd.motorola.flexsuite.ttc
-application/vnd.motorola.flexsuite.wem
-application/vnd.mozilla.xul+xml			xul
-application/vnd.ms-artgalry
-application/vnd.ms-asf
-application/vnd.ms-excel			xls xlb xlt
-application/vnd.ms-lrm
-application/vnd.ms-pki.seccat			cat
-application/vnd.ms-pki.stl			stl
-application/vnd.ms-powerpoint			ppt pps
-application/vnd.ms-project
-application/vnd.ms-tnef
-application/vnd.ms-works
-application/vnd.mseq
-application/vnd.msign
-application/vnd.music-niff
-application/vnd.musician
-application/vnd.netfpx
-application/vnd.noblenet-directory
-application/vnd.noblenet-sealer
-application/vnd.noblenet-web
-application/vnd.novadigm.EDM
-application/vnd.novadigm.EDX
-application/vnd.novadigm.EXT
-application/vnd.oasis.opendocument.chart	odc
-application/vnd.oasis.opendocument.database	odb
-application/vnd.oasis.opendocument.formula	odf
-application/vnd.oasis.opendocument.graphics	odg
-application/vnd.oasis.opendocument.graphics-template	otg
-application/vnd.oasis.opendocument.image	odi
-application/vnd.oasis.opendocument.presentation	odp
-application/vnd.oasis.opendocument.presentation-template	otp
-application/vnd.oasis.opendocument.spreadsheet	ods
-application/vnd.oasis.opendocument.spreadsheet-template	ots
-application/vnd.oasis.opendocument.text		odt
-application/vnd.oasis.opendocument.text-master	odm
-application/vnd.oasis.opendocument.text-template	ott
-application/vnd.oasis.opendocument.text-web	oth
-application/vnd.osa.netdeploy
-application/vnd.palm
-application/vnd.pg.format
-application/vnd.pg.osasli
-application/vnd.powerbuilder6
-application/vnd.powerbuilder6-s
-application/vnd.powerbuilder7
-application/vnd.powerbuilder7-s
-application/vnd.powerbuilder75
-application/vnd.powerbuilder75-s
-application/vnd.previewsystems.box
-application/vnd.publishare-delta-tree
-application/vnd.pvi.ptid1
-application/vnd.pwg-xhtml-print+xml
-application/vnd.rapid
-application/vnd.rim.cod				cod
-application/vnd.s3sms
-application/vnd.seemail
-application/vnd.shana.informed.formdata
-application/vnd.shana.informed.formtemplate
-application/vnd.shana.informed.interchange
-application/vnd.shana.informed.package
-application/vnd.smaf				mmf
-application/vnd.sss-cod
-application/vnd.sss-dtf
-application/vnd.sss-ntf
-application/vnd.stardivision.calc		sdc
-application/vnd.stardivision.draw		sda
-application/vnd.stardivision.impress		sdd sdp
-application/vnd.stardivision.math		smf
-application/vnd.stardivision.writer		sdw vor
-application/vnd.stardivision.writer-global	sgl
-application/vnd.street-stream
-application/vnd.sun.xml.calc			sxc
-application/vnd.sun.xml.calc.template		stc
-application/vnd.sun.xml.draw			sxd
-application/vnd.sun.xml.draw.template		std
-application/vnd.sun.xml.impress			sxi
-application/vnd.sun.xml.impress.template	sti
-application/vnd.sun.xml.math			sxm
-application/vnd.sun.xml.writer			sxw
-application/vnd.sun.xml.writer.global		sxg
-application/vnd.sun.xml.writer.template		stw
-application/vnd.svd
-application/vnd.swiftview-ics
-application/vnd.symbian.install			sis
-application/vnd.triscape.mxs
-application/vnd.trueapp
-application/vnd.truedoc
-application/vnd.tve-trigger
-application/vnd.ufdl
-application/vnd.uplanet.alert
-application/vnd.uplanet.alert-wbxml
-application/vnd.uplanet.bearer-choice
-application/vnd.uplanet.bearer-choice-wbxml
-application/vnd.uplanet.cacheop
-application/vnd.uplanet.cacheop-wbxml
-application/vnd.uplanet.channel
-application/vnd.uplanet.channel-wbxml
-application/vnd.uplanet.list
-application/vnd.uplanet.list-wbxml
-application/vnd.uplanet.listcmd
-application/vnd.uplanet.listcmd-wbxml
-application/vnd.uplanet.signal
-application/vnd.vcx
-application/vnd.vectorworks
-application/vnd.vidsoft.vidconference
-application/vnd.visio				vsd
-application/vnd.vividence.scriptfile
-application/vnd.wap.sic
-application/vnd.wap.slc
-application/vnd.wap.wbxml			wbxml
-application/vnd.wap.wmlc			wmlc
-application/vnd.wap.wmlscriptc			wmlsc
-application/vnd.webturbo
-application/vnd.wrq-hp3000-labelled
-application/vnd.wso2.bpel+xml			bpel
-application/vnd.wso2.bpmn+xml			bpmn
-application/vnd.wso2.endpoint
-application/vnd.wso2.governance-archive		gar
-application/vnd.wso2-hyperlink
-application/vnd.wso2.registry-ext-type+xml	rxt
-application/vnd.wso2-service+xml
-application/vnd.wso2.xpdl+xml			xpdl
-application/vnd.wt.stf
-application/vnd.xara
-application/vnd.xfdl
-application/vnd.yellowriver-custom-menu
-application/x-123				wk
-application/x-abiword				abw
-application/x-apple-diskimage			dmg
-application/x-bcpio				bcpio
-application/x-bittorrent			torrent
-application/x-cdf				cdf
-application/x-cdlink				vcd
-application/x-chess-pgn				pgn
-application/x-core
-application/x-cpio				cpio
-application/x-csh				csh
-application/x-debian-package			deb udeb
-application/x-director				dcr dir dxr
-application/x-dms				dms
-application/x-doom				wad
-application/x-dvi				dvi
-application/x-executable
-application/x-flac				flac
-application/x-font				pfa pfb gsf pcf pcf.Z
-application/x-freemind				mm
-application/x-futuresplash			spl
-application/x-gnumeric				gnumeric
-application/x-go-sgf				sgf
-application/x-graphing-calculator		gcf
-application/x-gtar				gtar tgz taz
-application/x-hdf				hdf
-application/x-httpd-php				phtml pht php
-application/x-httpd-php-source			phps
-application/x-httpd-php3			php3
-application/x-httpd-php3-preprocessed		php3p
-application/x-httpd-php4			php4
-application/x-httpd-eruby			rhtml
-application/x-ica				ica
-application/x-internet-signup			ins isp
-application/x-iphone				iii
-application/x-iso9660-image			iso
-application/x-java-applet
-application/x-java-bean
-application/x-java-jnlp-file			jnlp
-application/x-javascript			js
-application/x-jmol				jmz
-application/x-kchart				chrt
-application/x-kdelnk
-application/x-killustrator			kil
-application/x-koan				skp skd skt skm
-application/x-kpresenter			kpr kpt
-application/x-kspread				ksp
-application/x-kword				kwd kwt
-application/x-latex				latex
-application/x-lha				lha
-application/x-lzh				lzh
-application/x-lzx				lzx
-application/x-maker				frm maker frame fm fb book fbdoc
-application/x-mif				mif
-application/x-ms-wmd				wmd
-application/x-ms-wmz				wmz
-application/x-msdos-program			com exe bat dll
-application/x-msi				msi
-application/x-netcdf				nc
-application/x-ns-proxy-autoconfig		pac
-application/x-nwc				nwc
-application/x-object				o
-application/x-oz-application			oza
-application/x-pkcs7-certreqresp			p7r
-application/x-pkcs7-crl				crl
-application/x-python-code			pyc pyo
-application/x-quicktimeplayer			qtl
-application/x-redhat-package-manager		rpm
-application/x-rx
-application/x-sh				sh
-application/x-shar				shar
-application/x-shellscript
-application/x-shockwave-flash			swf swfl
-application/x-stuffit				sit
-application/x-sv4cpio				sv4cpio
-application/x-sv4crc				sv4crc
-application/x-tar				tar
-application/x-tcl				tcl
-application/x-tex-gf				gf
-application/x-tex-pk				pk
-application/x-texinfo				texinfo texi
-application/x-trash				~ % bak old sik
-application/x-troff				t tr roff
-application/x-troff-man				man
-application/x-troff-me				me
-application/x-troff-ms				ms
-application/x-ustar				ustar
-application/x-videolan
-application/x-wais-source			src
-application/x-wingz				wz
-application/x-x509-ca-cert			crt
-application/x-xcf				xcf
-application/x-xfig				fig
-application/x-xpinstall				xpi
-application/x-xsd+xml				xsd
-
-audio/32kadpcm
-audio/basic					au snd
-audio/g.722.1
-audio/l16
-audio/midi					mid midi kar
-audio/mp4a-latm
-audio/mpa-robust
-audio/mpeg					mpga mpega mp2 mp3 m4a
-audio/mpegurl					m3u
-audio/parityfec
-audio/prs.sid					sid
-audio/telephone-event
-audio/tone
-audio/vnd.cisco.nse
-audio/vnd.cns.anp1
-audio/vnd.cns.inf1
-audio/vnd.digital-winds
-audio/vnd.everad.plj
-audio/vnd.lucent.voice
-audio/vnd.nortel.vbk
-audio/vnd.nuera.ecelp4800
-audio/vnd.nuera.ecelp7470
-audio/vnd.nuera.ecelp9600
-audio/vnd.octel.sbc
-audio/vnd.qcelp
-audio/vnd.rhetorex.32kadpcm
-audio/vnd.vmx.cvsd
-audio/x-aiff					aif aiff aifc
-audio/x-gsm					gsm
-audio/x-mpegurl					m3u
-audio/x-ms-wma					wma
-audio/x-ms-wax					wax
-audio/x-pn-realaudio-plugin
-audio/x-pn-realaudio				ra rm ram
-audio/x-realaudio				ra
-audio/x-scpls					pls
-audio/x-sd2					sd2
-audio/x-wav					wav
-
-chemical/x-alchemy				alc
-chemical/x-cache				cac cache
-chemical/x-cache-csf				csf
-chemical/x-cactvs-binary			cbin cascii ctab
-chemical/x-cdx					cdx
-chemical/x-cerius				cer
-chemical/x-chem3d				c3d
-chemical/x-chemdraw				chm
-chemical/x-cif					cif
-chemical/x-cmdf					cmdf
-chemical/x-cml					cml
-chemical/x-compass				cpa
-chemical/x-crossfire				bsd
-chemical/x-csml					csml csm
-chemical/x-ctx					ctx
-chemical/x-cxf					cxf cef
-#chemical/x-daylight-smiles			smi
-chemical/x-embl-dl-nucleotide			emb embl
-chemical/x-galactic-spc				spc
-chemical/x-gamess-input				inp gam gamin
-chemical/x-gaussian-checkpoint			fch fchk
-chemical/x-gaussian-cube			cub
-chemical/x-gaussian-input			gau gjc gjf
-chemical/x-gaussian-log				gal
-chemical/x-gcg8-sequence			gcg
-chemical/x-genbank				gen
-chemical/x-hin					hin
-chemical/x-isostar				istr ist
-chemical/x-jcamp-dx				jdx dx
-chemical/x-kinemage				kin
-chemical/x-macmolecule				mcm
-chemical/x-macromodel-input			mmd mmod
-chemical/x-mdl-molfile				mol
-chemical/x-mdl-rdfile				rd
-chemical/x-mdl-rxnfile				rxn
-chemical/x-mdl-sdfile				sd sdf
-chemical/x-mdl-tgf				tgf
-#chemical/x-mif					mif
-chemical/x-mmcif				mcif
-chemical/x-mol2					mol2
-chemical/x-molconn-Z				b
-chemical/x-mopac-graph				gpt
-chemical/x-mopac-input				mop mopcrt mpc dat zmt
-chemical/x-mopac-out				moo
-chemical/x-mopac-vib				mvb
-chemical/x-ncbi-asn1				asn
-chemical/x-ncbi-asn1-ascii			prt ent
-chemical/x-ncbi-asn1-binary			val aso
-chemical/x-ncbi-asn1-spec			asn
-chemical/x-pdb					pdb ent
-chemical/x-rosdal				ros
-chemical/x-swissprot				sw
-chemical/x-vamas-iso14976			vms
-chemical/x-vmd					vmd
-chemical/x-xtel					xtel
-chemical/x-xyz					xyz
-
-image/cgm
-image/g3fax
-image/gif					gif
-image/ief					ief
-image/jpeg					jpeg jpg jpe
-image/naplps
-image/pcx					pcx
-image/png					png
-image/prs.btif
-image/prs.pti
-image/svg+xml					svg svgz
-image/tiff					tiff tif
-image/vnd.cns.inf2
-image/vnd.djvu					djvu djv
-image/vnd.dwg
-image/vnd.dxf
-image/vnd.fastbidsheet
-image/vnd.fpx
-image/vnd.fst
-image/vnd.fujixerox.edmics-mmr
-image/vnd.fujixerox.edmics-rlc
-image/vnd.mix
-image/vnd.net-fpx
-image/vnd.svf
-image/vnd.wap.wbmp				wbmp
-image/vnd.xiff
-image/x-cmu-raster				ras
-image/x-coreldraw				cdr
-image/x-coreldrawpattern			pat
-image/x-coreldrawtemplate			cdt
-image/x-corelphotopaint				cpt
-image/x-icon					ico
-image/x-jg					art
-image/x-jng					jng
-image/x-ms-bmp					bmp
-image/x-photoshop				psd
-image/x-portable-anymap				pnm
-image/x-portable-bitmap				pbm
-image/x-portable-graymap			pgm
-image/x-portable-pixmap				ppm
-image/x-rgb					rgb
-image/x-xbitmap					xbm
-image/x-xpixmap					xpm
-image/x-xwindowdump				xwd
-
-inode/chardevice
-inode/blockdevice
-inode/directory-locked
-inode/directory
-inode/fifo
-inode/socket
-
-message/delivery-status
-message/disposition-notification
-message/external-body
-message/http
-message/s-http
-message/news
-message/partial
-message/rfc822
-
-model/iges					igs iges
-model/mesh					msh mesh silo
-model/vnd.dwf
-model/vnd.flatland.3dml
-model/vnd.gdl
-model/vnd.gs-gdl
-model/vnd.gtw
-model/vnd.mts
-model/vnd.vtu
-model/vrml					wrl vrml
-
-multipart/alternative
-multipart/appledouble
-multipart/byteranges
-multipart/digest
-multipart/encrypted
-multipart/form-data
-multipart/header-set
-multipart/mixed
-multipart/parallel
-multipart/related
-multipart/report
-multipart/signed
-multipart/voice-message
-
-text/calendar					ics icz
-text/comma-separated-values			csv
-text/css					css
-text/directory
-text/english
-text/enriched
-text/h323					323
-text/html					html htm shtml
-text/iuls					uls
-text/mathml					mml
-text/parityfec
-text/plain					asc txt text diff pot sql
-text/prs.lines.tag
-text/rfc822-headers
-text/richtext					rtx
-text/rtf					rtf
-text/scriptlet					sct wsc
-text/t140
-text/texmacs					tm ts
-text/tab-separated-values			tsv
-text/uri-list
-text/vnd.abc
-text/vnd.curl
-text/vnd.DMClientScript
-text/vnd.flatland.3dml
-text/vnd.fly
-text/vnd.fmi.flexstor
-text/vnd.in3d.3dml
-text/vnd.in3d.spot
-text/vnd.IPTC.NewsML
-text/vnd.IPTC.NITF
-text/vnd.latex-z
-text/vnd.motorola.reflex
-text/vnd.ms-mediapackage
-text/vnd.sun.j2me.app-descriptor		jad
-text/vnd.wap.si
-text/vnd.wap.sl
-text/vnd.wap.wml				wml
-text/vnd.wap.wmlscript				wmls
-text/x-bibtex					bib
-text/x-boo					boo
-text/x-c++hdr					h++ hpp hxx hh
-text/x-c++src					c++ cpp cxx cc
-text/x-chdr					h
-text/x-component				htc
-text/x-crontab
-text/x-csh					csh
-text/x-csrc					c
-text/x-dsrc					d
-text/x-haskell					hs
-text/x-java					java
-text/x-literate-haskell				lhs
-text/x-makefile
-text/x-moc					moc
-text/x-pascal					p pas
-text/x-pcs-gcd					gcd
-text/x-perl					pl pm
-text/x-python					py
-text/x-server-parsed-html
-text/x-setext					etx
-text/x-sh					sh
-text/x-tcl					tcl tk
-text/x-tex					tex ltx sty cls
-text/x-vcalendar				vcs
-text/x-vcard					vcf
-
-video/dl					dl
-video/dv					dif dv
-video/fli					fli
-video/gl					gl
-video/mpeg					mpeg mpg mpe
-video/mp4					mp4
-video/quicktime					qt mov
-video/mp4v-es
-video/parityfec
-video/pointer
-video/vnd.fvt
-video/vnd.motorola.video
-video/vnd.motorola.videop
-video/vnd.mpegurl				mxu
-video/vnd.mts
-video/vnd.nokia.interleaved-multimedia
-video/vnd.vivo
-video/x-la-asf					lsf lsx
-video/x-mng					mng
-video/x-ms-asf					asf asx
-video/x-ms-wm					wm
-video/x-ms-wmv					wmv
-video/x-ms-wmx					wmx
-video/x-ms-wvx					wvx
-video/x-msvideo					avi
-video/x-sgi-movie				movie
-
-x-conference/x-cooltalk				ice
-
-x-world/x-vrml					vrm vrml wrl
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options
deleted file mode 100644
index ba8e3c6c20..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/osgi-debug.options
+++ /dev/null
@@ -1,95 +0,0 @@
-#### Debugging options for org.eclipse.osgi
-
-# Turn on general debugging for org.eclipse.osgi
-org.eclipse.osgi/debug=true
-# Prints out class loading debug information
-org.eclipse.osgi/debug/loader=false
-# Prints out event (FrameworkEvent/BundleEvent/ServiceEvent) and listener debug information
-org.eclipse.osgi/debug/events=false
-# Prints out OSGi service debug information (registration/getting/ungetting etc.)
-org.eclipse.osgi/debug/services=false
-# Prints out bundle manifest parsing debug information
-org.eclipse.osgi/debug/manifest=false
-# Prints out LDAP filter debug information
-org.eclipse.osgi/debug/filter=false
-# Prints out security (PermissionAdmin service) debug information
-org.eclipse.osgi/debug/security=false
-# Prints out start level service debug information
-org.eclipse.osgi/debug/startlevel=true
-# Prints out package admin service debug information
-org.eclipse.osgi/debug/packageadmin=false
-# Prints out timing information for bundle activation
-org.eclipse.osgi/debug/bundleTime=false
-# Debug the loading of message bundles
-org.eclipse.osgi/debug/messageBundles=false
-
-# Eclipse adaptor options
-org.eclipse.osgi/eclipseadaptor/debug = false
-org.eclipse.osgi/eclipseadaptor/debug/location = false
-org.eclipse.osgi/eclipseadaptor/debug/platformadmin=false
-org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver=false
-org.eclipse.osgi/eclipseadaptor/converter/debug = false
-
-### OSGi resolver options
-# Turns on debugging for the resolver
-org.eclipse.osgi/resolver/debug = false
-# Prints out wiring information after the resolver has completed the resolve process
-org.eclipse.osgi/resolver/wiring = false
-# Prints out Import-Package information
-org.eclipse.osgi/resolver/imports = false
-# Prints out Require-Bundle information
-org.eclipse.osgi/resolver/requires = false
-# Prints out package grouping information form the "uses" clause
-org.eclipse.osgi/resolver/grouping = false
-# Prints out cycle information
-org.eclipse.osgi/resolver/cycles = false
-# Prints out Eclipse-GenericRequire information
-org.eclipse.osgi/resolver/generics = false
-
-#### Profile settings
-org.eclipse.osgi/profile/startup = false
-org.eclipse.osgi/profile/benchmark = false
-org.eclipse.osgi/profile/debug = true
-
-# Override the default implemenation 
-org.eclipse.osgi/profile/impl = org.eclipse.osgi.internal.profile.DefaultProfileLogger
-
-# Append all profile messages to the filename specified
-org.eclipse.osgi/defaultprofile/logfilename = 
-
-# Output all profile log messages synchronously to the jvm console.
-# By default, all log messages are cached until the log buffer is
-# requested.
-org.eclipse.osgi/defaultprofile/logsynchronously = false
-
-# Specify the size of the default profile implementation log buffer.
-org.eclipse.osgi/defaultprofile/buffersize = 256
-
-#### Monitoring settings
-# monitor class loading
-org.eclipse.osgi/monitor/classes=false
-
-# monitor bundle activation
-org.eclipse.osgi/monitor/activation=false
-
-# monitor resource bundle (*.properties) loading
-org.eclipse.osgi/monitor/resources=false
-
-
-#### Trace settings
-# trace class loading - snapshot the execution stack when a class is loaded
-org.eclipse.osgi/trace/classLoading=false
-
-# trace location - file in which execution traces are written
-org.eclipse.osgi/trace/filename=runtime.traces
-
-# trace filters - Java properties file defining which classes should 
-# be traced (if trace/classLoading is true)
-# File format:
-# plugins=<comma separated list of plugins whose classes to trace>
-# packages=<comma separated list of package prefixes of classes to trace>
-# Note that there may be many 'plugins' and 'packages' lines in one file.
-org.eclipse.osgi/trace/filters=trace.properties
-
-# trace bundle activation - snapshot the execution stack when a bundle is activated
-org.eclipse.osgi/trace/activation=false
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml
deleted file mode 100644
index 0a9289da70..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/etc/tasks-config.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<tasks-configuration xmlns:svns="http://org.wso2.securevault/configuration">
-
-    <!--
-      The currently running server mode; possible values are:-
-      STANDALONE, CLUSTERED, REMOTE, AUTO.
-      In AUTO mode, the server startup checks whether clustering is enabled in the system,
-      if so, CLUSTERED mode will be used, or else, the the server mode will be STANDALONE.
-    -->
-    <taskServerMode>STANDALONE</taskServerMode>
-
-    <!--
-      To be used in CLUSTERED mode to notify how many servers are there in
-      the task server cluster, the servers wait till this amount of servers
-      are activated before the tasks are scheduled -->
-    <taskServerCount>2</taskServerCount>
-
-    <!-- The default location resolver configuration -->
-    <defaultLocationResolver>
-        <locationResolverClass>org.wso2.carbon.ntask.core.impl.RoundRobinTaskLocationResolver</locationResolverClass>
-    </defaultLocationResolver>
-
-    <!--
-      if task-type-pattern matches and task-name-pattern matches, check existing addresses of address-pattern,
-      and if addresses exist, select address in round-robin fashion, if not move onto next rule in sequence.
-      <property name="rule-[order]">[task-type-pattern],[task-name-pattern],[address-pattern]</property>
-    -->
-    <!--defaultLocationResolver>
-        <locationResolverClass>org.wso2.carbon.ntask.core.impl.RuleBasedLocationResolver</locationResolverClass>
-        <properties>
-            <property name="rule-1">HIVE_TASK,.*,192.168.2.*</property>
-            <property name="rule-5">.*,.*,.*</property>
-        </properties>
-    </defaultLocationResolver-->
-
-    <!-- The address to which the remote task server should dispatch the trigger messages to,
-      usually this would be an endpoint to a load balancer -->
-    <taskClientDispatchAddress>https://localhost:9448</taskClientDispatchAddress>
-
-    <!-- The address of the remote task server -->
-    <remoteServerAddress>https://localhost:9443</remoteServerAddress>
-
-    <!-- The username to authenticate to the remote task server -->
-    <remoteServerUsername>admin</remoteServerUsername>
-
-    <!-- The password to authenticate to the remote task server -->
-    <remoteServerPassword>admin</remoteServerPassword>
-
-    <!-- Below contain a sample to be used when using with secure vault -->
-    <!--remoteServerPassword svns:secretAlias="remote.task.server.password"></remoteServerPassword-->
-
-</tasks-configuration>
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/log4j.properties b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/log4j.properties
deleted file mode 100644
index 9cff0ddf72..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/log4j.properties
+++ /dev/null
@@ -1,165 +0,0 @@
-#
-# Copyright 2009 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 log4j configuration file used by WSO2 Carbon
-#
-# IMPORTANT : Please do not remove or change the names of any
-# of the Appenders defined here. The layout pattern & log file
-# can be changed using the WSO2 Carbon Management Console, and those
-# settings will override the settings in this file.
-#
-
-log4j.rootLogger=INFO, CARBON_CONSOLE, CARBON_LOGFILE, CARBON_MEMORY, CARBON_SYS_LOG
-
-log4j.logger.AUDIT_LOG=INFO, AUDIT_LOGFILE
-log4j.logger.org.apache.axis2.wsdl.codegen.writer.PrettyPrinter=ERROR, CARBON_LOGFILE, CARBON_MEMORY
-log4j.logger.org.apache.axis2.clustering=INFO, CARBON_CONSOLE, CARBON_LOGFILE
-log4j.logger.org.apache=INFO, CARBON_LOGFILE, CARBON_MEMORY
-log4j.logger.org.apache.catalina=WARN
-log4j.logger.org.apache.tomcat=WARN
-log4j.logger.org.wso2.carbon.apacheds=WARN
-log4j.logger.org.apache.directory.server.ldap=ERROR
-log4j.logger.org.apache.directory.server.core.event=WARN
-log4j.logger.com.atomikos=INFO,ATOMIKOS
-log4j.logger.org.quartz=WARN
-log4j.logger.org.apache.jackrabbit.webdav=WARN
-log4j.logger.org.apache.juddi=ERROR
-log4j.logger.org.apache.commons.digester.Digester=WARN
-log4j.logger.org.apache.jasper.compiler.TldLocationsCache=WARN
-log4j.logger.org.apache.qpid=WARN
-log4j.logger.org.apache.qpid.server.Main=INFO
-log4j.logger.qpid.message=WARN
-log4j.logger.qpid.message.broker.listening=INFO
-log4j.logger.org.apache.tiles=WARN
-log4j.logger.org.apache.commons.httpclient=ERROR
-log4j.logger.org.apache.coyote=WARN
-log4j.logger.org.apache.solr=ERROR
-log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=ERROR
-log4j.logger.org.wso2=INFO
-log4j.logger.org.apache.axis2.enterprise=FATAL, CARBON_LOGFILE, CARBON_MEMORY
-log4j.logger.org.opensaml.xml=WARN, CARBON_LOGFILE, CARBON_MEMORY
-log4j.logger.org.apache.directory.shared.ldap=WARN, CARBON_LOGFILE, CARBON_MEMORY
-log4j.logger.org.apache.directory.server.ldap.handlers=WARN, CARBON_LOGFILE, CARBON_MEMORY
-#Following are to remove false error messages from startup (IS)
-log4j.logger.org.apache.directory.shared.ldap.entry.DefaultServerAttribute=FATAL, CARBON_LOGFILE, CARBON_MEMORY
-log4j.logger.org.apache.directory.server.core.DefaultDirectoryService=ERROR, CARBON_LOGFILE, CARBON_MEMORY
-log4j.logger.org.apache.directory.shared.ldap.ldif.LdifReader=ERROR, CARBON_LOGFILE, CARBON_MEMORY
-log4j.logger.org.apache.directory.server.ldap.LdapProtocolHandler=ERROR, CARBON_LOGFILE, CARBON_MEMORY
-log4j.logger.org.apache.directory.server.core=ERROR, CARBON_LOGFILE, CARBON_MEMORY
-log4j.logger.org.apache.directory.server.ldap.LdapSession=ERROR, CARBON_LOGFILE, CARBON_MEMORY
-#Hive Related Log configurations
-log4j.logger.DataNucleus=ERROR
-log4j.logger.Datastore=ERROR
-log4j.logger.Datastore.Schema=ERROR
-log4j.logger.JPOX.Datastore=ERROR
-log4j.logger.JPOX.Plugin=ERROR
-log4j.logger.JPOX.MetaData=ERROR
-log4j.logger.JPOX.Query=ERROR
-log4j.logger.JPOX.General=ERROR
-log4j.logger.JPOX.Enhancer=ERROR
-log4j.logger.org.apache.hadoop.hive=WARN
-log4j.logger.hive=WARN
-log4j.logger.ExecMapper=WARN
-log4j.logger.ExecReducer=WARN
-log4j.logger.net.sf.ehcache.config.ConfigurationFactory=ERROR
-
-log4j.logger.trace.messages=TRACE,CARBON_TRACE_LOGFILE
-
-log4j.additivity.org.apache.axis2.clustering=false
-log4j.additivity.com.atomikos=false
-log4j.additivity.org.apache=false
-
-# CARBON_CONSOLE is set to be a ConsoleAppender using a PatternLayout.
-log4j.appender.CARBON_CONSOLE=org.wso2.carbon.utils.logging.appenders.CarbonConsoleAppender
-log4j.appender.CARBON_CONSOLE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout
-# ConversionPattern will be overridden by the configuration setting in the DB
-log4j.appender.CARBON_CONSOLE.layout.ConversionPattern=[%d] %P%5p {%c} - %x %m%n
-log4j.appender.CARBON_CONSOLE.layout.TenantPattern=%U%@%D[%T]
-log4j.appender.CARBON_CONSOLE.threshold=DEBUG
-
-# CARBON_MEMORY is set to be a MemoryAppender using a PatternLayout.
-log4j.appender.CARBON_MEMORY=org.wso2.carbon.utils.logging.appenders.MemoryAppender
-log4j.appender.CARBON_MEMORY.layout=org.apache.log4j.PatternLayout
-log4j.appender.CARBON_MEMORY.bufferSize=200
-# ConversionPattern will be overridden by the configuration setting in the DB
-#log4j.appender.CARBON_MEMORY.layout.ConversionPattern=[%d] %5p - %x %m {%c}%n
-log4j.appender.CARBON_MEMORY.layout.ConversionPattern=[%d] %5p {%c} - %x %m %n
-log4j.appender.CARBON_MEMORY.threshold=DEBUG
-
-
-# CARBON_LOGFILE is set to be a DailyRollingFileAppender using a PatternLayout.
-log4j.appender.CARBON_LOGFILE=org.wso2.carbon.utils.logging.appenders.CarbonDailyRollingFileAppender
-# Log file will be overridden by the configuration setting in the DB
-# This path should be relative to WSO2 Carbon Home
-log4j.appender.CARBON_LOGFILE.File=${carbon.home}/repository/logs/${instance.log}/wso2carbon${instance.log}.log
-log4j.appender.CARBON_LOGFILE.Append=true
-log4j.appender.CARBON_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout
-# ConversionPattern will be overridden by the configuration setting in the DB
-log4j.appender.CARBON_LOGFILE.layout.ConversionPattern=TID: [%T] [%S] [%d] %P%5p {%c} - %x %m %n
-log4j.appender.CARBON_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S]
-log4j.appender.CARBON_LOGFILE.threshold=DEBUG
-
-log4j.appender.CARBON_SYS_LOG = org.apache.log4j.net.SyslogAppender
-log4j.appender.CARBON_SYS_LOG.layout=org.apache.log4j.PatternLayout
-log4j.appender.CARBON_SYS_LOG.layout.ConversionPattern=[%d] %5p {%c} - %x %m %n
-log4j.appender.CARBON_SYS_LOG.SyslogHost=localhost
-log4j.appender.CARBON_SYS_LOG.Facility=USER
-log4j.appender.CARBON_SYS_LOG.threshold=DEBUG
-
-# LOGEVENT is set to be a LogEventAppender using a PatternLayout to send logs to LOGEVENT 
-log4j.appender.LOGEVENT=org.wso2.carbon.logging.service.appender.LogEventAppender
-log4j.appender.LOGEVENT.url=tcp://10.100.3.103:7611
-log4j.appender.LOGEVENT.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout
-log4j.appender.LOGEVENT.columnList=%T,%S,%A,%d,%c,%p,%m,%H,%I,%Stacktrace
-log4j.appender.LOGEVENT.userName=admin
-log4j.appender.LOGEVENT.password=admin
-#log4j.appender.LOGEVENT.password=secretAlias:Log4j.Appender.LOGEVENT.Password
-
-# Appender config to CARBON_TRACE_LOGFILE
-log4j.appender.CARBON_TRACE_LOGFILE=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.CARBON_TRACE_LOGFILE.File=${carbon.home}/repository/logs/${instance.log}/wso2carbon-trace-messages${instance.log}.log
-log4j.appender.CARBON_TRACE_LOGFILE.Append=true
-log4j.appender.CARBON_TRACE_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout
-log4j.appender.CARBON_TRACE_LOGFILE.layout.ConversionPattern=[%d] %P%5p {%c} - %x %m %n
-log4j.appender.CARBON_TRACE_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S]
-log4j.appender.CARBON_TRACE_LOGFILE.threshold=TRACE
-log4j.additivity.trace.messages=false
-
-# Appender config to AUDIT_LOGFILE
-log4j.appender.AUDIT_LOGFILE=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.AUDIT_LOGFILE.File=${carbon.home}/repository/logs/audit.log
-log4j.appender.AUDIT_LOGFILE.Append=true
-log4j.appender.AUDIT_LOGFILE.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout
-log4j.appender.AUDIT_LOGFILE.layout.ConversionPattern=[%d] %P%5p {%c}- %x %m %n
-log4j.appender.AUDIT_LOGFILE.layout.TenantPattern=%U%@%D [%T] [%S]
-log4j.appender.AUDIT_LOGFILE.threshold=INFO
-log4j.additivity.AUDIT_LOG=false
-
-# Appender config to send Atomikos transaction logs to new log file tm.out.
-log4j.appender.ATOMIKOS = org.apache.log4j.RollingFileAppender
-log4j.appender.ATOMIKOS.File = repository/logs/tm.out
-log4j.appender.ATOMIKOS.Append = true
-log4j.appender.ATOMIKOS.layout = org.apache.log4j.PatternLayout
-log4j.appender.ATOMIKOS.layout.ConversionPattern=%p %t %c - %m%n
-
-# This file is used to override the default logger settings, and is used to remove unwanted logs from Shindig appearing on the console.
-
-# Specification of Handler used by Console Logger
-handlers=java.util.logging.ConsoleHandler
-
-# Replacing default INFO level with SEVERE
-java.util.logging.ConsoleHandler.level=SEVERE
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/registry.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/registry.xml
deleted file mode 100644
index 85d422c704..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/registry.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-  ~ Copyright 2005-2017 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.
-  -->
-<wso2registry>
-
-    <!--
-    For details on configuring different config & governance registries see;
-    http://wso2.org/library/tutorials/2010/04/sharing-registry-space-across-multiple-product-instances
-    -->
-
-    <currentDBConfig>wso2registry</currentDBConfig>
-    <readOnly>false</readOnly>
-    <enableCache>true</enableCache>
-    <registryRoot>/</registryRoot>
-
-    <dbConfig name="wso2registry">
-        <url>jdbc:h2:./target/databasetest/CARBON_TEST</url>
-        <!--userName>sa</userName>
-        <password>sa</password-->
-        <driverName>org.h2.Driver</driverName>
-        <maxActive>80</maxActive>
-        <maxWait>60000</maxWait>
-        <minIdle>5</minIdle>
-    </dbConfig>
-
-   <!--<handler class="org.wso2.carbon.registry.extensions.handlers.SynapseRepositoryHandler">
-        <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property name="mediaType">application/vnd.apache.synapse</property>
-        </filter>
-    </handler>
-
-    <handler class="org.wso2.carbon.registry.extensions.handlers.SynapseRepositoryHandler">
-        <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property name="mediaType">application/vnd.apache.esb</property>
-        </filter>
-    </handler>
-
-    <handler class="org.wso2.carbon.registry.extensions.handlers.Axis2RepositoryHandler">
-        <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property name="mediaType">application/vnd.apache.axis2</property>
-        </filter>
-    </handler>
-
-    <handler class="org.wso2.carbon.registry.extensions.handlers.Axis2RepositoryHandler">
-        <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property name="mediaType">application/vnd.apache.wsas</property>
-        </filter>
-    </handler>
-
-    <handler class="org.wso2.carbon.registry.extensions.handlers.WSDLMediaTypeHandler">
-        <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property name="mediaType">application/wsdl+xml</property>
-        </filter>
-    </handler>
-
-    <handler class="org.wso2.carbon.registry.extensions.handlers.XSDMediaTypeHandler">
-        <filter class="org.wso2.carbon.registry.core.jdbc.handlers.filters.MediaTypeMatcher">
-            <property name="mediaType">application/x-xsd+xml</property>
-        </filter>
-    </handler> -->
-
-    <!--remoteInstance url="https://localhost:9443/registry">
-        <id>instanceid</id>
-        <username>username</username>
-        <password>password</password>
-    </remoteInstance-->
-
-    <!--remoteInstance url="https://localhost:9443/registry">
-        <id>instanceid</id>
-        <dbConfig>wso2registry</dbConfig>
-        <readOnly>false</readOnly>
-        <enableCache>true</enableCache>
-        <registryRoot>/</registryRoot>
-    </remoteInstance-->
-
-    <!--mount path="/_system/config" overwrite="true|false|virtual">
-        <instanceId>instanceid</instanceId>
-        <targetPath>/_system/nodes</targetPath>
-    </mount-->
-
-    
-    <versionResourcesOnChange>false</versionResourcesOnChange>
-
-    <!-- NOTE: You can edit the options under "StaticConfiguration" only before the
-     startup. -->
-    <staticConfiguration>
-        <versioningProperties>true</versioningProperties>
-        <versioningComments>true</versioningComments>
-        <versioningTags>true</versioningTags>
-        <versioningRatings>true</versioningRatings>
-    </staticConfiguration>
-</wso2registry>
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/security/authenticators.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/security/authenticators.xml
deleted file mode 100644
index 01cd4c98cf..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/security/authenticators.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-  ~ Copyright 2005-2017 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 configuration file for Carbon authenticators. All the authenticator related configurations
-     should go here.
--->
-<Authenticators xmlns="http://wso2.org/projects/carbon/authenticators.xml">
-
-    <!-- Authenticator Configurations for TokenUIAuthenticator -->
-    <Authenticator name="TokenUIAuthenticator" disabled="true">
-        <Priority>5</Priority>
-    </Authenticator>
-
-    <!-- Authenticator Configurations for SAML2SSOAuthenticator -->
-    <Authenticator name="SAML2SSOAuthenticator" disabled="true">
-        <Priority>10</Priority>
-        <Config>
-            <Parameter name="LoginPage">/carbon/admin/login.jsp</Parameter>
-            <Parameter name="ServiceProviderID">carbonServer</Parameter>
-            <Parameter name="IdentityProviderSSOServiceURL">https://localhost:9443/samlsso</Parameter>
-            <Parameter name="NameIDPolicyFormat">urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</Parameter>
-
-            <!-- <Parameter name="IdPCertAlias">wso2carbon</Parameter> -->
-            <!-- <Parameter name="ResponseSignatureValidationEnabled">false</Parameter> -->
-            <!-- <Parameter name="LoginAttributeName"></Parameter> -->
-            <!-- <Parameter name="RoleClaimAttribute"></Parameter> -->
-            <!-- <Parameter name="AttributeValueSeparator">,</Parameter> -->
-
-            <!-- <Parameter name="JITUserProvisioning">true</Parameter> -->
-            <!-- <Parameter name="ProvisioningDefaultUserstore">PRIMARY</Parameter> -->
-            <!-- <Parameter name="ProvisioningDefaultRole">admin</Parameter> -->
-            <!-- <Parameter name="IsSuperAdminRoleRequired">true</Parameter> -->
-	</Config>
-	
-	<!-- If this authenticator should skip any URI from authentication, specify it under "SkipAuthentication"
-	<SkipAuthentication>
-            <UrlContains></UrlContains>
-        </SkipAuthentication> -->
-	
-	<!-- If this authenticator should skip any URI from session validation, specify it under "SkipAuthentication
-        <SkipSessionValidation>
-            <UrlContains></UrlContains>
-        </SkipSessionValidation> -->
-    </Authenticator>
-
-        <!-- Authenticator Configurations for MutualSSLAuthenticator -->
-    <!--Authenticator name="MutualSSLAuthenticator" disabled="false">
-	  <Priority>5</Priority>
-	  <Config>
-	      <Parameter name="UsernameHeader">UserName</Parameter>
-	      <Parameter name="WhiteListEnabled">false</Parameter>
-	      <Parameter name="WhiteList"/>
-	  </Config>
-    </Authenticator-->
-    
-</Authenticators>
-
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml
deleted file mode 100644
index 04f622e3e7..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/tomcat/carbon/META-INF/context.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-  ~ Copyright 2005-2017 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.
-  -->
-
-<!-- The contents of this file will be loaded for each web application -->
-<Context privileged="true" allowLinking="true">
-
-    <!-- Default set of monitored resources -->
-    <WatchedResource>WEB-INF/web.xml</WatchedResource>
-
-    <!-- comment this out to enable session persistence across Tomcat restarts -->    
-    <Manager pathname="" />
-
-    <JarScanner className="org.wso2.carbon.tomcat.ext.scan.CarbonTomcatJarScanner" scanClassPath="true" scanAllFiles="false" scanAllDirectories="false"/>
-     
-    <!-- Following are default values. But we specifically add them in kernel, becuase they get overridden in WSO2 AS -->
-    <Loader className="org.apache.catalina.loader.WebappLoader" loaderClass="org.apache.catalina.loader.WebappClassLoader" />
-
-</Context>
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml
deleted file mode 100644
index 52f88eb30c..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/tomcat/carbon/WEB-INF/web.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (c) 2005-2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. licenses this file to you under the Apache License,
- ~ Version 2.0 (the "License"); you may not use this file except
- ~ in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~    http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied.  See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
-        "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app id="WebApp">
-
-    <servlet id="bridge">
-        <servlet-name>bridgeservlet</servlet-name>
-        <display-name>Carbon Bridge Servlet</display-name>
-        <description>Carbon Bridge Servlet</description>
-        <servlet-class>org.wso2.carbon.tomcat.ext.servlet.DelegationServlet</servlet-class>
-       
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>bridgeservlet</servlet-name>
-        <url-pattern>/*</url-pattern>
-    </servlet-mapping>
-    <!--
-       This is required if your application bundles expose JSPs.
-     -->
-    <servlet-mapping>
-        <servlet-name>bridgeservlet</servlet-name>
-        <url-pattern>*.jsp</url-pattern>
-    </servlet-mapping>
-
-    <!--This is for performing the character encoding in the JSPs. -->
-    <filter>
-       <filter-name>CharsetFilter</filter-name>
-       <filter-class>org.wso2.carbon.tomcat.ext.filter.CharacterSetFilter</filter-class>
-       <init-param>
-          <param-name>requestEncoding</param-name>
-          <param-value>UTF-8</param-value>
-       </init-param>
-    </filter>
-
-    <filter-mapping>
-       <filter-name>CharsetFilter</filter-name>
-       <url-pattern>/*</url-pattern>
-    </filter-mapping>
-    
-     <session-config>
-        <session-timeout>15</session-timeout>
-    </session-config>
-</web-app>
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml
deleted file mode 100644
index 8347929309..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/tomcat/catalina-server.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<Server port="8005" shutdown="SHUTDOWN">
-
-  <Service className="org.wso2.carbon.tomcat.ext.service.ExtendedStandardService" name="Catalina">
-
-    <!--
-	optional attributes:
-
-	proxyPort="80"
-    -->
-    <Connector  protocol="org.apache.coyote.http11.Http11NioProtocol"
-                port="9763"
-                redirectPort="9443" 
-                bindOnInit="false"
-                maxHttpHeaderSize="8192"
-                acceptorThreadCount="2"
-                maxThreads="250"
-                minSpareThreads="50"
-                disableUploadTimeout="false"
-                connectionUploadTimeout="120000"
-                maxKeepAliveRequests="200"
-                acceptCount="200"
-                server="WSO2 Carbon Server"
-                compression="on"
-                compressionMinSize="2048"
-                noCompressionUserAgents="gozilla, traviata"
-                compressableMimeType="text/html,text/javascript,application/x-javascript,application/javascript,application/xml,text/css,application/xslt+xml,text/xsl,image/gif,image/jpg,image/jpeg" 
-                URIEncoding="UTF-8"/>
-   
-    <!--
-	optional attributes:
-
-	proxyPort="443"
-    -->
-    <Connector  protocol="org.apache.coyote.http11.Http11NioProtocol"
-                port="9443"
-                bindOnInit="false"
-                sslProtocol="TLS"
-                maxHttpHeaderSize="8192"
-                acceptorThreadCount="2"
-                maxThreads="250"
-                minSpareThreads="50"
-                disableUploadTimeout="false"
-                enableLookups="false"
-                connectionUploadTimeout="120000"
-                maxKeepAliveRequests="200"
-                acceptCount="200"
-                server="WSO2 Carbon Server"
-                clientAuth="false"
-                compression="on"
-                scheme="https"
-                secure="true"
-                SSLEnabled="true"
-                compressionMinSize="2048"
-                noCompressionUserAgents="gozilla, traviata"
-                compressableMimeType="text/html,text/javascript,application/x-javascript,application/javascript,application/xml,text/css,application/xslt+xml,text/xsl,image/gif,image/jpg,image/jpeg"
-                keystoreFile="${carbon.home}/repository/resources/security/wso2carbon.jks"
-                keystorePass="wso2carbon"
-                URIEncoding="UTF-8"/>
-
-
-   
-    <Engine name="Catalina" defaultHost="localhost">
-
-      <!--Realm className="org.apache.catalina.realm.MemoryRealm" pathname="${carbon.home}/repository/conf/tomcat/tomcat-users.xml"/-->
-
-      <Realm className="org.wso2.carbon.tomcat.ext.realms.CarbonTomcatRealm"/>
-
-      <Host name="localhost" unpackWARs="true" deployOnStartup="false" autoDeploy="false" appBase="${carbon.home}/repository/deployment/server/webapps/">
-          <Valve className="org.wso2.carbon.tomcat.ext.valves.CarbonContextCreatorValve"/>
-          <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${carbon.home}/repository/logs"
-               prefix="http_access_" suffix=".log"
-               pattern="combined" />
-          <Valve className="org.wso2.carbon.tomcat.ext.valves.CarbonStuckThreadDetectionValve" threshold="600"/>
-          <Valve className="org.wso2.carbon.tomcat.ext.valves.CompositeValve"/>
-      </Host>
-    </Engine>
-  </Service>
-</Server>
-
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml
deleted file mode 100644
index 7ef7dbb0a1..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/tomcat/tomcat-users.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!--
-   This is the standard tomcat-users.xml file which can be used for definig users & roles. This
-    is applicable to webapps only, and will be used only if the Security/TomcatRealm entry in the
-    carbon.xml is set to Memory
--->
-<tomcat-users>
-  <role rolename="manager"/>
-  <role rolename="tomcat"/>
-  <role rolename="role1"/>
-  <role rolename="admin"/>
-  <user username="both" password="tomcat" roles="tomcat,role1"/>
-  <user username="tomcat" password="tomcat" roles="tomcat"/>
-  <user username="admin" password="admin" roles="tomcat,manager,admin"/>
-  <user username="role1" password="tomcat" roles="role1"/>
-</tomcat-users>
\ No newline at end of file
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/tomcat/web.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/tomcat/web.xml
deleted file mode 100644
index 765865b475..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/tomcat/web.xml
+++ /dev/null
@@ -1,1220 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  ~ Copyright 2005-2017 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.
-  -->
-
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
-         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_3_0.xsd"
-         version="3.0">
-
-    <!-- ======================== Introduction ============================== -->
-    <!-- This document defines default values for *all* web applications      -->
-    <!-- loaded into this instance of Tomcat.  As each application is         -->
-    <!-- deployed, this file is processed, followed by the                    -->
-    <!-- "/WEB-INF/web.xml" deployment descriptor from your own               -->
-    <!-- applications.                                                        -->
-    <!--                                                                      -->
-    <!-- WARNING:  Do not configure application-specific resources here!      -->
-    <!-- They should go in the "/WEB-INF/web.xml" file in your application.   -->
-
-
-    <!-- ================== Built In Servlet Definitions ==================== -->
-
-
-    <!-- The default servlet for all web applications, that serves static     -->
-    <!-- resources.  It processes all requests that are not mapped to other   -->
-    <!-- servlets with servlet mappings (defined either here or in your own   -->
-    <!-- web.xml file).  This servlet supports the following initialization   -->
-    <!-- parameters (default values are in square brackets):                  -->
-    <!--                                                                      -->
-    <!--   debug               Debugging detail level for messages logged     -->
-    <!--                       by this servlet.  [0]                          -->
-    <!--                                                                      -->
-    <!--   fileEncoding        Encoding to be used to read static resources   -->
-    <!--                       [platform default]                             -->
-    <!--                                                                      -->
-    <!--   input               Input buffer size (in bytes) when reading      -->
-    <!--                       resources to be served.  [2048]                -->
-    <!--                                                                      -->
-    <!--   listings            Should directory listings be produced if there -->
-    <!--                       is no welcome file in this directory?  [false] -->
-    <!--                       WARNING: Listings for directories with many    -->
-    <!--                       entries can be slow and may consume            -->
-    <!--                       significant proportions of server resources.   -->
-    <!--                                                                      -->
-    <!--   output              Output buffer size (in bytes) when writing     -->
-    <!--                       resources to be served.  [2048]                -->
-    <!--                                                                      -->
-    <!--   readonly            Is this context "read only", so HTTP           -->
-    <!--                       commands like PUT and DELETE are               -->
-    <!--                       rejected?  [true]                              -->
-    <!--                                                                      -->
-    <!--   readmeFile          File to display together with the directory    -->
-    <!--                       contents. [null]                               -->
-    <!--                                                                      -->
-    <!--   sendfileSize        If the connector used supports sendfile, this  -->
-    <!--                       represents the minimal file size in KB for     -->
-    <!--                       which sendfile will be used. Use a negative    -->
-    <!--                       value to always disable sendfile.  [48]        -->
-    <!--                                                                      -->
-    <!--   useAcceptRanges     Should the Accept-Ranges header be included    -->
-    <!--                       in responses where appropriate? [true]         -->
-    <!--                                                                      -->
-    <!--  For directory listing customization. Checks localXsltFile, then     -->
-    <!--  globalXsltFile, then defaults to original behavior.                 -->
-    <!--                                                                      -->
-    <!--   localXsltFile       Make directory listings an XML doc and         -->
-    <!--                       pass the result to this style sheet residing   -->
-    <!--                       in that directory. This overrides              -->
-    <!--                       contextXsltFile and globalXsltFile[null]       -->
-    <!--                                                                      -->
-    <!--   contextXsltFile     Make directory listings an XML doc and         -->
-    <!--                       pass the result to this style sheet which is   -->
-    <!--                       relative to the context root. This overrides   -->
-    <!--                       globalXsltFile[null]                           -->
-    <!--                                                                      -->
-    <!--   globalXsltFile      Site wide configuration version of             -->
-    <!--                       localXsltFile This argument is expected        -->
-    <!--                       to be a physical file. [null]                  -->
-    <!--                                                                      -->
-    <!--
-                                                                      -->
-    <servlet>
-        <servlet-name>default</servlet-name>
-        <servlet-class>org.apache.catalina.servlets.DefaultServlet</servlet-class>
-        <init-param>
-            <param-name>debug</param-name>
-            <param-value>0</param-value>
-        </init-param>
-        <init-param>
-            <param-name>sendfileSize</param-name>
-            <param-value>-1</param-value>
-        </init-param>
-        <init-param>
-            <param-name>listings</param-name>
-            <param-value>false</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-
-    <!-- The JSP page compiler and execution servlet, which is the mechanism  -->
-    <!-- used by Tomcat to support JSP pages.  Traditionally, this servlet    -->
-    <!-- is mapped to the URL pattern "*.jsp".  This servlet supports the     -->
-    <!-- following initialization parameters (default values are in square    -->
-    <!-- brackets):                                                           -->
-    <!--                                                                      -->
-    <!--   checkInterval       If development is false and checkInterval is   -->
-    <!--                       greater than zero, background compilations are -->
-    <!--                       enabled. checkInterval is the time in seconds  -->
-    <!--                       between checks to see if a JSP page (and its   -->
-    <!--                       dependent files) needs to  be recompiled. [0]  -->
-    <!--                                                                      -->
-    <!--   classdebuginfo      Should the class file be compiled with         -->
-    <!--                       debugging information?  [true]                 -->
-    <!--                                                                      -->
-    <!--   classpath           What class path should I use while compiling   -->
-    <!--                       generated servlets?  [Created dynamically      -->
-    <!--                       based on the current web application]          -->
-    <!--                                                                      -->
-    <!--   compiler            Which compiler Ant should use to compile JSP   -->
-    <!--                       pages.  See the jasper documentation for more  -->
-    <!--                       information.                                   -->
-    <!--                                                                      -->
-    <!--   compilerSourceVM    Compiler source VM. [1.6]                      -->
-    <!--                                                                      -->
-    <!--   compilerTargetVM    Compiler target VM. [1.6]                      -->
-    <!--                                                                      -->
-    <!--   development         Is Jasper used in development mode? If true,   -->
-    <!--                       the frequency at which JSPs are checked for    -->
-    <!--                       modification may be specified via the          -->
-    <!--                       modificationTestInterval parameter. [true]     -->
-    <!--                                                                      -->
-    <!--   displaySourceFragment                                              -->
-    <!--                       Should a source fragment be included in        -->
-    <!--                       exception messages? [true]                     -->
-    <!--                                                                      -->
-    <!--   dumpSmap            Should the SMAP info for JSR45 debugging be    -->
-    <!--                       dumped to a file? [false]                      -->
-    <!--                       False if suppressSmap is true                  -->
-    <!--                                                                      -->
-    <!--   enablePooling       Determines whether tag handler pooling is      -->
-    <!--                       enabled. This is a compilation option. It will -->
-    <!--                       not alter the behaviour of JSPs that have      -->
-    <!--                       already been compiled. [true]                  -->
-    <!--                                                                      -->
-    <!--   engineOptionsClass  Allows specifying the Options class used to    -->
-    <!--                       configure Jasper. If not present, the default  -->
-    <!--                       EmbeddedServletOptions will be used.           -->
-    <!--                                                                      -->
-    <!--   errorOnUseBeanInvalidClassAttribute                                -->
-    <!--                       Should Jasper issue an error when the value of -->
-    <!--                       the class attribute in an useBean action is    -->
-    <!--                       not a valid bean class?  [true]                -->
-    <!--                                                                      -->
-    <!--   fork                Tell Ant to fork compiles of JSP pages so that -->
-    <!--                       a separate JVM is used for JSP page compiles   -->
-    <!--                       from the one Tomcat is running in. [true]      -->
-    <!--                                                                      -->
-    <!--   genStringAsCharArray                                               -->
-    <!--                       Should text strings be generated as char       -->
-    <!--                       arrays, to improve performance in some cases?  -->
-    <!--                       [false]                                        -->
-    <!--                                                                      -->
-    <!--   ieClassId           The class-id value to be sent to Internet      -->
-    <!--                       Explorer when using <jsp:plugin> tags.         -->
-    <!--                       [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93]   -->
-    <!--                                                                      -->
-    <!--   javaEncoding        Java file encoding to use for generating java  -->
-    <!--                       source files. [UTF8]                           -->
-    <!--                                                                      -->
-    <!--   keepgenerated       Should we keep the generated Java source code  -->
-    <!--                       for each page instead of deleting it? [true]   -->
-    <!--                                                                      -->
-    <!--   mappedfile          Should we generate static content with one     -->
-    <!--                       print statement per input line, to ease        -->
-    <!--                       debugging?  [true]                             -->
-    <!--                                                                      -->
-    <!--   maxLoadedJsps       The maximum number of JSPs that will be loaded -->
-    <!--                       for a web application. If more than this       -->
-    <!--                       number of JSPs are loaded, the least recently  -->
-    <!--                       used JSPs will be unloaded so that the number  -->
-    <!--                       of JSPs loaded at any one time does not exceed -->
-    <!--                       this limit. A value of zero or less indicates  -->
-    <!--                       no limit. [-1]                                 -->
-    <!--                                                                      -->
-    <!--   jspIdleTimeout      The amount of time in seconds a JSP can be     -->
-    <!--                       idle before it is unloaded. A value of zero    -->
-    <!--                       or less indicates never unload. [-1]           -->
-    <!--                                                                      -->
-    <!--   modificationTestInterval                                           -->
-    <!--                       Causes a JSP (and its dependent files) to not  -->
-    <!--                       be checked for modification during the         -->
-    <!--                       specified time interval (in seconds) from the  -->
-    <!--                       last time the JSP was checked for              -->
-    <!--                       modification. A value of 0 will cause the JSP  -->
-    <!--                       to be checked on every access.                 -->
-    <!--                       Used in development mode only. [4]             -->
-    <!--                                                                      -->
-    <!--   recompileOnFail     If a JSP compilation fails should the          -->
-    <!--                       modificationTestInterval be ignored and the    -->
-    <!--                       next access trigger a re-compilation attempt?  -->
-    <!--                       Used in development mode only and is disabled  -->
-    <!--                       by default as compilation may be expensive and -->
-    <!--                       could lead to excessive resource usage.        -->
-    <!--                       [false]                                        -->
-    <!--                                                                      -->
-    <!--   scratchdir          What scratch directory should we use when      -->
-    <!--                       compiling JSP pages?  [default work directory  -->
-    <!--                       for the current web application]               -->
-    <!--                                                                      -->
-    <!--   suppressSmap        Should the generation of SMAP info for JSR45   -->
-    <!--                       debugging be suppressed?  [false]              -->
-    <!--                                                                      -->
-    <!--   trimSpaces          Should white spaces in template text between   -->
-    <!--                       actions or directives be trimmed?  [false]     -->
-    <!--                                                                      -->
-    <!--   xpoweredBy          Determines whether X-Powered-By response       -->
-    <!--                       header is added by generated servlet.  [false] -->
-
-    <servlet>
-        <servlet-name>jsp</servlet-name>
-        <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
-        <init-param>
-            <param-name>fork</param-name>
-            <param-value>false</param-value>
-        </init-param>
-        <init-param>
-            <param-name>xpoweredBy</param-name>
-            <param-value>false</param-value>
-        </init-param>
-        <load-on-startup>3</load-on-startup>
-    </servlet>
-
-
-    <!-- NOTE: An SSI Filter is also available as an alternative SSI          -->
-    <!-- implementation. Use either the Servlet or the Filter but NOT both.   -->
-    <!--                                                                      -->
-    <!-- Server Side Includes processing servlet, which processes SSI         -->
-    <!-- directives in HTML pages consistent with similar support in web      -->
-    <!-- servers like Apache.  Traditionally, this servlet is mapped to the   -->
-    <!-- URL pattern "*.shtml".  This servlet supports the following          -->
-    <!-- initialization parameters (default values are in square brackets):   -->
-    <!--                                                                      -->
-    <!--   buffered            Should output from this servlet be buffered?   -->
-    <!--                       (0=false, 1=true)  [0]                         -->
-    <!--                                                                      -->
-    <!--   debug               Debugging detail level for messages logged     -->
-    <!--                       by this servlet.  [0]                          -->
-    <!--                                                                      -->
-    <!--   expires             The number of seconds before a page with SSI   -->
-    <!--                       directives will expire.  [No default]          -->
-    <!--                                                                      -->
-    <!--   isVirtualWebappRelative                                            -->
-    <!--                       Should "virtual" paths be interpreted as       -->
-    <!--                       relative to the context root, instead of       -->
-    <!--                       the server root?  (0=false, 1=true) [0]        -->
-    <!--                                                                      -->
-    <!--   inputEncoding       The encoding to assume for SSI resources if    -->
-    <!--                       one is not available from the resource.        -->
-    <!--                       [Platform default]                             -->
-    <!--                                                                      -->
-    <!--   outputEncoding      The encoding to use for the page that results  -->
-    <!--                       from the SSI processing. [UTF-8]               -->
-    <!--                                                                      -->
-    <!--   allowExec           Is use of the exec command enabled? [false]    -->
-
-    <!--
-        <servlet>
-            <servlet-name>ssi</servlet-name>
-            <servlet-class>
-              org.apache.catalina.ssi.SSIServlet
-            </servlet-class>
-            <init-param>
-              <param-name>buffered</param-name>
-              <param-value>1</param-value>
-            </init-param>
-            <init-param>
-              <param-name>debug</param-name>
-              <param-value>0</param-value>
-            </init-param>
-            <init-param>
-              <param-name>expires</param-name>
-              <param-value>666</param-value>
-            </init-param>
-            <init-param>
-              <param-name>isVirtualWebappRelative</param-name>
-              <param-value>0</param-value>
-            </init-param>
-            <load-on-startup>4</load-on-startup>
-        </servlet>
-    -->
-
-
-    <!-- Common Gateway Includes (CGI) processing servlet, which supports     -->
-    <!-- execution of external applications that conform to the CGI spec      -->
-    <!-- requirements.  Typically, this servlet is mapped to the URL pattern  -->
-    <!-- "/cgi-bin/*", which means that any CGI applications that are         -->
-    <!-- executed must be present within the web application.  This servlet   -->
-    <!-- supports the following initialization parameters (default values     -->
-    <!-- are in square brackets):                                             -->
-    <!--                                                                      -->
-    <!--   cgiPathPrefix        The CGI search path will start at             -->
-    <!--                        webAppRootDir + File.separator + this prefix. -->
-    <!--                        [WEB-INF/cgi]                                 -->
-    <!--                                                                      -->
-    <!--   debug                Debugging detail level for messages logged    -->
-    <!--                        by this servlet.  [0]                         -->
-    <!--                                                                      -->
-    <!--   executable           Name of the executable used to run the        -->
-    <!--                        script. [perl]                                -->
-    <!--                                                                      -->
-    <!--   parameterEncoding    Name of parameter encoding to be used with    -->
-    <!--                        CGI servlet.                                  -->
-    <!--                        [System.getProperty("file.encoding","UTF-8")] -->
-    <!--                                                                      -->
-    <!--   passShellEnvironment Should the shell environment variables (if    -->
-    <!--                        any) be passed to the CGI script? [false]     -->
-    <!--                                                                      -->
-    <!--   stderrTimeout        The time (in milliseconds) to wait for the    -->
-    <!--                        reading of stderr to complete before          -->
-    <!--                        terminating the CGI process. [2000]           -->
-
-    <!--
-        <servlet>
-            <servlet-name>cgi</servlet-name>
-            <servlet-class>org.apache.catalina.servlets.CGIServlet</servlet-class>
-            <init-param>
-              <param-name>debug</param-name>
-              <param-value>0</param-value>
-            </init-param>
-            <init-param>
-              <param-name>cgiPathPrefix</param-name>
-              <param-value>WEB-INF/cgi</param-value>
-            </init-param>
-             <load-on-startup>5</load-on-startup>
-        </servlet>
-    -->
-
-
-    <!-- ================ Built In Servlet Mappings ========================= -->
-
-
-    <!-- The servlet mappings for the built in servlets defined above.  Note  -->
-    <!-- that, by default, the CGI and SSI servlets are *not* mapped.  You    -->
-    <!-- must uncomment these mappings (or add them to your application's own -->
-    <!-- web.xml deployment descriptor) to enable these services              -->
-
-    <!-- The mapping for the default servlet -->
-    <!--servlet-mapping>
-        <servlet-name>default</servlet-name>
-        <url-pattern>/</url-pattern>
-    </servlet-mapping-->
-
-    <!-- The mappings for the JSP servlet -->
-    <servlet-mapping>
-        <servlet-name>jsp</servlet-name>
-        <url-pattern>*.jsp</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>jsp</servlet-name>
-        <url-pattern>*.jspx</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>default</servlet-name>
-        <url-pattern>/</url-pattern>
-    </servlet-mapping>
-
-    <!-- The mapping for the SSI servlet -->
-    <!--
-        <servlet-mapping>
-            <servlet-name>ssi</servlet-name>
-            <url-pattern>*.shtml</url-pattern>
-        </servlet-mapping>
-    -->
-
-    <!-- The mapping for the CGI Gateway servlet -->
-
-    <!--
-        <servlet-mapping>
-            <servlet-name>cgi</servlet-name>
-            <url-pattern>/cgi-bin/*</url-pattern>
-        </servlet-mapping>
-    -->
-
-
-    <!-- ================== Built In Filter Definitions ===================== -->
-
-    <!-- NOTE: An SSI Servlet is also available as an alternative SSI         -->
-    <!-- implementation. Use either the Servlet or the Filter but NOT both.   -->
-    <!--                                                                      -->
-    <!-- Server Side Includes processing filter, which processes SSI          -->
-    <!-- directives in HTML pages consistent with similar support in web      -->
-    <!-- servers like Apache.  Traditionally, this filter is mapped to the    -->
-    <!-- URL pattern "*.shtml", though it can be mapped to "*" as it will     -->
-    <!-- selectively enable/disable SSI processing based on mime types. For   -->
-    <!-- this to work you will need to uncomment the .shtml mime type         -->
-    <!-- definition towards the bottom of this file.                          -->
-    <!-- The contentType init param allows you to apply SSI processing to JSP -->
-    <!-- pages, javascript, or any other content you wish.  This filter       -->
-    <!-- supports the following initialization parameters (default values are -->
-    <!-- in square brackets):                                                 -->
-    <!--                                                                      -->
-    <!--   contentType         A regex pattern that must be matched before    -->
-    <!--                       SSI processing is applied.                     -->
-    <!--                       [text/x-server-parsed-html(;.*)?]              -->
-    <!--                                                                      -->
-    <!--   debug               Debugging detail level for messages logged     -->
-    <!--                       by this servlet.  [0]                          -->
-    <!--                                                                      -->
-    <!--   expires             The number of seconds before a page with SSI   -->
-    <!--                       directives will expire.  [No default]          -->
-    <!--                                                                      -->
-    <!--   isVirtualWebappRelative                                            -->
-    <!--                       Should "virtual" paths be interpreted as       -->
-    <!--                       relative to the context root, instead of       -->
-    <!--                       the server root?  (0=false, 1=true) [0]        -->
-    <!--                                                                      -->
-    <!--   allowExec           Is use of the exec command enabled? [false]    -->
-
-    <!--
-        <filter>
-            <filter-name>ssi</filter-name>
-            <filter-class>
-              org.apache.catalina.ssi.SSIFilter
-            </filter-class>
-            <init-param>
-              <param-name>contentType</param-name>
-              <param-value>text/x-server-parsed-html(;.*)?</param-value>
-            </init-param>
-            <init-param>
-              <param-name>debug</param-name>
-              <param-value>0</param-value>
-            </init-param>
-            <init-param>
-              <param-name>expires</param-name>
-              <param-value>666</param-value>
-            </init-param>
-            <init-param>
-              <param-name>isVirtualWebappRelative</param-name>
-              <param-value>0</param-value>
-            </init-param>
-        </filter>
-    -->
-
-
-    <!-- ==================== Built In Filter Mappings ====================== -->
-
-    <!-- The mapping for the SSI Filter -->
-    <!--
-        <filter-mapping>
-            <filter-name>ssi</filter-name>
-            <url-pattern>*.shtml</url-pattern>
-        </filter-mapping>
-    -->
-
-
-    <!-- ==================== Default Session Configuration ================= -->
-    <!-- You can set the default session timeout (in minutes) for all newly   -->
-    <!-- created sessions by modifying the value below.                       -->
-
-    <session-config>
-        <session-timeout>30</session-timeout>
-    </session-config>
-
-
-    <!-- ===================== Default MIME Type Mappings =================== -->
-    <!-- When serving static resources, Tomcat will automatically generate    -->
-    <!-- a "Content-Type" header based on the resource's filename extensions,  -->
-    <!-- based on these mappings.  Additional mappings can be added here (to  -->
-    <!-- apply to all web applications), or in your own application's web.xml -->
-    <!-- deployment descriptor.                                               -->
-
-    <mime-mapping>
-        <extension>abs</extension>
-        <mime-type>audio/x-mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ai</extension>
-        <mime-type>application/postscript</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>aif</extension>
-        <mime-type>audio/x-aiff</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>aifc</extension>
-        <mime-type>audio/x-aiff</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>aiff</extension>
-        <mime-type>audio/x-aiff</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>aim</extension>
-        <mime-type>application/x-aim</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>art</extension>
-        <mime-type>image/x-jg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>asf</extension>
-        <mime-type>video/x-ms-asf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>asx</extension>
-        <mime-type>video/x-ms-asf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>au</extension>
-        <mime-type>audio/basic</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>avi</extension>
-        <mime-type>video/x-msvideo</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>avx</extension>
-        <mime-type>video/x-rad-screenplay</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>bcpio</extension>
-        <mime-type>application/x-bcpio</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>bin</extension>
-        <mime-type>application/octet-stream</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>bmp</extension>
-        <mime-type>image/bmp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>body</extension>
-        <mime-type>text/html</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cdf</extension>
-        <mime-type>application/x-cdf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cer</extension>
-        <mime-type>application/x-x509-ca-cert</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>class</extension>
-        <mime-type>application/java</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>cpio</extension>
-        <mime-type>application/x-cpio</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>csh</extension>
-        <mime-type>application/x-csh</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>css</extension>
-        <mime-type>text/css</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dib</extension>
-        <mime-type>image/bmp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>doc</extension>
-        <mime-type>application/msword</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dtd</extension>
-        <mime-type>application/xml-dtd</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dv</extension>
-        <mime-type>video/x-dv</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>dvi</extension>
-        <mime-type>application/x-dvi</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>eps</extension>
-        <mime-type>application/postscript</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>etx</extension>
-        <mime-type>text/x-setext</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>exe</extension>
-        <mime-type>application/octet-stream</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gif</extension>
-        <mime-type>image/gif</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gtar</extension>
-        <mime-type>application/x-gtar</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>gz</extension>
-        <mime-type>application/x-gzip</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>hdf</extension>
-        <mime-type>application/x-hdf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>hqx</extension>
-        <mime-type>application/mac-binhex40</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>htc</extension>
-        <mime-type>text/x-component</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>htm</extension>
-        <mime-type>text/html</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>html</extension>
-        <mime-type>text/html</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ief</extension>
-        <mime-type>image/ief</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jad</extension>
-        <mime-type>text/vnd.sun.j2me.app-descriptor</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jar</extension>
-        <mime-type>application/java-archive</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>java</extension>
-        <mime-type>text/plain</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jnlp</extension>
-        <mime-type>application/x-java-jnlp-file</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jpe</extension>
-        <mime-type>image/jpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jpeg</extension>
-        <mime-type>image/jpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jpg</extension>
-        <mime-type>image/jpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>js</extension>
-        <mime-type>application/javascript</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jsf</extension>
-        <mime-type>text/plain</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>jspf</extension>
-        <mime-type>text/plain</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>kar</extension>
-        <mime-type>audio/x-midi</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>latex</extension>
-        <mime-type>application/x-latex</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>m3u</extension>
-        <mime-type>audio/x-mpegurl</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mac</extension>
-        <mime-type>image/x-macpaint</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>man</extension>
-        <mime-type>application/x-troff-man</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mathml</extension>
-        <mime-type>application/mathml+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>me</extension>
-        <mime-type>application/x-troff-me</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mid</extension>
-        <mime-type>audio/x-midi</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>midi</extension>
-        <mime-type>audio/x-midi</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mif</extension>
-        <mime-type>application/x-mif</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mov</extension>
-        <mime-type>video/quicktime</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>movie</extension>
-        <mime-type>video/x-sgi-movie</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mp1</extension>
-        <mime-type>audio/x-mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mp2</extension>
-        <mime-type>audio/x-mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mp3</extension>
-        <mime-type>audio/x-mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mp4</extension>
-        <mime-type>video/mp4</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mpa</extension>
-        <mime-type>audio/x-mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mpe</extension>
-        <mime-type>video/mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mpeg</extension>
-        <mime-type>video/mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mpega</extension>
-        <mime-type>audio/x-mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mpg</extension>
-        <mime-type>video/mpeg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>mpv2</extension>
-        <mime-type>video/mpeg2</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ms</extension>
-        <mime-type>application/x-wais-source</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>nc</extension>
-        <mime-type>application/x-netcdf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>oda</extension>
-        <mime-type>application/oda</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Database -->
-        <extension>odb</extension>
-        <mime-type>application/vnd.oasis.opendocument.database</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Chart -->
-        <extension>odc</extension>
-        <mime-type>application/vnd.oasis.opendocument.chart</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Formula -->
-        <extension>odf</extension>
-        <mime-type>application/vnd.oasis.opendocument.formula</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Drawing -->
-        <extension>odg</extension>
-        <mime-type>application/vnd.oasis.opendocument.graphics</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Image -->
-        <extension>odi</extension>
-        <mime-type>application/vnd.oasis.opendocument.image</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Master Document -->
-        <extension>odm</extension>
-        <mime-type>application/vnd.oasis.opendocument.text-master</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Presentation -->
-        <extension>odp</extension>
-        <mime-type>application/vnd.oasis.opendocument.presentation</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Spreadsheet -->
-        <extension>ods</extension>
-        <mime-type>application/vnd.oasis.opendocument.spreadsheet</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Text -->
-        <extension>odt</extension>
-        <mime-type>application/vnd.oasis.opendocument.text</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Drawing Template -->
-        <extension>otg</extension>
-        <mime-type>application/vnd.oasis.opendocument.graphics-template</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- HTML Document Template -->
-        <extension>oth</extension>
-        <mime-type>application/vnd.oasis.opendocument.text-web</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Presentation Template -->
-        <extension>otp</extension>
-        <mime-type>application/vnd.oasis.opendocument.presentation-template</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Spreadsheet Template -->
-        <extension>ots</extension>
-        <mime-type>application/vnd.oasis.opendocument.spreadsheet-template</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- OpenDocument Text Template -->
-        <extension>ott</extension>
-        <mime-type>application/vnd.oasis.opendocument.text-template</mime-type>
-    </mime-mapping>
-    <!-- xiph mime types -->
-    <mime-mapping>
-        <extension>ogx</extension>
-        <mime-type>application/ogg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ogv</extension>
-        <mime-type>video/ogg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>oga</extension>
-        <mime-type>audio/ogg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ogg</extension>
-        <mime-type>audio/ogg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>spx</extension>
-        <mime-type>audio/ogg</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>flac</extension>
-        <mime-type>audio/flac</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>anx</extension>
-        <mime-type>application/annodex</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>axa</extension>
-        <mime-type>audio/annodex</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>axv</extension>
-        <mime-type>video/annodex</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xspf</extension>
-        <mime-type>application/xspf+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>pbm</extension>
-        <mime-type>image/x-portable-bitmap</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>pct</extension>
-        <mime-type>image/pict</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>pdf</extension>
-        <mime-type>application/pdf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>pgm</extension>
-        <mime-type>image/x-portable-graymap</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>pic</extension>
-        <mime-type>image/pict</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>pict</extension>
-        <mime-type>image/pict</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>pls</extension>
-        <mime-type>audio/x-scpls</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>png</extension>
-        <mime-type>image/png</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>pnm</extension>
-        <mime-type>image/x-portable-anymap</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>pnt</extension>
-        <mime-type>image/x-macpaint</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ppm</extension>
-        <mime-type>image/x-portable-pixmap</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ppt</extension>
-        <mime-type>application/vnd.ms-powerpoint</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>pps</extension>
-        <mime-type>application/vnd.ms-powerpoint</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ps</extension>
-        <mime-type>application/postscript</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>psd</extension>
-        <mime-type>image/x-photoshop</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>qt</extension>
-        <mime-type>video/quicktime</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>qti</extension>
-        <mime-type>image/x-quicktime</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>qtif</extension>
-        <mime-type>image/x-quicktime</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ras</extension>
-        <mime-type>image/x-cmu-raster</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>rdf</extension>
-        <mime-type>application/rdf+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>rgb</extension>
-        <mime-type>image/x-rgb</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>rm</extension>
-        <mime-type>application/vnd.rn-realmedia</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>roff</extension>
-        <mime-type>application/x-troff</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>rtf</extension>
-        <mime-type>application/rtf</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>rtx</extension>
-        <mime-type>text/richtext</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>sh</extension>
-        <mime-type>application/x-sh</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>shar</extension>
-        <mime-type>application/x-shar</mime-type>
-    </mime-mapping>
-    <!--
-        <mime-mapping>
-            <extensions>shtml</extensions>
-            <mime-type>text/x-server-parsed-html</mime-type>
-        </mime-mapping>
-    -->
-    <mime-mapping>
-        <extension>smf</extension>
-        <mime-type>audio/x-midi</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>sit</extension>
-        <mime-type>application/x-stuffit</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>snd</extension>
-        <mime-type>audio/basic</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>src</extension>
-        <mime-type>application/x-wais-source</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>sv4cpio</extension>
-        <mime-type>application/x-sv4cpio</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>sv4crc</extension>
-        <mime-type>application/x-sv4crc</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>svg</extension>
-        <mime-type>image/svg+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>svgz</extension>
-        <mime-type>image/svg+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>swf</extension>
-        <mime-type>application/x-shockwave-flash</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>t</extension>
-        <mime-type>application/x-troff</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>tar</extension>
-        <mime-type>application/x-tar</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>tcl</extension>
-        <mime-type>application/x-tcl</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>tex</extension>
-        <mime-type>application/x-tex</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>texi</extension>
-        <mime-type>application/x-texinfo</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>texinfo</extension>
-        <mime-type>application/x-texinfo</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>tif</extension>
-        <mime-type>image/tiff</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>tiff</extension>
-        <mime-type>image/tiff</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>tr</extension>
-        <mime-type>application/x-troff</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>tsv</extension>
-        <mime-type>text/tab-separated-values</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>txt</extension>
-        <mime-type>text/plain</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ulw</extension>
-        <mime-type>audio/basic</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>ustar</extension>
-        <mime-type>application/x-ustar</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>vxml</extension>
-        <mime-type>application/voicexml+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xbm</extension>
-        <mime-type>image/x-xbitmap</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xht</extension>
-        <mime-type>application/xhtml+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xhtml</extension>
-        <mime-type>application/xhtml+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xls</extension>
-        <mime-type>application/vnd.ms-excel</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xml</extension>
-        <mime-type>application/xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xpm</extension>
-        <mime-type>image/x-xpixmap</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xsl</extension>
-        <mime-type>application/xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xslt</extension>
-        <mime-type>application/xslt+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xul</extension>
-        <mime-type>application/vnd.mozilla.xul+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>xwd</extension>
-        <mime-type>image/x-xwindowdump</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>vsd</extension>
-        <mime-type>application/x-visio</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>wav</extension>
-        <mime-type>audio/x-wav</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- Wireless Bitmap -->
-        <extension>wbmp</extension>
-        <mime-type>image/vnd.wap.wbmp</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- WML Source -->
-        <extension>wml</extension>
-        <mime-type>text/vnd.wap.wml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- Compiled WML -->
-        <extension>wmlc</extension>
-        <mime-type>application/vnd.wap.wmlc</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- WML Script Source -->
-        <extension>wmls</extension>
-        <mime-type>text/vnd.wap.wmlscript</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <!-- Compiled WML Script -->
-        <extension>wmlscriptc</extension>
-        <mime-type>application/vnd.wap.wmlscriptc</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>wmv</extension>
-        <mime-type>video/x-ms-wmv</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>wrl</extension>
-        <mime-type>x-world/x-vrml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>wspolicy</extension>
-        <mime-type>application/wspolicy+xml</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>Z</extension>
-        <mime-type>application/x-compress</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>z</extension>
-        <mime-type>application/x-compress</mime-type>
-    </mime-mapping>
-    <mime-mapping>
-        <extension>zip</extension>
-        <mime-type>application/zip</mime-type>
-    </mime-mapping>
-
-    <!-- ==================== Default Welcome File List ===================== -->
-    <!-- When a request URI refers to a directory, the default servlet looks  -->
-    <!-- for a "welcome file" within that directory and, if present, to the   -->
-    <!-- corresponding resource URI for display.                              -->
-    <!-- If none welcome file are present, the default servlet either serves  -->
-    <!-- a directory listing (see default servlet configuration on how to     -->
-    <!-- customize) or returns a 404 status, depending on the value of the    -->
-    <!-- listings setting.                                                    -->
-    <!--                                                                      -->
-    <!-- If you define welcome files in your own application's web.xml        -->
-    <!-- deployment descriptor, that list *replaces* the list configured      -->
-    <!-- here, so be sure to include any of the default values that you wish  -->
-    <!-- use within your application.                                         -->
-
-    <welcome-file-list>
-        <welcome-file>index.html</welcome-file>
-        <welcome-file>index.htm</welcome-file>
-        <welcome-file>index.jsp</welcome-file>
-    </welcome-file-list>
-
-</web-app>
\ No newline at end of file
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/user-mgt.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/user-mgt.xml
deleted file mode 100644
index 7be83118a1..0000000000
--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/user-mgt.xml
+++ /dev/null
@@ -1,380 +0,0 @@
-<!--
-  ~ Copyright 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.
-  -->
-
-<UserManager>
-    <Realm>
-        <Configuration>
-            <AddAdmin>true</AddAdmin>
-            <AdminRole>admin</AdminRole>
-            <AdminUser>
-                <UserName>admin</UserName>
-                <Password>admin</Password>
-            </AdminUser>
-            <EveryOneRoleName>everyone</EveryOneRoleName> <!-- By default users in this role sees the registry root -->
-            <Property name="dataSource">jdbc/WSO2CarbonDB</Property>
-        </Configuration>
-        <!-- Following is the default user store manager. This user store manager is based on embedded-apacheds LDAP. It reads/writes users and roles into the 		     default apacheds LDAP user store. Descriptions about each of the following properties can be found in user management documentation of the 	 respective product. In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
-             Note: Do not comment within UserStoreManager tags. Cause, specific tag names are used as tokens when building configurations for products. -->
-        <!--UserStoreManager class="org.wso2.carbon.user.core.ldap.ReadWriteLDAPUserStoreManager">
-                <Property name="TenantManager">org.wso2.carbon.user.core.tenant.CommonHybridLDAPTenantManager</Property>
-                <Property name="ConnectionURL">ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}</Property>
-                <Property name="ConnectionName">uid=admin,ou=system</Property>
-                <Property name="ConnectionPassword">admin</Property>
-                <Property name="LDAPConnectionTimeout">5000</Property>
-                <Property name="Disabled">false</Property>
-                <Property name="PasswordHashMethod">SHA</Property>
-                <Property name="UserNameListFilter">(objectClass=person)</Property>
-            <Property name="UserEntryObjectClass">wso2Person</Property>
-                <Property name="UserSearchBase">ou=Users,dc=wso2,dc=org</Property>
-                <Property name="UserNameSearchFilter">(&amp;(objectClass=person)(uid=?))</Property>
-                <Property name="UserNameAttribute">uid</Property>
-                <Property name="PasswordJavaRegEx">^[\S]{5,30}$</Property>
-                <Property name="PasswordJavaRegExViolationErrorMsg">Password length should be between 5 to 30 characters</Property>
-                <Property name="PasswordJavaScriptRegEx">^[\S]{5,30}$</Property>
-                <Property name="UsernameJavaScriptRegEx">^[\S]{3,30}$</Property>
-            <Property name="UsernameJavaRegEx">[a-zA-Z0-9._-|//]{3,30}$</Property>
-                <Property name="RolenameJavaScriptRegEx">^[\S]{3,30}$</Property>
-                <Property name="RolenameJavaRegEx">[a-zA-Z0-9._-|//]{3,30}$</Property>
-                <Property name="ReadGroups">true</Property>
-            <Property name="WriteGroups">true</Property>
-            <Property name="EmptyRolesAllowed">true</Property>
-                <Property name="GroupSearchBase">ou=Groups,dc=wso2,dc=org</Property>
-                <Property name="GroupNameListFilter">(objectClass=groupOfNames)</Property>
-                <Property name="GroupEntryObjectClass">groupOfNames</Property>
-                <Property name="GroupNameSearchFilter">(&amp;(objectClass=groupOfNames)(cn=?))</Property>
-                <Property name="GroupNameAttribute">cn</Property>
-                <Property name="SharedGroupNameAttribute">cn</Property>
-                <Property name="SharedGroupSearchBase">ou=SharedGroups,dc=wso2,dc=org</Property>
-                <Property name="SharedGroupEntryObjectClass">groupOfNames</Property>
-                <Property name="SharedGroupNameListFilter">(objectClass=groupOfNames)</Property>
-                <Property name="SharedGroupNameSearchFilter">(&amp;(objectClass=groupOfNames)(cn=?))</Property>
-                <Property name="SharedTenantNameListFilter">(objectClass=organizationalUnit)</Property>
-                <Property name="SharedTenantNameAttribute">ou</Property>
-                <Property name="SharedTenantObjectClass">organizationalUnit</Property>
-            <Property name="MembershipAttribute">member</Property>
-            <Property name="UserRolesCacheEnabled">true</Property>
-            <Property name="UserDNPattern">uid={0},ou=Users,dc=wso2,dc=org</Property>
-                <Property name="MaxRoleNameListLength">100</Property>
-                <Property name="MaxUserNameListLength">100</Property>
-                <Property name="SCIMEnabled">false</Property>
-            <Property name="ConnectionPoolingEnabled">false</Property>
-            <Property name="MultiAttributeSeparator">,</Property>
-            <Property name="BulkImportSupported">true</Property>
-            </UserStoreManager-->
-
-        <!-- Following is the configuration for internal JDBC user store. This user store manager is based on JDBC. In case if application needs to manage 		     passwords externally set property <Property name="PasswordsExternallyManaged">true</Property>. In case if user core cache domain is needed to 			identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>. Furthermore properties, IsEmailUserName and 	     			DomainCalculation are readonly properties.
-             Note: Do not comment within UserStoreManager tags. Cause, specific tag names are used as tokens when building configurations for products. -->
-        <UserStoreManager class="org.wso2.carbon.user.core.jdbc.JDBCUserStoreManager">
-            <Property name="TenantManager">org.wso2.carbon.user.core.tenant.JDBCTenantManager</Property>
-            <Property name="ReadOnly">false</Property>
-            <Property name="MaxUserNameListLength">100</Property>
-            <Property name="IsEmailUserName">false</Property>
-            <Property name="DomainCalculation">default</Property>
-            <Property name="PasswordDigest">SHA-256</Property>
-            <Property name="StoreSaltedPassword">true</Property>
-            <Property name="ReadGroups">true</Property>
-            <Property name="WriteGroups">true</Property>
-            <Property name="UserNameUniqueAcrossTenants">false</Property>
-            <Property name="PasswordJavaRegEx">^[\S]{5,30}$</Property>
-            <Property name="PasswordJavaRegExViolationErrorMsg">Password length should be between 5 to 30 characters
-            </Property>
-            <Property name="PasswordJavaScriptRegEx">^[\S]{5,30}$</Property>
-            <Property name="UsernameJavaRegEx">[a-zA-Z0-9._-|//]{3,30}$</Property>
-            <Property name="UsernameJavaScriptRegEx">^[\S]{3,30}$</Property>
-            <Property name="RolenameJavaRegEx">^[^~!#$;%^*+={}\\|\\\\&lt;&gt;,\'\"]{3,30}$</Property>
-            <Property name="RolenameJavaScriptRegEx">^[\S]{3,30}$</Property>
-            <Property name="UserRolesCacheEnabled">true</Property>
-            <Property name="MaxRoleNameListLength">100</Property>
-            <Property name="MaxUserNameListLength">100</Property>
-            <Property name="SharedGroupEnabled">false</Property>
-            <Property name="SCIMEnabled">false</Property>
-            <Property name="CaseSensitiveUsername">true</Property>
-            <Property name="MultiAttributeSeparator">,</Property>
-            <Property name="BulkImportSupported">true</Property>
-        </UserStoreManager>
-
-        <!-- If product is using an external LDAP as the user store in READ ONLY mode, use following user manager.
-            In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
-         -->
-        <!--UserStoreManager class="org.wso2.carbon.user.core.ldap.ReadOnlyLDAPUserStoreManager">
-            <Property name="TenantManager">org.wso2.carbon.user.core.tenant.CommonHybridLDAPTenantManager</Property>
-            <Property name="ReadOnly">true</Property>
-            <Property name="Disabled">false</Property>                       
-	    <Property name="MaxUserNameListLength">100</Property>
-            <Property name="ConnectionURL">ldap://localhost:10389</Property>
-            <Property name="ConnectionName">uid=admin,ou=system</Property>
-            <Property name="ConnectionPassword">admin</Property>
-            <Property name="LDAPConnectionTimeout">5000</Property>
-	    <Property name="PasswordHashMethod">PLAIN_TEXT</Property>
-            <Property name="UserSearchBase">ou=system</Property>
-            <Property name="UserNameListFilter">(objectClass=person)</Property>
-	    <Property name="UserNameSearchFilter">(&amp;(objectClass=person)(uid=?))</Property>
-            <Property name="UserNameAttribute">uid</Property>
-	    <Property name="ReadGroups">true</Property>
-            <Property name="GroupSearchBase">ou=system</Property>
-            <Property name="GroupNameListFilter">(objectClass=groupOfNames)</Property>
-	    <Property name="GroupNameSearchFilter">(&amp;(objectClass=groupOfNames)(cn=?))</Property>
-            <Property name="GroupNameAttribute">cn</Property>
-            <Property name="SharedGroupNameAttribute">cn</Property>
-            <Property name="SharedGroupSearchBase">ou=SharedGroups,dc=wso2,dc=org</Property>
-            <Property name="SharedGroupNameListFilter">(objectClass=groupOfNames)</Property>
-            <Property name="SharedTenantNameListFilter">(objectClass=organizationalUnit)</Property>
-            <Property name="SharedTenantNameAttribute">ou</Property>
-            <Property name="SharedTenantObjectClass">organizationalUnit</Property>
-	    <Property name="MembershipAttribute">member</Property>
-            <Property name="UserRolesCacheEnabled">true</Property>
-	    <Property name="ReplaceEscapeCharactersAtUserLogin">true</Property>
-            <Property name="MaxRoleNameListLength">100</Property>
-            <Property name="MaxUserNameListLength">100</Property>
-            <Property name="SCIMEnabled">false</Property>
-	    <Property name="ConnectionPoolingEnabled">false</Property>
-	    <Property name="MultiAttributeSeparator">,</Property>
-	    <Property name="BulkImportSupported">true</Property>
-        </UserStoreManager-->
-
-        <!-- Active directory configuration is as follows.
-            In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
-            There are few special properties for "Active Directory".
-            They are :
-            1.Referral - (comment out this property if this feature is not reuired) This enables LDAP referral support.
-            2.BackLinksEnabled - (Do not comment, set to true or false) In some cases LDAP works with BackLinksEnabled. In which role is stored
-             at user level. Depending on this value we need to change the Search Base within code.
-            3.isADLDSRole - (Do not comment) Set to true if connecting to an AD LDS instance else set to false.
-        -->
-        <!--UserStoreManager class="org.wso2.carbon.user.core.ldap.ActiveDirectoryUserStoreManager">
-                <Property name="TenantManager">org.wso2.carbon.user.core.tenant.CommonHybridLDAPTenantManager</Property>
-                <Property name="defaultRealmName">WSO2.ORG</Property>
-                <Property name="Disabled">false</Property>
-                <Property name="kdcEnabled">false</Property>
-                <Property name="ConnectionURL">ldaps://10.100.1.100:636</Property>
-                <Property name="ConnectionName">CN=admin,CN=Users,DC=WSO2,DC=Com</Property>
-                <Property name="ConnectionPassword">A1b2c3d4</Property>
-                <Property name="LDAPConnectionTimeout">5000</Property>
-            <Property name="PasswordHashMethod">PLAIN_TEXT</Property>
-                <Property name="UserSearchBase">CN=Users,DC=WSO2,DC=Com</Property>
-                <Property name="UserEntryObjectClass">user</Property>
-                <Property name="UserNameAttribute">cn</Property>
-                <Property name="MemberOfAttribute">memberOf</Property>
-                <Property name="Referral">follow</Property>
-                <Property name="isADLDSRole">false</Property>
-            <Property name="userAccountControl">512</Property>
-                <Property name="UserNameListFilter">(objectClass=user)</Property>
-            <Property name="UserNameSearchFilter">(&amp;(objectClass=user)(cn=?))</Property>
-                <Property name="UsernameJavaRegEx">[a-zA-Z0-9._-|//]{3,30}$</Property>
-                <Property name="UsernameJavaScriptRegEx">^[\S]{3,30}$</Property>
-                <Property name="PasswordJavaRegEx">^[\S]{5,30}$</Property>
-                <Property name="PasswordJavaRegExViolationErrorMsg">Password length should be between 5 to 30 characters</Property>
-                <Property name="PasswordJavaScriptRegEx">^[\S]{5,30}$</Property>
-            <Property name="RolenameJavaScriptRegEx">^[\S]{3,30}$</Property>
-                <Property name="RolenameJavaRegEx">[a-zA-Z0-9._-|//]{3,30}$</Property>
-            <Property name="ReadGroups">true</Property>
-            <Property name="WriteGroups">true</Property>
-            <Property name="EmptyRolesAllowed">true</Property>
-                <Property name="GroupSearchBase">CN=Users,DC=WSO2,DC=Com</Property>
-            <Property name="GroupEntryObjectClass">group</Property>
-                <Property name="GroupNameAttribute">cn</Property>
-                <Property name="SharedGroupNameAttribute">cn</Property>
-                <Property name="SharedGroupSearchBase">ou=SharedGroups,dc=wso2,dc=org</Property>
-                <Property name="SharedGroupEntryObjectClass">groups</Property>
-                <Property name="SharedTenantNameListFilter">(object=organizationalUnit)</Property>
-                <Property name="SharedTenantNameAttribute">ou</Property>
-                <Property name="SharedTenantObjectClass">organizationalUnit</Property>
-                <Property name="MembershipAttribute">member</Property>
-                <Property name="GroupNameListFilter">(objectcategory=group)</Property>
-            <Property name="GroupNameSearchFilter">(&amp;(objectClass=group)(cn=?))</Property>
-                <Property name="UserRolesCacheEnabled">true</Property>
-                <Property name="Referral">follow</Property>
-            <Property name="BackLinksEnabled">true</Property>
-                <Property name="MaxRoleNameListLength">100</Property>
-                <Property name="MaxUserNameListLength">100</Property>
-                <Property name="SCIMEnabled">false</Property>
-            <Property name="ConnectionPoolingEnabled">false</Property>
-            <Property name="MultiAttributeSeparator">,</Property>
-            <Property name="BulkImportSupported">true</Property>
-            </UserStoreManager-->
-
-        <!-- If product is using an external LDAP as the user store in read/write mode, use following user manager
-            In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
-        -->
-        <!--UserStoreManager class="org.wso2.carbon.user.core.ldap.ReadWriteLDAPUserStoreManager">
-                <Property name="TenantManager">org.wso2.carbon.user.core.tenant.CommonHybridLDAPTenantManager</Property>
-                <Property name="ConnectionURL">ldap://localhost:10389</Property>
-                <Property name="Disabled">false</Property>
-                <Property name="ConnectionName">uid=admin,ou=system</Property>
-                <Property name="ConnectionPassword">secret</Property>
-                <Property name="LDAPConnectionTimeout">5000</Property>
-                <Property name="PasswordHashMethod">PLAIN_TEXT</Property>
-                <Property name="UserNameListFilter">(objectClass=person)</Property>
-            <Property name="UserEntryObjectClass">inetOrgPerson</Property>
-                <Property name="UserSearchBase">ou=system</Property>
-                <Property name="UserNameSearchFilter">(&amp;(objectClass=person)(uid=?))</Property>
-                <Property name="UserNameAttribute">uid</Property>
-            <Property name="UsernameJavaRegEx">[a-zA-Z0-9._-|//]{3,30}$</Property>
-                <Property name="UsernameJavaScriptRegEx">^[\S]{3,30}$</Property>
-            <Property name="RolenameJavaScriptRegEx">^[\S]{3,30}$</Property>
-                <Property name="RolenameJavaRegEx">[a-zA-Z0-9._-|//]{3,30}$</Property>
-                <Property name="PasswordJavaScriptRegEx">^[\S]{5,30}$</Property>
-                <Property name="PasswordJavaRegEx">^[\S]{5,30}$</Property>
-                <Property name="PasswordJavaRegExViolationErrorMsg">Password length should be between 5 to 30 characters</Property>
-            <Property name="ReadGroups">true</Property>
-            <Property name="WriteGroups">true</Property>
-            <Property name="EmptyRolesAllowed">false</Property>
-                <Property name="GroupSearchBase">ou=system</Property>
-                <Property name="GroupNameListFilter">(objectClass=groupOfNames)</Property>
-                <Property name="GroupEntryObjectClass">groupOfNames</Property>
-                <Property name="GroupNameSearchFilter">(&amp;(objectClass=groupOfNames)(cn=?))</Property>
-                <Property name="GroupNameAttribute">cn</Property>
-                <Property name="SharedGroupNameAttribute">cn</Property>
-                <Property name="SharedGroupSearchBase">ou=SharedGroups,dc=wso2,dc=org</Property>
-                <Property name="SharedGroupEntryObjectClass">groupOfNames</Property>
-                <Property name="SharedGroupNameListFilter">(objectClass=groupOfNames)</Property>
-                <Property name="SharedGroupNameSearchFilter">(&amp;(objectClass=groupOfNames)(cn=?))</Property>
-                <Property name="SharedTenantNameListFilter">(objectClass=organizationalUnit)</Property>
-                <Property name="SharedTenantNameAttribute">ou</Property>
-                <Property name="SharedTenantObjectClass">organizationalUnit</Property>
-                <Property name="MembershipAttribute">member</Property>
-                <Property name="UserRolesCacheEnabled">true</Property>
-            <Property name="ReplaceEscapeCharactersAtUserLogin">true</Property>
-                <Property name="MaxRoleNameListLength">100</Property>
-                <Property name="MaxUserNameListLength">100</Property>
-                <Property name="SCIMEnabled">false</Property>
-            <Property name="ConnectionPoolingEnabled">false</Property>
-            <Property name="MultiAttributeSeparator">,</Property>
-            <Property name="BulkImportSupported">true</Property>
-            </UserStoreManager-->
-
-        <!-- Following user manager is used by Identity Server (IS) as its default user manager.
-             IS will do token replacement when building the product. Therefore do not change the syntax.
-             If "kdcEnabled" parameter is true, IS will allow service principle management. Thus "ServicePasswordJavaRegEx", "ServiceNameJavaRegEx"
-             properties control the service name format and service password formats.
-             In case if user core cache domain is needed to identify uniquely set property <Property name="UserCoreCacheIdentifier">domain</Property>
-        -->
-        <!--ISUserStoreManager class="org.wso2.carbon.user.core.ldap.ReadWriteLDAPUserStoreManager">
-                <Property name="TenantManager">org.wso2.carbon.user.core.tenant.CommonHybridLDAPTenantManager</Property>
-                <Property name="defaultRealmName">WSO2.ORG</Property>
-                <Property name="kdcEnabled">false</Property>
-                <Property name="Disabled">false</Property>
-                <Property name="ConnectionURL">ldap://localhost:${Ports.EmbeddedLDAP.LDAPServerPort}</Property>
-                <Property name="ConnectionName">uid=admin,ou=system</Property>
-                <Property name="ConnectionPassword">admin</Property>
-                <Property name="LDAPConnectionTimeout">5000</Property>
-                <Property name="PasswordHashMethod">SHA</Property>
-                <Property name="UserNameListFilter">(objectClass=person)</Property>
-                <Property name="UserEntryObjectClass">identityPerson</Property>
-                <Property name="UserSearchBase">ou=Users,dc=wso2,dc=org</Property>
-                <Property name="UserNameSearchFilter">(&amp;(objectClass=person)(uid=?))</Property>
-                <Property name="UserNameAttribute">uid</Property>
-                <Property name="PasswordJavaScriptRegEx">^[\S]{5,30}$</Property>
-                <Property name="PasswordJavaRegEx">^[\S]{5,30}$</Property>
-                <Property name="ServicePasswordJavaRegEx">^[\\S]{5,30}$</Property>
-                <Property name="PasswordJavaRegExViolationErrorMsg">Password length should be between 5 to 30 characters</Property>
-                <Property name="ServiceNameJavaRegEx">^[\\S]{2,30}/[\\S]{2,30}$</Property>
-                <Property name="UsernameJavaScriptRegEx">^[\S]{3,30}$</Property>
-                <Property name="UsernameJavaRegEx">[a-zA-Z0-9._-|//]{3,30}$</Property>
-                <Property name="RolenameJavaScriptRegEx">^[\S]{3,30}$</Property>
-                <Property name="RolenameJavaRegEx">[a-zA-Z0-9._-|//]{3,30}$</Property>
-            <Property name="ReadGroups">true</Property>
-            <Property name="WriteGroups">true</Property>
-            <Property name="EmptyRolesAllowed">true</Property>
-                <Property name="GroupSearchBase">ou=Groups,dc=wso2,dc=org</Property>
-                <Property name="GroupNameListFilter">(objectClass=groupOfNames)</Property>
-            <Property name="GroupEntryObjectClass">groupOfNames</Property>
-                <Property name="GroupNameSearchFilter">(&amp;(objectClass=groupOfNames)(cn=?))</Property>
-                <Property name="GroupNameAttribute">cn</Property>
-                <Property name="SharedGroupNameAttribute">cn</Property>
-                <Property name="SharedGroupSearchBase">ou=SharedGroups,dc=wso2,dc=org</Property>
-                <Property name="SharedGroupEntryObjectClass">groupOfNames</Property>
-                <Property name="SharedGroupNameListFilter">(objectClass=groupOfNames)</Property>
-                <Property name="SharedGroupNameSearchFilter">(&amp;(objectClass=groupOfNames)(cn=?))</Property>
-                <Property name="SharedTenantNameListFilter">(objectClass=organizationalUnit)</Property>
-                <Property name="SharedTenantNameAttribute">ou</Property>
-                <Property name="SharedTenantObjectClass">organizationalUnit</Property>
-                <Property name="MembershipAttribute">member</Property>
-                <Property name="UserRolesCacheEnabled">true</Property>
-            <Property name="UserDNPattern">uid={0},ou=Users,dc=wso2,dc=org</Property>
-            <Property name="RoleDNPattern">cn={0},ou=Groups,dc=wso2,dc=org</Property>
-            <Property name="SCIMEnabled">true</Property>
-                <Property name="MaxRoleNameListLength">100</Property>
-                <Property name="MaxUserNameListLength">100</Property>
-            <Property name="ConnectionPoolingEnabled">false</Property>
-            <Property name="MultiAttributeSeparator">,</Property>
-            <Property name="BulkImportSupported">true</Property>
-            </ISUserStoreManager-->
-
-        <!--	Following configuration is for the CassandraUserStoreManager. The CassandraUserStoreManager is capable of using a Cassandra
-            database as a user store. This user manager supports multiple credentials for authentication. Credential types can be defined
-            and configured in the following configuration. The CassandraUserStoreManager does not ships with the any of the WSO2 Carbon
-            Servers by default, therefor Cassandra user manager component needs to be installed to the Carbon Server befor using.
-
-            And if this CassandraUserStoreManager is used as the primary user store with multi tenants, it should also implement a
-            compatible TenantManager and set property <Property name="TenantManager">FULL_QUALIFIED_TENANT_MANAGER_CLASS_NAME</Property>.
-        -->
-        <!--UserStoreManager class="org.wso2.carbon.user.cassandra.CassandraUserStoreManager">
-            <Property name="Keyspace">User_KS3</Property>
-            <Property name="Host">localhost</Property>
-            <Property name="Port">9160</Property>
-            <Property name="PasswordDigest">SHA-256</Property>
-            <Property name="StoreSaltedPassword">true</Property>
-            <Property name="AuthenticateWithAnyCredential">true</Property>
-            <Property name="DomainName">multipleCredentialUserStoreDomain</Property>
-            <Property name="BulkImportSupported">true</Property>
-                <MultipleCredentials>
-                <Credential type="Default">org.wso2.carbon.user.cassandra.credentialtypes.EmailCredential</Credential>
-                <Credential type="Email">org.wso2.carbon.user.cassandra.credentialtypes.EmailCredential</Credential>
-                <Credential type="PhoneNumber">org.wso2.carbon.user.cassandra.credentialtypes.PhoneNumberCredential</Credential>
-                <Credential type="Device">org.wso2.carbon.user.cassandra.credentialtypes.DeviceCredential</Credential>
-                <Credential type="External">org.wso2.carbon.user.cassandra.credentialtypes.ExternalProviderCredential</Credential>
-                </MultipleCredentials>
-        </UserStoreManager-->
-
-        <AuthorizationManager
-                class="org.wso2.carbon.user.core.authorization.JDBCAuthorizationManager">
-            <Property name="AdminRoleManagementPermissions">/permission</Property>
-            <Property name="AuthorizationCacheEnabled">true</Property>
-            <Property name="GetAllRolesOfUserEnabled">true</Property>
-        </AuthorizationManager>
-    </Realm>
-</UserManager>
-
-        <!--*******Description of some of the configuration properties used in user-mgt.xml*********************************
-
-        DomainName - This property must be used by all secondary user store managers in multiple user store configuration.
-                 DomainName is a unique identifier given to the user store. Users must provide both the domain name and
-                 username at log-in as "DomainName\Username"
-
-        UserRolesCacheEnabled - This is to indicate whether to cache role list of a user. By default it is set to true.
-                                You may need to disable it if user-roles are changed by external means and need to reflect
-                                those changes in the carbon product immediately.
-
-        ReplaceEscapeCharactersAtUserLogin - This is to configure whether escape characters in user name needs to be replaced at user login.
-                             Currently the identified escape characters that needs to be replaced are '\' & '\\'
-
-        UserDNPattern - This property will be used when authenticating users. During authentication we do a bind. But if the user is login with
-                        email address or some other property we need to first lookup LDAP and retreive DN for the user. This involves an additional step.
-                        If UserDNPattern is specified the DN will be contructed using the pattern specified in this property. Performance of this is much better than looking
-                        up DN and binding user.
-
-        RoleDNPattern - This property will be used when checking whether user has been assigned to a given role. Rather than searching the role in search base, by
-                        using this property direct search can be done.
-
-        PasswordHashMethod - This says how the password should be stored. Allowed values are as follows,
-                             SHA - Uses SHA digest method
-                             MD5 - Uses MD 5 digest method
-                             PLAIN_TEXT - Plain text passwords
-                             In addition to above this supports all digest methods supported by http://docs.oracle.com/javase/6/docs/api/java/security/MessageDigest.html.
-
-        DisplayNameAttribute - this is to have a dedicated LDAP attribute to display an entity(User/Role) in UI, in addition to the UserNameAttribute which is used for IS-UserStore interactions.
-        -->
diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/carbon.xml b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/repository/conf/carbon.xml
similarity index 100%
rename from components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/carbon-home/repository/conf/carbon.xml
rename to components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/repository/conf/carbon.xml