You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2013/08/13 10:37:10 UTC

git commit: Renamed stratos-controller/billing-script to stratos-controller/dbscripts and updated referencing files

Updated Branches:
  refs/heads/master a3e0e932b -> c67e7c5bf


Renamed stratos-controller/billing-script to stratos-controller/dbscripts and updated referencing files

Signed-off-by: Manula Thantriwatte <ma...@wso2.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c67e7c5b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c67e7c5b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c67e7c5b

Branch: refs/heads/master
Commit: c67e7c5bf7253b3b5f2cddc47dd3960c26cb682b
Parents: a3e0e93
Author: Imesh Gunaratne <im...@wso2.com>
Authored: Tue Aug 13 12:46:21 2013 +0530
Committer: Manula Thantriwatte <ma...@wso2.com>
Committed: Tue Aug 13 14:06:25 2013 +0530

----------------------------------------------------------------------
 .../billing-script/billing-h2.sql               | 109 --------------
 .../billing-script/billing-mysql.sql            | 120 ---------------
 .../billing-script/metering_h2.sql              | 114 --------------
 .../billing-script/metering_mysql.sql           | 149 -------------------
 .../billing-script/migration.sql                |   7 -
 .../stratos-controller/billing-script/s2_h2.sql |  96 ------------
 .../billing-script/stratos_mysql.sql            | 121 ---------------
 .../billing-script/wso2_rss.sql                 |  81 ----------
 .../stratos-controller/dbscripts/billing-h2.sql | 109 ++++++++++++++
 .../dbscripts/billing-mysql.sql                 | 120 +++++++++++++++
 .../dbscripts/metering_h2.sql                   | 114 ++++++++++++++
 .../dbscripts/metering_mysql.sql                | 149 +++++++++++++++++++
 .../stratos-controller/dbscripts/migration.sql  |   7 +
 products/stratos-controller/dbscripts/s2_h2.sql |  96 ++++++++++++
 .../dbscripts/stratos_mysql.sql                 | 121 +++++++++++++++
 .../stratos-controller/dbscripts/wso2_rss.sql   |  81 ++++++++++
 .../modules/distribution/pom.xml                |   6 +-
 .../modules/distribution/src/assembly/bin.xml   |   2 +-
 18 files changed, 801 insertions(+), 801 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c67e7c5b/products/stratos-controller/billing-script/billing-h2.sql
----------------------------------------------------------------------
diff --git a/products/stratos-controller/billing-script/billing-h2.sql b/products/stratos-controller/billing-script/billing-h2.sql
deleted file mode 100755
index e70be14..0000000
--- a/products/stratos-controller/billing-script/billing-h2.sql
+++ /dev/null
@@ -1,109 +0,0 @@
-CREATE TABLE IF NOT EXISTS BC_CUSTOMER (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_NAME VARCHAR (64),
-             BC_STARTED_DATE TIMESTAMP,
-             BC_EMAIL VARCHAR (64),
-             BC_ADDRESS VARCHAR (256),
-             CONSTRAINT PK_BC_CUSTOMER PRIMARY KEY (BC_ID)
-);
-
-CREATE HASH INDEX BC_CUSTOMER_IND_BY_BC_NAME ON BC_CUSTOMER(BC_NAME);
-CREATE HASH INDEX BC_CUSTOMER_IND_BY_BC_EMAIL ON BC_CUSTOMER(BC_EMAIL);
-
-CREATE TABLE IF NOT EXISTS BC_ITEM (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_NAME VARCHAR (64),
-             BC_COST VARCHAR (64),
-             BC_DESCRIPTION VARCHAR(128),
-             BC_PARENT_ITEM_ID INTEGER,
-             CONSTRAINT PK_BC_ITEM PRIMARY KEY (BC_ID)
-);
-INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ('Demo',NULL,NULL,NULL);
-INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ('SMB',NULL,NULL,NULL);
-INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ('Professional',NULL,NULL,NULL);
-INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ('Enterprise',NULL,NULL,NULL);
-
-ALTER TABLE BC_ITEM ADD CONSTRAINT IF NOT EXISTS BC_ITEM_FK_BY_PARENT_ITEM_ID FOREIGN KEY (BC_PARENT_ITEM_ID) REFERENCES BC_ITEM (BC_ID);
-
-
-CREATE TABLE IF NOT EXISTS BC_SUBSCRIPTION (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_FILTER VARCHAR (32),
-             BC_IS_ACTIVE INTEGER,
-             BC_ACTIVE_SINCE TIMESTAMP,
-             BC_ACTIVE_UNTIL TIMESTAMP,
-             BC_ITEM_ID INTEGER,
-             BC_TENANT_ID INTEGER,
-             CONSTRAINT PK_BC_SUBSCRIPTION PRIMARY KEY (BC_ID)
-);
-
-ALTER TABLE BC_SUBSCRIPTION ADD CONSTRAINT IF NOT EXISTS BC_SUBSCRIPTION_FK_BY_ITEM_ID FOREIGN KEY (BC_ITEM_ID) REFERENCES BC_ITEM (BC_ID);
-
-CREATE TABLE IF NOT EXISTS BC_INVOICE (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_TENANT_ID INTEGER,
-             BC_DATE TIMESTAMP,
-             BC_START_DATE TIMESTAMP,
-             BC_END_DATE TIMESTAMP,
-             BC_BOUGHT_FORWARD VARCHAR (64),
-             BC_CARRIED_FORWARD VARCHAR (64),
-             BC_TOTAL_PAYMENTS VARCHAR (64),
-             BC_TOTAL_COST VARCHAR (64),
-             CONSTRAINT PK_BC_INVOICE PRIMARY KEY (BC_ID)
-);
-
-
-CREATE TABLE IF NOT EXISTS BC_PAYMENT (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_DATE TIMESTAMP,
-             BC_AMOUNT VARCHAR (64),
-             BC_DESCRIPTION VARCHAR (128),
-             BC_INVOICE_ID INTEGER,
-	     	 BC_TENANT_ID INTEGER,	
-             CONSTRAINT PK_BC_PAYMENT PRIMARY KEY (BC_ID)
-);
-
-ALTER TABLE BC_PAYMENT ADD CONSTRAINT IF NOT EXISTS BC_PAYMENT_FK_BY_INVOICE_ID FOREIGN KEY (BC_INVOICE_ID) REFERENCES BC_INVOICE (BC_ID);
-
--- this is n-n relationship
-CREATE TABLE IF NOT EXISTS BC_PAYMENT_SUBSCRIPTION (
-             BC_PAYMENT_ID INTEGER,
-             BC_SUBSCRIPTION_ID INTEGER,
-             CONSTRAINT PK_BC_SUBSCRIPTION_ORDER PRIMARY KEY (BC_PAYMENT_ID, BC_SUBSCRIPTION_ID)
-);
-
-ALTER TABLE BC_PAYMENT_SUBSCRIPTION ADD CONSTRAINT IF NOT EXISTS BC_PAYMENT_SUBSCRIPTION_FK_BY_PAYMENT_ID FOREIGN KEY (BC_PAYMENT_ID) REFERENCES BC_PAYMENT (BC_ID);
-ALTER TABLE BC_PAYMENT_SUBSCRIPTION ADD CONSTRAINT IF NOT EXISTS BC_PAYMENT_SUBSCRIPTION_FK_BY_SUBSCRIPTION_ID FOREIGN KEY (BC_SUBSCRIPTION_ID) REFERENCES BC_SUBSCRIPTION (BC_ID);
-
-CREATE TABLE IF NOT EXISTS BC_INVOICE_SUBSCRIPTION (
-             BC_ID INTEGER  AUTO_INCREMENT,
-             BC_INVOICE_ID INTEGER,
-             BC_SUBSCRIPTION_ID INTEGER,
-             CONSTRAINT PK_BC_INVOICE_ITEM PRIMARY KEY (BC_ID)
-);
-
-ALTER TABLE BC_INVOICE_SUBSCRIPTION ADD CONSTRAINT IF NOT EXISTS BC_INVOICE_SUBSCRIPTION_FK_BY_INVOICE_ID FOREIGN KEY (BC_INVOICE_ID) REFERENCES BC_INVOICE (BC_ID);
-ALTER TABLE BC_INVOICE_SUBSCRIPTION ADD CONSTRAINT IF NOT EXISTS BC_INVOICE_SUBSCRIPTION_FK_BY_SUBSCRIPTION_ID FOREIGN KEY (BC_SUBSCRIPTION_ID) REFERENCES BC_SUBSCRIPTION (BC_ID);
-
-
-CREATE TABLE IF NOT EXISTS BC_INVOICE_SUBSCRIPTION_ITEM (
-             BC_INVOICE_SUBSCRIPTION_ID INTEGER,
-             BC_ITEM_ID INTEGER,
-             BC_COST VARCHAR (64),
-	     BC_DESCRIPTION VARCHAR (64),	
-             CONSTRAINT PK_BC_INVOICE_SUBSCRIPTION_ITEM PRIMARY KEY (BC_INVOICE_SUBSCRIPTION_ID, BC_ITEM_ID)
-);
-
-ALTER TABLE BC_INVOICE_SUBSCRIPTION_ITEM ADD CONSTRAINT IF NOT EXISTS BC_INVOICE_SUBSCRIPTION_ITEM_FK_BY_INVOICE_SUBSCRIPTION_ID FOREIGN KEY (BC_INVOICE_SUBSCRIPTION_ID) REFERENCES BC_INVOICE_SUBSCRIPTION (BC_ID);
-ALTER TABLE BC_INVOICE_SUBSCRIPTION_ITEM ADD CONSTRAINT IF NOT EXISTS BC_INVOICE_SUBSCRIPTION_ITEM_FK_BY_ITEM_ID FOREIGN KEY (BC_ITEM_ID) REFERENCES BC_ITEM(BC_ID);
-
-CREATE TABLE IF NOT EXISTS BC_DISCOUNT (
-	BC_ID INTEGER AUTO_INCREMENT,
-	BC_TENANT_ID INTEGER,
-	BC_PERCENTAGE FLOAT,
-	BC_AMOUNT FLOAT,
-	BC_START_DATE TIMESTAMP,
-	BC_END_DATE TIMESTAMP,
-	BC_PERCENTAGE_TYPE INTEGER,
-	CONSTRAINT PK_BC_DISCOUNT PRIMARY KEY (BC_ID)
-);

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c67e7c5b/products/stratos-controller/billing-script/billing-mysql.sql
----------------------------------------------------------------------
diff --git a/products/stratos-controller/billing-script/billing-mysql.sql b/products/stratos-controller/billing-script/billing-mysql.sql
deleted file mode 100755
index 55cab9a..0000000
--- a/products/stratos-controller/billing-script/billing-mysql.sql
+++ /dev/null
@@ -1,120 +0,0 @@
-CREATE TABLE IF NOT EXISTS BC_CUSTOMER (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_NAME VARCHAR (64),
-             BC_STARTED_DATE TIMESTAMP,
-             BC_EMAIL VARCHAR (64),
-             BC_ADDRESS VARCHAR (256),
-             CONSTRAINT PK_BC_CUSTOMER PRIMARY KEY (BC_ID)
-)ENGINE INNODB;
-
-CREATE INDEX BC_CUSTOMER_IND_BY_BC_NAME USING HASH ON BC_CUSTOMER(BC_NAME);
-CREATE INDEX BC_CUSTOMER_IND_BY_BC_EMAIL USING HASH ON BC_CUSTOMER(BC_EMAIL);
-
-CREATE TABLE IF NOT EXISTS BC_ITEM (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_NAME VARCHAR (64),
-             BC_COST VARCHAR (64),
-             BC_DESCRIPTION VARCHAR(128),
-             BC_PARENT_ITEM_ID INTEGER,
-             CONSTRAINT PK_BC_ITEM PRIMARY KEY (BC_ID)
-)ENGINE INNODB;
-INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ("Demo",NULL,NULL,NULL);
-INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ("SMB",NULL,NULL,NULL);
-INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ("Professional",NULL,NULL,NULL);
-INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ("Enterprise",NULL,NULL,NULL);
-
-ALTER TABLE BC_ITEM ADD CONSTRAINT BC_ITEM_FK_BY_PARENT_ITEM_ID FOREIGN KEY (BC_PARENT_ITEM_ID) REFERENCES BC_ITEM (BC_ID);
-
-
-CREATE TABLE IF NOT EXISTS BC_SUBSCRIPTION (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_FILTER VARCHAR (32),
-             BC_IS_ACTIVE INTEGER,
-             BC_ACTIVE_SINCE TIMESTAMP,
-             BC_ACTIVE_UNTIL TIMESTAMP,
-             BC_ITEM_ID INTEGER,
-             BC_TENANT_ID INTEGER,
-             CONSTRAINT PK_BC_SUBSCRIPTION PRIMARY KEY (BC_ID)
-)ENGINE INNODB;
-
-ALTER TABLE BC_SUBSCRIPTION ADD CONSTRAINT BC_SUBSCRIPTION_FK_BY_ITEM_ID FOREIGN KEY (BC_ITEM_ID) REFERENCES BC_ITEM (BC_ID);
-
-CREATE TABLE IF NOT EXISTS BC_INVOICE (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_TENANT_ID INTEGER,
-             BC_DATE TIMESTAMP,
-             BC_START_DATE TIMESTAMP,
-             BC_END_DATE TIMESTAMP,
-             BC_BOUGHT_FORWARD VARCHAR (64),
-             BC_CARRIED_FORWARD VARCHAR (64),
-             BC_TOTAL_PAYMENTS VARCHAR (64),
-             BC_TOTAL_COST VARCHAR (64),
-             CONSTRAINT PK_BC_INVOICE PRIMARY KEY (BC_ID)
-)ENGINE INNODB;
-
-
-CREATE TABLE IF NOT EXISTS BC_PAYMENT (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_DATE TIMESTAMP,
-             BC_AMOUNT VARCHAR (64),
-             BC_DESCRIPTION VARCHAR (128),
-             BC_INVOICE_ID INTEGER,
-	     BC_TENANT_ID INTEGER,	
-             CONSTRAINT PK_BC_SUBSCRIPTION_ORDER PRIMARY KEY (BC_ID)
-)ENGINE INNODB;
-
-ALTER TABLE BC_PAYMENT ADD CONSTRAINT BC_PAYMENT_FK_BY_INVOICE_ID FOREIGN KEY (BC_INVOICE_ID) REFERENCES BC_INVOICE (BC_ID);
-
-CREATE TABLE IF NOT EXISTS BC_REGISTRATION_PAYMENT (
-             BC_ID INTEGER AUTO_INCREMENT,
-             BC_DATE TIMESTAMP,
-             BC_AMOUNT VARCHAR (64),
-             BC_DESCRIPTION VARCHAR (128),
-			 BC_USAGE_PLAN VARCHAR (64),
-	     	 BC_TENANT_ID INTEGER,	
-             CONSTRAINT PK_BC_REGISTRATION_PAYMENT PRIMARY KEY (BC_ID)
-)ENGINE INNODB;
-
--- this is n-n relationship
-CREATE TABLE IF NOT EXISTS BC_PAYMENT_SUBSCRIPTION (
-             BC_PAYMENT_ID INTEGER,
-             BC_SUBSCRIPTION_ID INTEGER,
-             CONSTRAINT PK_BC_SUBSCRIPTION_ORDER PRIMARY KEY (BC_PAYMENT_ID, BC_SUBSCRIPTION_ID)
-)ENGINE INNODB;
-
-ALTER TABLE BC_PAYMENT_SUBSCRIPTION ADD CONSTRAINT BC_PAYMENT_SUBSCRIPTION_FK_BY_PAYMENT_ID FOREIGN KEY (BC_PAYMENT_ID) REFERENCES BC_PAYMENT (BC_ID);
-ALTER TABLE BC_PAYMENT_SUBSCRIPTION ADD CONSTRAINT BC_PAYMENT_SUBSCRIPTION_FK_BY_SUBSCRIPTION_ID FOREIGN KEY (BC_SUBSCRIPTION_ID) REFERENCES BC_SUBSCRIPTION (BC_ID);
-
-CREATE TABLE IF NOT EXISTS BC_INVOICE_SUBSCRIPTION (
-             BC_ID INTEGER  AUTO_INCREMENT,
-             BC_INVOICE_ID INTEGER,
-             BC_SUBSCRIPTION_ID INTEGER,
-             CONSTRAINT PK_BC_INVOICE_ITEM PRIMARY KEY (BC_ID)
-)ENGINE INNODB;
-
-ALTER TABLE BC_INVOICE_SUBSCRIPTION ADD CONSTRAINT BC_INVOICE_SUBSCRIPTION_FK_BY_INVOICE_ID FOREIGN KEY (BC_INVOICE_ID) REFERENCES BC_INVOICE (BC_ID);
-ALTER TABLE BC_INVOICE_SUBSCRIPTION ADD CONSTRAINT BC_INVOICE_SUBSCRIPTION_FK_BY_SUBSCRIPTION_ID FOREIGN KEY (BC_SUBSCRIPTION_ID) REFERENCES BC_SUBSCRIPTION (BC_ID);
-
-
-CREATE TABLE IF NOT EXISTS BC_INVOICE_SUBSCRIPTION_ITEM (
-             BC_INVOICE_SUBSCRIPTION_ID INTEGER,
-             BC_ITEM_ID INTEGER,
-             BC_COST VARCHAR (64),
-	     BC_DESCRIPTION varchar (64),	
-             CONSTRAINT PK_BC_INVOICE_SUBSCRIPTION_ITEM PRIMARY KEY (BC_INVOICE_SUBSCRIPTION_ID, BC_ITEM_ID)
-)ENGINE INNODB;
-
-ALTER TABLE BC_INVOICE_SUBSCRIPTION_ITEM ADD CONSTRAINT BC_INVOICE_SUBSCRIPTION_ITEM_FK_BY_INVOICE_SUBSCRIPTION_ID FOREIGN KEY (BC_INVOICE_SUBSCRIPTION_ID) REFERENCES BC_INVOICE_SUBSCRIPTION (BC_ID);
-ALTER TABLE BC_INVOICE_SUBSCRIPTION_ITEM ADD CONSTRAINT BC_INVOICE_SUBSCRIPTION_ITEM_FK_BY_ITEM_ID FOREIGN KEY (BC_ITEM_ID) REFERENCES BC_ITEM(BC_ID);
-
-CREATE TABLE IF NOT EXISTS BC_DISCOUNT (
-        BC_ID INTEGER AUTO_INCREMENT,
-        BC_TENANT_ID INTEGER,
-        BC_PERCENTAGE FLOAT,
-        BC_AMOUNT FLOAT,
-        BC_START_DATE TIMESTAMP,
-        BC_END_DATE TIMESTAMP,
-        BC_PERCENTAGE_TYPE INTEGER,
-        CONSTRAINT PK_BC_DISCOUNT PRIMARY KEY (BC_ID)
-)ENGINE INNODB;
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c67e7c5b/products/stratos-controller/billing-script/metering_h2.sql
----------------------------------------------------------------------
diff --git a/products/stratos-controller/billing-script/metering_h2.sql b/products/stratos-controller/billing-script/metering_h2.sql
deleted file mode 100755
index 0491b8e..0000000
--- a/products/stratos-controller/billing-script/metering_h2.sql
+++ /dev/null
@@ -1,114 +0,0 @@
---
--- TABLES
---
-
-CREATE TABLE IF NOT EXISTS USAGE_HOURLY_ANALYTICS (
-        ID VARCHAR(200) NOT NULL,
-        HOUR_FACT TIMESTAMP,
-        SERVER_NAME VARCHAR(100),
-        TENANT_ID VARCHAR(50),
-        PAYLOAD_TYPE VARCHAR(50),
-        PAYLOAD_VALUE  BIGINT,
-        PRIMARY KEY (ID)
-);
-
-CREATE TABLE IF NOT EXISTS USAGE_DAILY_ANALYTICS (
-        ID VARCHAR(200) NOT NULL,
-        DAY_FACT TIMESTAMP,
-        SERVER_NAME VARCHAR(100),
-        TENANT_ID VARCHAR(50),
-        PAYLOAD_TYPE VARCHAR(50),
-        PAYLOAD_VALUE  BIGINT,
-        PRIMARY KEY (ID)
-);
-
-CREATE TABLE IF NOT EXISTS USAGE_MONTHLY_ANALYTICS (
-        ID VARCHAR(200) NOT NULL,
-        MONTH_FACT TIMESTAMP,
-        SERVER_NAME VARCHAR(100),
-        TENANT_ID VARCHAR(50),
-        PAYLOAD_TYPE VARCHAR(50),
-        PAYLOAD_VALUE  BIGINT,
-        PRIMARY KEY (ID)
-);
-
-CREATE TABLE IF NOT EXISTS USAGE_LAST_HOURLY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (ID)
-);
-	
-CREATE TABLE IF NOT EXISTS USAGE_LAST_DAILY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (ID)
-);
-
-CREATE TABLE IF NOT EXISTS USAGE_LAST_MONTHLY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (ID)
-);
-
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_HOURLY_ANALYTICS (
-	ID VARCHAR(200) NOT NULL,
-	HOUR_FACT TIMESTAMP,
-	SERVER_NAME VARCHAR(100),
-	TENANT_ID VARCHAR(50),
-	REQUEST_COUNT BIGINT,
-	RESPONSE_COUNT BIGINT,
-	FAULT_COUNT BIGINT,
-	PRIMARY KEY (ID)
-);
-
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_DAILY_ANALYTICS (
-	ID VARCHAR(200) NOT NULL,
-	DAY_FACT TIMESTAMP,
-	SERVER_NAME VARCHAR(100),
-	TENANT_ID VARCHAR(50),
-	REQUEST_COUNT BIGINT,
-	RESPONSE_COUNT BIGINT,
-	FAULT_COUNT BIGINT,
-	PRIMARY KEY (ID)
-);
-
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_MONTHLY_ANALYTICS (
-	ID VARCHAR(200) NOT NULL,
-	MONTH_FACT TIMESTAMP,
-	SERVER_NAME VARCHAR(100),
-	TENANT_ID VARCHAR(50),
-	REQUEST_COUNT BIGINT,
-	RESPONSE_COUNT BIGINT,
-	FAULT_COUNT BIGINT,
-	PRIMARY KEY (ID)
-);
-
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_LAST_HOURLY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (ID)
-);
-	
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_LAST_DAILY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (ID)
-);
-
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_LAST_MONTHLY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (ID)
-);
-
-CREATE TABLE IF NOT EXISTS REGISTRY_USAGE_HOURLY_ANALYTICS ( 
-	ID VARCHAR(50),
-	TENANT_ID VARCHAR(50),	
-	HISTORY_USAGE BIGINT,
-	CURRENT_USAGE BIGINT,
-	PRIMARY KEY (ID)
-); 
-
-
-COMMIT;
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c67e7c5b/products/stratos-controller/billing-script/metering_mysql.sql
----------------------------------------------------------------------
diff --git a/products/stratos-controller/billing-script/metering_mysql.sql b/products/stratos-controller/billing-script/metering_mysql.sql
deleted file mode 100755
index 3ab4ee3..0000000
--- a/products/stratos-controller/billing-script/metering_mysql.sql
+++ /dev/null
@@ -1,149 +0,0 @@
--- WSO2 METERING DATABASE SQL FOR MySQL
-
-SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
-
-SET AUTOCOMMIT=0;
-START TRANSACTION;
-
---
--- TABLES
---
-
-CREATE TABLE IF NOT EXISTS USAGE_HOURLY_ANALYTICS (
-        ID VARCHAR(200) NOT NULL,
-        HOUR_FACT TIMESTAMP,
-        SERVER_NAME VARCHAR(100),
-        TENANT_ID VARCHAR(50),
-        PAYLOAD_TYPE VARCHAR(50),
-        PAYLOAD_VALUE  BIGINT,
-        PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS USAGE_DAILY_ANALYTICS (
-        ID VARCHAR(200) NOT NULL,
-        DAY_FACT TIMESTAMP,
-        SERVER_NAME VARCHAR(100),
-        TENANT_ID VARCHAR(50),
-        PAYLOAD_TYPE VARCHAR(50),
-        PAYLOAD_VALUE  BIGINT,
-        PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS USAGE_MONTHLY_ANALYTICS (
-        ID VARCHAR(200) NOT NULL,
-        MONTH_FACT TIMESTAMP,
-        SERVER_NAME VARCHAR(100),
-        TENANT_ID VARCHAR(50),
-        PAYLOAD_TYPE VARCHAR(50),
-        PAYLOAD_VALUE  BIGINT,
-        PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS USAGE_LAST_HOURLY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-	
-CREATE TABLE IF NOT EXISTS USAGE_LAST_DAILY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS USAGE_LAST_MONTHLY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_HOURLY_ANALYTICS (
-	ID VARCHAR(200) NOT NULL,
-	HOUR_FACT TIMESTAMP,
-	SERVER_NAME VARCHAR(100),
-	TENANT_ID VARCHAR(50),
-	REQUEST_COUNT BIGINT,
-	RESPONSE_COUNT BIGINT,
-	FAULT_COUNT BIGINT,
-	PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_DAILY_ANALYTICS (
-	ID VARCHAR(200) NOT NULL,
-	DAY_FACT TIMESTAMP,
-	SERVER_NAME VARCHAR(100),
-	TENANT_ID VARCHAR(50),
-	REQUEST_COUNT BIGINT,
-	RESPONSE_COUNT BIGINT,
-	FAULT_COUNT BIGINT,
-	PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_MONTHLY_ANALYTICS (
-	ID VARCHAR(200) NOT NULL,
-	MONTH_FACT TIMESTAMP,
-	SERVER_NAME VARCHAR(100),
-	TENANT_ID VARCHAR(50),
-	REQUEST_COUNT BIGINT,
-	RESPONSE_COUNT BIGINT,
-	FAULT_COUNT BIGINT,
-	PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_LAST_HOURLY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-	
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_LAST_DAILY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS SERVICE_STATS_LAST_MONTHLY_TS (
-	ID VARCHAR(200) NOT NULL,
-	TIMESTMP TIMESTAMP,
-	PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS REGISTRY_USAGE_HOURLY_ANALYTICS ( 
-	ID VARCHAR(50),
-	TENANT_ID VARCHAR(50),	
-	HISTORY_USAGE BIGINT,
-	CURRENT_USAGE BIGINT,
-	PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS CARTRIDGE_STATS_HOURLY_ANALYTICS (
-        HOUR_FACT TIMESTAMP,
-        TENANT_ID VARCHAR(50),
-	CARTRIDGE_TYPE VARCHAR(20),
-	IMAGE_ID VARCHAR(100),
-	NODE_ID VARCHAR(100),
-	DURATION_HOURS INT(5),
-        PRIMARY KEY (`NODE_ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS CARTRIDGE_STATS_LAST_HOURLY_TS (
-        ID VARCHAR(200) NOT NULL,
-        TIMESTMP TIMESTAMP,
-        PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS CARTRIDGE_STATS_LAST_DAILY_TS (
-        ID VARCHAR(200) NOT NULL,
-        TIMESTMP TIMESTAMP,
-        PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
-
-CREATE TABLE IF NOT EXISTS CARTRIDGE_STATS_LAST_MONTHLY_TS (
-        ID VARCHAR(200) NOT NULL,
-        TIMESTMP TIMESTAMP,
-        PRIMARY KEY (`ID`)
-) ENGINE=INNODB;
- 
-
-COMMIT;
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c67e7c5b/products/stratos-controller/billing-script/migration.sql
----------------------------------------------------------------------
diff --git a/products/stratos-controller/billing-script/migration.sql b/products/stratos-controller/billing-script/migration.sql
deleted file mode 100755
index 379e859..0000000
--- a/products/stratos-controller/billing-script/migration.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-ALTER TABLE UM_TENANT ADD UM_CREATED_DATE TIMESTAMP NOT NULL DEFAULT '2010-06-01 00:00:01';  
-ALTER TABLE UM_TENANT ADD UNIQUE INDEX INDEX_UM_TENANT_UM_DOMAIN_NAME (UM_DOMAIN_NAME);
-
-ALTER TABLE REG_ASSOCIATION ADD INDEX REG_ASSOCIATION_INDEX_SOURCEPATH (REG_SOURCEPATH, REG_TENANT_ID);
-ALTER TABLE REG_ASSOCIATION ADD INDEX REG_ASSOCIATION_INDEX_TARGETPATH (REG_TARGETPATH, REG_TENANT_ID);
-ALTER TABLE REG_ASSOCIATION ADD INDEX REG_ASSOCIATION_INDEX_ASSOCIATION_TYPE (REG_ASSOCIATION_TYPE, REG_TENANT_ID); 
-

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c67e7c5b/products/stratos-controller/billing-script/s2_h2.sql
----------------------------------------------------------------------
diff --git a/products/stratos-controller/billing-script/s2_h2.sql b/products/stratos-controller/billing-script/s2_h2.sql
deleted file mode 100644
index 170c77b..0000000
--- a/products/stratos-controller/billing-script/s2_h2.sql
+++ /dev/null
@@ -1,96 +0,0 @@
---
--- Create schema s2_db
---
-
--- CREATE SCHEMA  IF NOT EXISTS s2_db; 
--- SET SCHEMA s2_db;
-
---
--- Definition of table s2_db.CARTRIDGE_INSTANCE
---
-
-DROP TABLE IF EXISTS CARTRIDGE_INSTANCE;
-CREATE TABLE  CARTRIDGE_INSTANCE (
-  ID int(11) NOT NULL AUTO_INCREMENT,
-  INSTANCE_IP varchar(255) NOT NULL,
-  TENANT_ID int(11) DEFAULT NULL,
-  TENANT_DOMAIN varchar(255) DEFAULT NULL,
-  CARTRIDGE_TYPE varchar(255) NOT NULL,
-  STATE varchar(255) NOT NULL,
-  CLUSTER_DOMAIN varchar(255) NOT NULL,
-  CLUSTER_SUBDOMAIN varchar(255) NOT NULL,
-  PRIMARY KEY (ID)
-);
-
---
--- Definition of table CARTRIDGE_SUBSCRIPTION
---
-
-DROP TABLE IF EXISTS CARTRIDGE_SUBSCRIPTION;
-CREATE TABLE  CARTRIDGE_SUBSCRIPTION (
-  SUBSCRIPTION_ID int(11) NOT NULL AUTO_INCREMENT,
-  TENANT_ID int(11) NOT NULL,
-  CARTRIDGE varchar(30) NOT NULL,
-  PROVIDER varchar(30) NOT NULL,
-  HOSTNAME varchar(255) NOT NULL,
-  POLICY varchar(50) NULL,
-  CLUSTER_DOMAIN varchar(255) NOT NULL,
-  CLUSTER_SUBDOMAIN varchar(255) NOT NULL,
-  MGT_DOMAIN varchar(255) NOT NULL,
-  MGT_SUBDOMAIN varchar(255) NOT NULL,
-  STATE varchar(30) NOT NULL,
-  ALIAS varchar(255) NOT NULL,
-  TENANT_DOMAIN varchar(255) NOT NULL,
-  BASE_DIR varchar(255) NOT NULL,
-  REPO_ID int(11) DEFAULT NULL,
-  DATA_CARTRIDGE_ID int(11) DEFAULT NULL,
-  MAPPED_DOMAIN varchar(255),
-  PRIMARY KEY (SUBSCRIPTION_ID)
-);
-
-
-
---
--- Definition of table DATA_CARTRIDGE
---
-
-DROP TABLE IF EXISTS DATA_CARTRIDGE;
-CREATE TABLE  DATA_CARTRIDGE (
-  DATA_CART_ID int(11) NOT NULL AUTO_INCREMENT,
-  TYPE varchar(30) NOT NULL,
-  USER_NAME varchar(255) NOT NULL,
-  PASSWORD varchar(255) NOT NULL,
-  STATE varchar(255) NOT NULL,
-  PRIMARY KEY (DATA_CART_ID) 
-);
-
-
---
--- Definition of table PORT_MAPPING
---
-
-DROP TABLE IF EXISTS PORT_MAPPING;
-CREATE TABLE  PORT_MAPPING (
-  PORT_MAPPING_ID int(11) NOT NULL AUTO_INCREMENT,
-  SUBSCRIPTION_ID int(11) NOT NULL,
-  TYPE varchar(30) NOT NULL,
-  PRIMARY_PORT varchar(30) NOT NULL,
-  PROXY_PORT varchar(30) NOT NULL,
-  STATE varchar(30) NOT NULL,
-  PRIMARY KEY (PORT_MAPPING_ID)
-);
-
-
---
--- Definition of table REPOSITORY
---
-
-DROP TABLE IF EXISTS REPOSITORY;
-CREATE TABLE  REPOSITORY (
-  REPO_ID int(11) NOT NULL AUTO_INCREMENT,
-  REPO_NAME varchar(255) NOT NULL,
-  STATE varchar(30) NOT NULL,
-  REPO_USER_NAME varchar(255) NOT NULL,
-  REPO_USER_PASSWORD varchar(255) NOT NULL,
-  PRIMARY KEY (REPO_ID)
-);

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c67e7c5b/products/stratos-controller/billing-script/stratos_mysql.sql
----------------------------------------------------------------------
diff --git a/products/stratos-controller/billing-script/stratos_mysql.sql b/products/stratos-controller/billing-script/stratos_mysql.sql
deleted file mode 100644
index 8aa3269..0000000
--- a/products/stratos-controller/billing-script/stratos_mysql.sql
+++ /dev/null
@@ -1,121 +0,0 @@
--- MySQL Administrator dump 1.4
---
--- ------------------------------------------------------
--- Server version	5.5.24-0ubuntu0.12.04.1
-
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-
-
---
--- Create schema stratos_foundation
---
-
-CREATE DATABASE IF NOT EXISTS stratos_foundation;
-USE stratos_foundation;
-
---
--- Definition of table `stratos_foundation`.`CARTRIDGE_INSTANCE`
---
-
-DROP TABLE IF EXISTS `stratos_foundation`.`CARTRIDGE_INSTANCE`;
-CREATE TABLE  `stratos_foundation`.`CARTRIDGE_INSTANCE` (
-  `ID` int(11) NOT NULL AUTO_INCREMENT,
-  `INSTANCE_IP` varchar(255) NOT NULL,
-  `TENANT_ID` int(11) DEFAULT NULL,
-  `TENANT_DOMAIN` varchar(255) DEFAULT NULL,
-  `CARTRIDGE_TYPE` varchar(255) NOT NULL,
-  `STATE` varchar(255) NOT NULL,
-  `CLUSTER_DOMAIN` varchar(255) NOT NULL,
-  `CLUSTER_SUBDOMAIN` varchar(255) NOT NULL,
-  PRIMARY KEY (`ID`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
-
---
--- Definition of table `stratos_foundation`.`CARTRIDGE_SUBSCRIPTION`
---
-
-DROP TABLE IF EXISTS `stratos_foundation`.`CARTRIDGE_SUBSCRIPTION`;
-CREATE TABLE  `stratos_foundation`.`CARTRIDGE_SUBSCRIPTION` (
-  `SUBSCRIPTION_ID` int(11) NOT NULL AUTO_INCREMENT,
-  `TENANT_ID` int(11) NOT NULL,
-  `CARTRIDGE` varchar(30) NOT NULL,
-  `PROVIDER` varchar(30) NOT NULL,
-  `HOSTNAME` varchar(255) NOT NULL,
-  `POLICY` varchar(50) NULL,
-  `CLUSTER_DOMAIN` varchar(255) NOT NULL,
-  `CLUSTER_SUBDOMAIN` varchar(255) NOT NULL,
-  `MGT_DOMAIN` varchar(255) NOT NULL,
-  `MGT_SUBDOMAIN` varchar(255) NOT NULL,
-  `STATE` varchar(30) NOT NULL,
-  `ALIAS` varchar(255) NOT NULL,
-  `TENANT_DOMAIN` varchar(255) NOT NULL,
-  `BASE_DIR` varchar(255) NOT NULL,
-  `REPO_ID` int(11) DEFAULT NULL,
-  `DATA_CARTRIDGE_ID` int(11) DEFAULT NULL,
-  `MAPPED_DOMAIN` varchar(255),
-  PRIMARY KEY (`SUBSCRIPTION_ID`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
-
-
-
---
--- Definition of table `stratos_foundation`.`DATA_CARTRIDGE`
---
-
-DROP TABLE IF EXISTS `stratos_foundation`.`DATA_CARTRIDGE`;
-CREATE TABLE  `stratos_foundation`.`DATA_CARTRIDGE` (
-  `DATA_CART_ID` int(11) NOT NULL AUTO_INCREMENT,
-  `TYPE` varchar(30) NOT NULL,
-  `USER_NAME` varchar(255) NOT NULL,
-  `PASSWORD` varchar(255) NOT NULL,
-  `STATE` varchar(255) NOT NULL,
-  PRIMARY KEY (`DATA_CART_ID`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
-
-
---
--- Definition of table `stratos_foundation`.`PORT_MAPPING`
---
-
-DROP TABLE IF EXISTS `stratos_foundation`.`PORT_MAPPING`;
-CREATE TABLE  `stratos_foundation`.`PORT_MAPPING` (
-  `PORT_MAPPING_ID` int(11) NOT NULL AUTO_INCREMENT,
-  `SUBSCRIPTION_ID` int(11) NOT NULL,
-  `TYPE` varchar(30) NOT NULL,
-  `PRIMARY_PORT` varchar(30) NOT NULL,
-  `PROXY_PORT` varchar(30) NOT NULL,
-  `STATE` varchar(30) NOT NULL,
-  PRIMARY KEY (`PORT_MAPPING_ID`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
-
-
---
--- Definition of table `stratos_foundation`.`REPOSITORY`
---
-
-DROP TABLE IF EXISTS `stratos_foundation`.`REPOSITORY`;
-CREATE TABLE  `stratos_foundation`.`REPOSITORY` (
-  `REPO_ID` int(11) NOT NULL AUTO_INCREMENT,
-  `REPO_NAME` varchar(255) NOT NULL,
-  `STATE` varchar(30) NOT NULL,
-  `REPO_USER_NAME` varchar(255) NOT NULL,
-  `REPO_USER_PASSWORD` varchar(255) NOT NULL,
-  PRIMARY KEY (`REPO_ID`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
-
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c67e7c5b/products/stratos-controller/billing-script/wso2_rss.sql
----------------------------------------------------------------------
diff --git a/products/stratos-controller/billing-script/wso2_rss.sql b/products/stratos-controller/billing-script/wso2_rss.sql
deleted file mode 100755
index 411b1ce..0000000
--- a/products/stratos-controller/billing-script/wso2_rss.sql
+++ /dev/null
@@ -1,81 +0,0 @@
-
-CREATE TABLE RSS_INSTANCE (
-  rss_instance_id INTEGER AUTO_INCREMENT,
-  name VARCHAR(128) NOT NULL,
-  server_url VARCHAR(1024) NOT NULL,
-  dbms_type VARCHAR(128) NOT NULL,
-  instance_type VARCHAR(128) NOT NULL,
-  server_category VARCHAR(128) NOT NULL,
-  admin_username VARCHAR(128),
-  admin_password VARCHAR(128),
-  tenant_id INTEGER NOT NULL,
-  UNIQUE (name, tenant_id),
-  PRIMARY KEY (rss_instance_id)
-) ENGINE="InnoDB";
-
-CREATE TABLE DATABASE_INSTANCE (
-  database_instance_id INTEGER AUTO_INCREMENT,
-  name VARCHAR(128) NOT NULL,
-  rss_instance_id INTEGER,
-  tenant_id INTEGER,
-  UNIQUE (name, rss_instance_id),
-  PRIMARY KEY (database_instance_id),
-  FOREIGN KEY (rss_instance_id) REFERENCES RSS_INSTANCE (rss_instance_id)
-) ENGINE="InnoDB";
-
-CREATE TABLE DATABASE_USER (
-  user_id INTEGER AUTO_INCREMENT,
-  db_username VARCHAR(128) NOT NULL,
-  rss_instance_id INTEGER,
-  user_tenant_id INTEGER,
-  UNIQUE (db_username, rss_instance_id, user_tenant_id),
-  PRIMARY KEY (user_id),
-  FOREIGN KEY (rss_instance_id) REFERENCES RSS_INSTANCE (rss_instance_id)
-) ENGINE="InnoDB";
-
-CREATE TABLE DATABASE_INSTANCE_PROPERTY (
-  db_property_id INTEGER AUTO_INCREMENT,
-  prop_name VARCHAR(128) NOT NULL,
-  prop_value TEXT,
-  database_instance_id INTEGER,
-  UNIQUE (prop_name, database_instance_id),
-  PRIMARY KEY (db_property_id),
-  FOREIGN KEY (database_instance_id) REFERENCES DATABASE_INSTANCE (database_instance_id)
-) ENGINE="InnoDB";
-
-CREATE TABLE USER_DATABASE_ENTRY (
-  user_id INTEGER,
-  database_instance_id INTEGER,
-  PRIMARY KEY (user_id, database_instance_id),
-  FOREIGN KEY (user_id) REFERENCES DATABASE_USER (user_id),
-  FOREIGN KEY (database_instance_id) REFERENCES DATABASE_INSTANCE (database_instance_id)
-) ENGINE="InnoDB";
-
-CREATE TABLE USER_DATABASE_PERMISSION (
-  user_id INTEGER,
-  database_instance_id INTEGER,
-  perm_name VARCHAR(128) NOT NULL,
-  perm_value VARCHAR(128),
-  PRIMARY KEY (user_id, database_instance_id, perm_name),
-  FOREIGN KEY (user_id) REFERENCES DATABASE_USER (user_id),
-  FOREIGN KEY (database_instance_id) REFERENCES DATABASE_INSTANCE (database_instance_id)
-) ENGINE="InnoDB";
-
-CREATE TABLE WSO2_RSS_DATABASE_INSTANCE_COUNT (
-  instance_count INTEGER NOT NULL DEFAULT 0
-) ENGINE="InnoDB";
-
-CREATE TABLE USER_PRIVILEGE_GROUP (
-  priv_group_id INTEGER AUTO_INCREMENT,
-  priv_group_name VARCHAR(128),
-  tenant_id INTEGER,
-  PRIMARY KEY (priv_group_id, priv_group_name, tenant_id)
-) ENGINE="InnoDB";
-
-CREATE TABLE USER_PRIVILEGE_GROUP_ENTRY (
-  priv_group_id INTEGER,
-  perm_name VARCHAR(128),
-  perm_value CHAR(1),
-  PRIMARY KEY (priv_group_id, perm_name),
-  FOREIGN KEY (priv_group_id) REFERENCES USER_PRIVILEGE_GROUP (priv_group_id)
-) ENGINE="InnoDB";

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c67e7c5b/products/stratos-controller/dbscripts/billing-h2.sql
----------------------------------------------------------------------
diff --git a/products/stratos-controller/dbscripts/billing-h2.sql b/products/stratos-controller/dbscripts/billing-h2.sql
new file mode 100755
index 0000000..e70be14
--- /dev/null
+++ b/products/stratos-controller/dbscripts/billing-h2.sql
@@ -0,0 +1,109 @@
+CREATE TABLE IF NOT EXISTS BC_CUSTOMER (
+             BC_ID INTEGER AUTO_INCREMENT,
+             BC_NAME VARCHAR (64),
+             BC_STARTED_DATE TIMESTAMP,
+             BC_EMAIL VARCHAR (64),
+             BC_ADDRESS VARCHAR (256),
+             CONSTRAINT PK_BC_CUSTOMER PRIMARY KEY (BC_ID)
+);
+
+CREATE HASH INDEX BC_CUSTOMER_IND_BY_BC_NAME ON BC_CUSTOMER(BC_NAME);
+CREATE HASH INDEX BC_CUSTOMER_IND_BY_BC_EMAIL ON BC_CUSTOMER(BC_EMAIL);
+
+CREATE TABLE IF NOT EXISTS BC_ITEM (
+             BC_ID INTEGER AUTO_INCREMENT,
+             BC_NAME VARCHAR (64),
+             BC_COST VARCHAR (64),
+             BC_DESCRIPTION VARCHAR(128),
+             BC_PARENT_ITEM_ID INTEGER,
+             CONSTRAINT PK_BC_ITEM PRIMARY KEY (BC_ID)
+);
+INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ('Demo',NULL,NULL,NULL);
+INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ('SMB',NULL,NULL,NULL);
+INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ('Professional',NULL,NULL,NULL);
+INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ('Enterprise',NULL,NULL,NULL);
+
+ALTER TABLE BC_ITEM ADD CONSTRAINT IF NOT EXISTS BC_ITEM_FK_BY_PARENT_ITEM_ID FOREIGN KEY (BC_PARENT_ITEM_ID) REFERENCES BC_ITEM (BC_ID);
+
+
+CREATE TABLE IF NOT EXISTS BC_SUBSCRIPTION (
+             BC_ID INTEGER AUTO_INCREMENT,
+             BC_FILTER VARCHAR (32),
+             BC_IS_ACTIVE INTEGER,
+             BC_ACTIVE_SINCE TIMESTAMP,
+             BC_ACTIVE_UNTIL TIMESTAMP,
+             BC_ITEM_ID INTEGER,
+             BC_TENANT_ID INTEGER,
+             CONSTRAINT PK_BC_SUBSCRIPTION PRIMARY KEY (BC_ID)
+);
+
+ALTER TABLE BC_SUBSCRIPTION ADD CONSTRAINT IF NOT EXISTS BC_SUBSCRIPTION_FK_BY_ITEM_ID FOREIGN KEY (BC_ITEM_ID) REFERENCES BC_ITEM (BC_ID);
+
+CREATE TABLE IF NOT EXISTS BC_INVOICE (
+             BC_ID INTEGER AUTO_INCREMENT,
+             BC_TENANT_ID INTEGER,
+             BC_DATE TIMESTAMP,
+             BC_START_DATE TIMESTAMP,
+             BC_END_DATE TIMESTAMP,
+             BC_BOUGHT_FORWARD VARCHAR (64),
+             BC_CARRIED_FORWARD VARCHAR (64),
+             BC_TOTAL_PAYMENTS VARCHAR (64),
+             BC_TOTAL_COST VARCHAR (64),
+             CONSTRAINT PK_BC_INVOICE PRIMARY KEY (BC_ID)
+);
+
+
+CREATE TABLE IF NOT EXISTS BC_PAYMENT (
+             BC_ID INTEGER AUTO_INCREMENT,
+             BC_DATE TIMESTAMP,
+             BC_AMOUNT VARCHAR (64),
+             BC_DESCRIPTION VARCHAR (128),
+             BC_INVOICE_ID INTEGER,
+	     	 BC_TENANT_ID INTEGER,	
+             CONSTRAINT PK_BC_PAYMENT PRIMARY KEY (BC_ID)
+);
+
+ALTER TABLE BC_PAYMENT ADD CONSTRAINT IF NOT EXISTS BC_PAYMENT_FK_BY_INVOICE_ID FOREIGN KEY (BC_INVOICE_ID) REFERENCES BC_INVOICE (BC_ID);
+
+-- this is n-n relationship
+CREATE TABLE IF NOT EXISTS BC_PAYMENT_SUBSCRIPTION (
+             BC_PAYMENT_ID INTEGER,
+             BC_SUBSCRIPTION_ID INTEGER,
+             CONSTRAINT PK_BC_SUBSCRIPTION_ORDER PRIMARY KEY (BC_PAYMENT_ID, BC_SUBSCRIPTION_ID)
+);
+
+ALTER TABLE BC_PAYMENT_SUBSCRIPTION ADD CONSTRAINT IF NOT EXISTS BC_PAYMENT_SUBSCRIPTION_FK_BY_PAYMENT_ID FOREIGN KEY (BC_PAYMENT_ID) REFERENCES BC_PAYMENT (BC_ID);
+ALTER TABLE BC_PAYMENT_SUBSCRIPTION ADD CONSTRAINT IF NOT EXISTS BC_PAYMENT_SUBSCRIPTION_FK_BY_SUBSCRIPTION_ID FOREIGN KEY (BC_SUBSCRIPTION_ID) REFERENCES BC_SUBSCRIPTION (BC_ID);
+
+CREATE TABLE IF NOT EXISTS BC_INVOICE_SUBSCRIPTION (
+             BC_ID INTEGER  AUTO_INCREMENT,
+             BC_INVOICE_ID INTEGER,
+             BC_SUBSCRIPTION_ID INTEGER,
+             CONSTRAINT PK_BC_INVOICE_ITEM PRIMARY KEY (BC_ID)
+);
+
+ALTER TABLE BC_INVOICE_SUBSCRIPTION ADD CONSTRAINT IF NOT EXISTS BC_INVOICE_SUBSCRIPTION_FK_BY_INVOICE_ID FOREIGN KEY (BC_INVOICE_ID) REFERENCES BC_INVOICE (BC_ID);
+ALTER TABLE BC_INVOICE_SUBSCRIPTION ADD CONSTRAINT IF NOT EXISTS BC_INVOICE_SUBSCRIPTION_FK_BY_SUBSCRIPTION_ID FOREIGN KEY (BC_SUBSCRIPTION_ID) REFERENCES BC_SUBSCRIPTION (BC_ID);
+
+
+CREATE TABLE IF NOT EXISTS BC_INVOICE_SUBSCRIPTION_ITEM (
+             BC_INVOICE_SUBSCRIPTION_ID INTEGER,
+             BC_ITEM_ID INTEGER,
+             BC_COST VARCHAR (64),
+	     BC_DESCRIPTION VARCHAR (64),	
+             CONSTRAINT PK_BC_INVOICE_SUBSCRIPTION_ITEM PRIMARY KEY (BC_INVOICE_SUBSCRIPTION_ID, BC_ITEM_ID)
+);
+
+ALTER TABLE BC_INVOICE_SUBSCRIPTION_ITEM ADD CONSTRAINT IF NOT EXISTS BC_INVOICE_SUBSCRIPTION_ITEM_FK_BY_INVOICE_SUBSCRIPTION_ID FOREIGN KEY (BC_INVOICE_SUBSCRIPTION_ID) REFERENCES BC_INVOICE_SUBSCRIPTION (BC_ID);
+ALTER TABLE BC_INVOICE_SUBSCRIPTION_ITEM ADD CONSTRAINT IF NOT EXISTS BC_INVOICE_SUBSCRIPTION_ITEM_FK_BY_ITEM_ID FOREIGN KEY (BC_ITEM_ID) REFERENCES BC_ITEM(BC_ID);
+
+CREATE TABLE IF NOT EXISTS BC_DISCOUNT (
+	BC_ID INTEGER AUTO_INCREMENT,
+	BC_TENANT_ID INTEGER,
+	BC_PERCENTAGE FLOAT,
+	BC_AMOUNT FLOAT,
+	BC_START_DATE TIMESTAMP,
+	BC_END_DATE TIMESTAMP,
+	BC_PERCENTAGE_TYPE INTEGER,
+	CONSTRAINT PK_BC_DISCOUNT PRIMARY KEY (BC_ID)
+);

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c67e7c5b/products/stratos-controller/dbscripts/billing-mysql.sql
----------------------------------------------------------------------
diff --git a/products/stratos-controller/dbscripts/billing-mysql.sql b/products/stratos-controller/dbscripts/billing-mysql.sql
new file mode 100755
index 0000000..55cab9a
--- /dev/null
+++ b/products/stratos-controller/dbscripts/billing-mysql.sql
@@ -0,0 +1,120 @@
+CREATE TABLE IF NOT EXISTS BC_CUSTOMER (
+             BC_ID INTEGER AUTO_INCREMENT,
+             BC_NAME VARCHAR (64),
+             BC_STARTED_DATE TIMESTAMP,
+             BC_EMAIL VARCHAR (64),
+             BC_ADDRESS VARCHAR (256),
+             CONSTRAINT PK_BC_CUSTOMER PRIMARY KEY (BC_ID)
+)ENGINE INNODB;
+
+CREATE INDEX BC_CUSTOMER_IND_BY_BC_NAME USING HASH ON BC_CUSTOMER(BC_NAME);
+CREATE INDEX BC_CUSTOMER_IND_BY_BC_EMAIL USING HASH ON BC_CUSTOMER(BC_EMAIL);
+
+CREATE TABLE IF NOT EXISTS BC_ITEM (
+             BC_ID INTEGER AUTO_INCREMENT,
+             BC_NAME VARCHAR (64),
+             BC_COST VARCHAR (64),
+             BC_DESCRIPTION VARCHAR(128),
+             BC_PARENT_ITEM_ID INTEGER,
+             CONSTRAINT PK_BC_ITEM PRIMARY KEY (BC_ID)
+)ENGINE INNODB;
+INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ("Demo",NULL,NULL,NULL);
+INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ("SMB",NULL,NULL,NULL);
+INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ("Professional",NULL,NULL,NULL);
+INSERT INTO BC_ITEM (BC_NAME,BC_COST,BC_DESCRIPTION,BC_PARENT_ITEM_ID) values ("Enterprise",NULL,NULL,NULL);
+
+ALTER TABLE BC_ITEM ADD CONSTRAINT BC_ITEM_FK_BY_PARENT_ITEM_ID FOREIGN KEY (BC_PARENT_ITEM_ID) REFERENCES BC_ITEM (BC_ID);
+
+
+CREATE TABLE IF NOT EXISTS BC_SUBSCRIPTION (
+             BC_ID INTEGER AUTO_INCREMENT,
+             BC_FILTER VARCHAR (32),
+             BC_IS_ACTIVE INTEGER,
+             BC_ACTIVE_SINCE TIMESTAMP,
+             BC_ACTIVE_UNTIL TIMESTAMP,
+             BC_ITEM_ID INTEGER,
+             BC_TENANT_ID INTEGER,
+             CONSTRAINT PK_BC_SUBSCRIPTION PRIMARY KEY (BC_ID)
+)ENGINE INNODB;
+
+ALTER TABLE BC_SUBSCRIPTION ADD CONSTRAINT BC_SUBSCRIPTION_FK_BY_ITEM_ID FOREIGN KEY (BC_ITEM_ID) REFERENCES BC_ITEM (BC_ID);
+
+CREATE TABLE IF NOT EXISTS BC_INVOICE (
+             BC_ID INTEGER AUTO_INCREMENT,
+             BC_TENANT_ID INTEGER,
+             BC_DATE TIMESTAMP,
+             BC_START_DATE TIMESTAMP,
+             BC_END_DATE TIMESTAMP,
+             BC_BOUGHT_FORWARD VARCHAR (64),
+             BC_CARRIED_FORWARD VARCHAR (64),
+             BC_TOTAL_PAYMENTS VARCHAR (64),
+             BC_TOTAL_COST VARCHAR (64),
+             CONSTRAINT PK_BC_INVOICE PRIMARY KEY (BC_ID)
+)ENGINE INNODB;
+
+
+CREATE TABLE IF NOT EXISTS BC_PAYMENT (
+             BC_ID INTEGER AUTO_INCREMENT,
+             BC_DATE TIMESTAMP,
+             BC_AMOUNT VARCHAR (64),
+             BC_DESCRIPTION VARCHAR (128),
+             BC_INVOICE_ID INTEGER,
+	     BC_TENANT_ID INTEGER,	
+             CONSTRAINT PK_BC_SUBSCRIPTION_ORDER PRIMARY KEY (BC_ID)
+)ENGINE INNODB;
+
+ALTER TABLE BC_PAYMENT ADD CONSTRAINT BC_PAYMENT_FK_BY_INVOICE_ID FOREIGN KEY (BC_INVOICE_ID) REFERENCES BC_INVOICE (BC_ID);
+
+CREATE TABLE IF NOT EXISTS BC_REGISTRATION_PAYMENT (
+             BC_ID INTEGER AUTO_INCREMENT,
+             BC_DATE TIMESTAMP,
+             BC_AMOUNT VARCHAR (64),
+             BC_DESCRIPTION VARCHAR (128),
+			 BC_USAGE_PLAN VARCHAR (64),
+	     	 BC_TENANT_ID INTEGER,	
+             CONSTRAINT PK_BC_REGISTRATION_PAYMENT PRIMARY KEY (BC_ID)
+)ENGINE INNODB;
+
+-- this is n-n relationship
+CREATE TABLE IF NOT EXISTS BC_PAYMENT_SUBSCRIPTION (
+             BC_PAYMENT_ID INTEGER,
+             BC_SUBSCRIPTION_ID INTEGER,
+             CONSTRAINT PK_BC_SUBSCRIPTION_ORDER PRIMARY KEY (BC_PAYMENT_ID, BC_SUBSCRIPTION_ID)
+)ENGINE INNODB;
+
+ALTER TABLE BC_PAYMENT_SUBSCRIPTION ADD CONSTRAINT BC_PAYMENT_SUBSCRIPTION_FK_BY_PAYMENT_ID FOREIGN KEY (BC_PAYMENT_ID) REFERENCES BC_PAYMENT (BC_ID);
+ALTER TABLE BC_PAYMENT_SUBSCRIPTION ADD CONSTRAINT BC_PAYMENT_SUBSCRIPTION_FK_BY_SUBSCRIPTION_ID FOREIGN KEY (BC_SUBSCRIPTION_ID) REFERENCES BC_SUBSCRIPTION (BC_ID);
+
+CREATE TABLE IF NOT EXISTS BC_INVOICE_SUBSCRIPTION (
+             BC_ID INTEGER  AUTO_INCREMENT,
+             BC_INVOICE_ID INTEGER,
+             BC_SUBSCRIPTION_ID INTEGER,
+             CONSTRAINT PK_BC_INVOICE_ITEM PRIMARY KEY (BC_ID)
+)ENGINE INNODB;
+
+ALTER TABLE BC_INVOICE_SUBSCRIPTION ADD CONSTRAINT BC_INVOICE_SUBSCRIPTION_FK_BY_INVOICE_ID FOREIGN KEY (BC_INVOICE_ID) REFERENCES BC_INVOICE (BC_ID);
+ALTER TABLE BC_INVOICE_SUBSCRIPTION ADD CONSTRAINT BC_INVOICE_SUBSCRIPTION_FK_BY_SUBSCRIPTION_ID FOREIGN KEY (BC_SUBSCRIPTION_ID) REFERENCES BC_SUBSCRIPTION (BC_ID);
+
+
+CREATE TABLE IF NOT EXISTS BC_INVOICE_SUBSCRIPTION_ITEM (
+             BC_INVOICE_SUBSCRIPTION_ID INTEGER,
+             BC_ITEM_ID INTEGER,
+             BC_COST VARCHAR (64),
+	     BC_DESCRIPTION varchar (64),	
+             CONSTRAINT PK_BC_INVOICE_SUBSCRIPTION_ITEM PRIMARY KEY (BC_INVOICE_SUBSCRIPTION_ID, BC_ITEM_ID)
+)ENGINE INNODB;
+
+ALTER TABLE BC_INVOICE_SUBSCRIPTION_ITEM ADD CONSTRAINT BC_INVOICE_SUBSCRIPTION_ITEM_FK_BY_INVOICE_SUBSCRIPTION_ID FOREIGN KEY (BC_INVOICE_SUBSCRIPTION_ID) REFERENCES BC_INVOICE_SUBSCRIPTION (BC_ID);
+ALTER TABLE BC_INVOICE_SUBSCRIPTION_ITEM ADD CONSTRAINT BC_INVOICE_SUBSCRIPTION_ITEM_FK_BY_ITEM_ID FOREIGN KEY (BC_ITEM_ID) REFERENCES BC_ITEM(BC_ID);
+
+CREATE TABLE IF NOT EXISTS BC_DISCOUNT (
+        BC_ID INTEGER AUTO_INCREMENT,
+        BC_TENANT_ID INTEGER,
+        BC_PERCENTAGE FLOAT,
+        BC_AMOUNT FLOAT,
+        BC_START_DATE TIMESTAMP,
+        BC_END_DATE TIMESTAMP,
+        BC_PERCENTAGE_TYPE INTEGER,
+        CONSTRAINT PK_BC_DISCOUNT PRIMARY KEY (BC_ID)
+)ENGINE INNODB;
+

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c67e7c5b/products/stratos-controller/dbscripts/metering_h2.sql
----------------------------------------------------------------------
diff --git a/products/stratos-controller/dbscripts/metering_h2.sql b/products/stratos-controller/dbscripts/metering_h2.sql
new file mode 100755
index 0000000..0491b8e
--- /dev/null
+++ b/products/stratos-controller/dbscripts/metering_h2.sql
@@ -0,0 +1,114 @@
+--
+-- TABLES
+--
+
+CREATE TABLE IF NOT EXISTS USAGE_HOURLY_ANALYTICS (
+        ID VARCHAR(200) NOT NULL,
+        HOUR_FACT TIMESTAMP,
+        SERVER_NAME VARCHAR(100),
+        TENANT_ID VARCHAR(50),
+        PAYLOAD_TYPE VARCHAR(50),
+        PAYLOAD_VALUE  BIGINT,
+        PRIMARY KEY (ID)
+);
+
+CREATE TABLE IF NOT EXISTS USAGE_DAILY_ANALYTICS (
+        ID VARCHAR(200) NOT NULL,
+        DAY_FACT TIMESTAMP,
+        SERVER_NAME VARCHAR(100),
+        TENANT_ID VARCHAR(50),
+        PAYLOAD_TYPE VARCHAR(50),
+        PAYLOAD_VALUE  BIGINT,
+        PRIMARY KEY (ID)
+);
+
+CREATE TABLE IF NOT EXISTS USAGE_MONTHLY_ANALYTICS (
+        ID VARCHAR(200) NOT NULL,
+        MONTH_FACT TIMESTAMP,
+        SERVER_NAME VARCHAR(100),
+        TENANT_ID VARCHAR(50),
+        PAYLOAD_TYPE VARCHAR(50),
+        PAYLOAD_VALUE  BIGINT,
+        PRIMARY KEY (ID)
+);
+
+CREATE TABLE IF NOT EXISTS USAGE_LAST_HOURLY_TS (
+	ID VARCHAR(200) NOT NULL,
+	TIMESTMP TIMESTAMP,
+	PRIMARY KEY (ID)
+);
+	
+CREATE TABLE IF NOT EXISTS USAGE_LAST_DAILY_TS (
+	ID VARCHAR(200) NOT NULL,
+	TIMESTMP TIMESTAMP,
+	PRIMARY KEY (ID)
+);
+
+CREATE TABLE IF NOT EXISTS USAGE_LAST_MONTHLY_TS (
+	ID VARCHAR(200) NOT NULL,
+	TIMESTMP TIMESTAMP,
+	PRIMARY KEY (ID)
+);
+
+CREATE TABLE IF NOT EXISTS SERVICE_STATS_HOURLY_ANALYTICS (
+	ID VARCHAR(200) NOT NULL,
+	HOUR_FACT TIMESTAMP,
+	SERVER_NAME VARCHAR(100),
+	TENANT_ID VARCHAR(50),
+	REQUEST_COUNT BIGINT,
+	RESPONSE_COUNT BIGINT,
+	FAULT_COUNT BIGINT,
+	PRIMARY KEY (ID)
+);
+
+CREATE TABLE IF NOT EXISTS SERVICE_STATS_DAILY_ANALYTICS (
+	ID VARCHAR(200) NOT NULL,
+	DAY_FACT TIMESTAMP,
+	SERVER_NAME VARCHAR(100),
+	TENANT_ID VARCHAR(50),
+	REQUEST_COUNT BIGINT,
+	RESPONSE_COUNT BIGINT,
+	FAULT_COUNT BIGINT,
+	PRIMARY KEY (ID)
+);
+
+CREATE TABLE IF NOT EXISTS SERVICE_STATS_MONTHLY_ANALYTICS (
+	ID VARCHAR(200) NOT NULL,
+	MONTH_FACT TIMESTAMP,
+	SERVER_NAME VARCHAR(100),
+	TENANT_ID VARCHAR(50),
+	REQUEST_COUNT BIGINT,
+	RESPONSE_COUNT BIGINT,
+	FAULT_COUNT BIGINT,
+	PRIMARY KEY (ID)
+);
+
+CREATE TABLE IF NOT EXISTS SERVICE_STATS_LAST_HOURLY_TS (
+	ID VARCHAR(200) NOT NULL,
+	TIMESTMP TIMESTAMP,
+	PRIMARY KEY (ID)
+);
+	
+CREATE TABLE IF NOT EXISTS SERVICE_STATS_LAST_DAILY_TS (
+	ID VARCHAR(200) NOT NULL,
+	TIMESTMP TIMESTAMP,
+	PRIMARY KEY (ID)
+);
+
+CREATE TABLE IF NOT EXISTS SERVICE_STATS_LAST_MONTHLY_TS (
+	ID VARCHAR(200) NOT NULL,
+	TIMESTMP TIMESTAMP,
+	PRIMARY KEY (ID)
+);
+
+CREATE TABLE IF NOT EXISTS REGISTRY_USAGE_HOURLY_ANALYTICS ( 
+	ID VARCHAR(50),
+	TENANT_ID VARCHAR(50),	
+	HISTORY_USAGE BIGINT,
+	CURRENT_USAGE BIGINT,
+	PRIMARY KEY (ID)
+); 
+
+
+COMMIT;
+

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c67e7c5b/products/stratos-controller/dbscripts/metering_mysql.sql
----------------------------------------------------------------------
diff --git a/products/stratos-controller/dbscripts/metering_mysql.sql b/products/stratos-controller/dbscripts/metering_mysql.sql
new file mode 100755
index 0000000..3ab4ee3
--- /dev/null
+++ b/products/stratos-controller/dbscripts/metering_mysql.sql
@@ -0,0 +1,149 @@
+-- WSO2 METERING DATABASE SQL FOR MySQL
+
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
+SET AUTOCOMMIT=0;
+START TRANSACTION;
+
+--
+-- TABLES
+--
+
+CREATE TABLE IF NOT EXISTS USAGE_HOURLY_ANALYTICS (
+        ID VARCHAR(200) NOT NULL,
+        HOUR_FACT TIMESTAMP,
+        SERVER_NAME VARCHAR(100),
+        TENANT_ID VARCHAR(50),
+        PAYLOAD_TYPE VARCHAR(50),
+        PAYLOAD_VALUE  BIGINT,
+        PRIMARY KEY (`ID`)
+) ENGINE=INNODB;
+
+CREATE TABLE IF NOT EXISTS USAGE_DAILY_ANALYTICS (
+        ID VARCHAR(200) NOT NULL,
+        DAY_FACT TIMESTAMP,
+        SERVER_NAME VARCHAR(100),
+        TENANT_ID VARCHAR(50),
+        PAYLOAD_TYPE VARCHAR(50),
+        PAYLOAD_VALUE  BIGINT,
+        PRIMARY KEY (`ID`)
+) ENGINE=INNODB;
+
+CREATE TABLE IF NOT EXISTS USAGE_MONTHLY_ANALYTICS (
+        ID VARCHAR(200) NOT NULL,
+        MONTH_FACT TIMESTAMP,
+        SERVER_NAME VARCHAR(100),
+        TENANT_ID VARCHAR(50),
+        PAYLOAD_TYPE VARCHAR(50),
+        PAYLOAD_VALUE  BIGINT,
+        PRIMARY KEY (`ID`)
+) ENGINE=INNODB;
+
+CREATE TABLE IF NOT EXISTS USAGE_LAST_HOURLY_TS (
+	ID VARCHAR(200) NOT NULL,
+	TIMESTMP TIMESTAMP,
+	PRIMARY KEY (`ID`)
+) ENGINE=INNODB;
+	
+CREATE TABLE IF NOT EXISTS USAGE_LAST_DAILY_TS (
+	ID VARCHAR(200) NOT NULL,
+	TIMESTMP TIMESTAMP,
+	PRIMARY KEY (`ID`)
+) ENGINE=INNODB;
+
+CREATE TABLE IF NOT EXISTS USAGE_LAST_MONTHLY_TS (
+	ID VARCHAR(200) NOT NULL,
+	TIMESTMP TIMESTAMP,
+	PRIMARY KEY (`ID`)
+) ENGINE=INNODB;
+
+CREATE TABLE IF NOT EXISTS SERVICE_STATS_HOURLY_ANALYTICS (
+	ID VARCHAR(200) NOT NULL,
+	HOUR_FACT TIMESTAMP,
+	SERVER_NAME VARCHAR(100),
+	TENANT_ID VARCHAR(50),
+	REQUEST_COUNT BIGINT,
+	RESPONSE_COUNT BIGINT,
+	FAULT_COUNT BIGINT,
+	PRIMARY KEY (`ID`)
+) ENGINE=INNODB;
+
+CREATE TABLE IF NOT EXISTS SERVICE_STATS_DAILY_ANALYTICS (
+	ID VARCHAR(200) NOT NULL,
+	DAY_FACT TIMESTAMP,
+	SERVER_NAME VARCHAR(100),
+	TENANT_ID VARCHAR(50),
+	REQUEST_COUNT BIGINT,
+	RESPONSE_COUNT BIGINT,
+	FAULT_COUNT BIGINT,
+	PRIMARY KEY (`ID`)
+) ENGINE=INNODB;
+
+CREATE TABLE IF NOT EXISTS SERVICE_STATS_MONTHLY_ANALYTICS (
+	ID VARCHAR(200) NOT NULL,
+	MONTH_FACT TIMESTAMP,
+	SERVER_NAME VARCHAR(100),
+	TENANT_ID VARCHAR(50),
+	REQUEST_COUNT BIGINT,
+	RESPONSE_COUNT BIGINT,
+	FAULT_COUNT BIGINT,
+	PRIMARY KEY (`ID`)
+) ENGINE=INNODB;
+
+CREATE TABLE IF NOT EXISTS SERVICE_STATS_LAST_HOURLY_TS (
+	ID VARCHAR(200) NOT NULL,
+	TIMESTMP TIMESTAMP,
+	PRIMARY KEY (`ID`)
+) ENGINE=INNODB;
+	
+CREATE TABLE IF NOT EXISTS SERVICE_STATS_LAST_DAILY_TS (
+	ID VARCHAR(200) NOT NULL,
+	TIMESTMP TIMESTAMP,
+	PRIMARY KEY (`ID`)
+) ENGINE=INNODB;
+
+CREATE TABLE IF NOT EXISTS SERVICE_STATS_LAST_MONTHLY_TS (
+	ID VARCHAR(200) NOT NULL,
+	TIMESTMP TIMESTAMP,
+	PRIMARY KEY (`ID`)
+) ENGINE=INNODB;
+
+CREATE TABLE IF NOT EXISTS REGISTRY_USAGE_HOURLY_ANALYTICS ( 
+	ID VARCHAR(50),
+	TENANT_ID VARCHAR(50),	
+	HISTORY_USAGE BIGINT,
+	CURRENT_USAGE BIGINT,
+	PRIMARY KEY (`ID`)
+) ENGINE=INNODB;
+
+CREATE TABLE IF NOT EXISTS CARTRIDGE_STATS_HOURLY_ANALYTICS (
+        HOUR_FACT TIMESTAMP,
+        TENANT_ID VARCHAR(50),
+	CARTRIDGE_TYPE VARCHAR(20),
+	IMAGE_ID VARCHAR(100),
+	NODE_ID VARCHAR(100),
+	DURATION_HOURS INT(5),
+        PRIMARY KEY (`NODE_ID`)
+) ENGINE=INNODB;
+
+CREATE TABLE IF NOT EXISTS CARTRIDGE_STATS_LAST_HOURLY_TS (
+        ID VARCHAR(200) NOT NULL,
+        TIMESTMP TIMESTAMP,
+        PRIMARY KEY (`ID`)
+) ENGINE=INNODB;
+
+CREATE TABLE IF NOT EXISTS CARTRIDGE_STATS_LAST_DAILY_TS (
+        ID VARCHAR(200) NOT NULL,
+        TIMESTMP TIMESTAMP,
+        PRIMARY KEY (`ID`)
+) ENGINE=INNODB;
+
+CREATE TABLE IF NOT EXISTS CARTRIDGE_STATS_LAST_MONTHLY_TS (
+        ID VARCHAR(200) NOT NULL,
+        TIMESTMP TIMESTAMP,
+        PRIMARY KEY (`ID`)
+) ENGINE=INNODB;
+ 
+
+COMMIT;
+

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c67e7c5b/products/stratos-controller/dbscripts/migration.sql
----------------------------------------------------------------------
diff --git a/products/stratos-controller/dbscripts/migration.sql b/products/stratos-controller/dbscripts/migration.sql
new file mode 100755
index 0000000..379e859
--- /dev/null
+++ b/products/stratos-controller/dbscripts/migration.sql
@@ -0,0 +1,7 @@
+ALTER TABLE UM_TENANT ADD UM_CREATED_DATE TIMESTAMP NOT NULL DEFAULT '2010-06-01 00:00:01';  
+ALTER TABLE UM_TENANT ADD UNIQUE INDEX INDEX_UM_TENANT_UM_DOMAIN_NAME (UM_DOMAIN_NAME);
+
+ALTER TABLE REG_ASSOCIATION ADD INDEX REG_ASSOCIATION_INDEX_SOURCEPATH (REG_SOURCEPATH, REG_TENANT_ID);
+ALTER TABLE REG_ASSOCIATION ADD INDEX REG_ASSOCIATION_INDEX_TARGETPATH (REG_TARGETPATH, REG_TENANT_ID);
+ALTER TABLE REG_ASSOCIATION ADD INDEX REG_ASSOCIATION_INDEX_ASSOCIATION_TYPE (REG_ASSOCIATION_TYPE, REG_TENANT_ID); 
+

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c67e7c5b/products/stratos-controller/dbscripts/s2_h2.sql
----------------------------------------------------------------------
diff --git a/products/stratos-controller/dbscripts/s2_h2.sql b/products/stratos-controller/dbscripts/s2_h2.sql
new file mode 100644
index 0000000..170c77b
--- /dev/null
+++ b/products/stratos-controller/dbscripts/s2_h2.sql
@@ -0,0 +1,96 @@
+--
+-- Create schema s2_db
+--
+
+-- CREATE SCHEMA  IF NOT EXISTS s2_db; 
+-- SET SCHEMA s2_db;
+
+--
+-- Definition of table s2_db.CARTRIDGE_INSTANCE
+--
+
+DROP TABLE IF EXISTS CARTRIDGE_INSTANCE;
+CREATE TABLE  CARTRIDGE_INSTANCE (
+  ID int(11) NOT NULL AUTO_INCREMENT,
+  INSTANCE_IP varchar(255) NOT NULL,
+  TENANT_ID int(11) DEFAULT NULL,
+  TENANT_DOMAIN varchar(255) DEFAULT NULL,
+  CARTRIDGE_TYPE varchar(255) NOT NULL,
+  STATE varchar(255) NOT NULL,
+  CLUSTER_DOMAIN varchar(255) NOT NULL,
+  CLUSTER_SUBDOMAIN varchar(255) NOT NULL,
+  PRIMARY KEY (ID)
+);
+
+--
+-- Definition of table CARTRIDGE_SUBSCRIPTION
+--
+
+DROP TABLE IF EXISTS CARTRIDGE_SUBSCRIPTION;
+CREATE TABLE  CARTRIDGE_SUBSCRIPTION (
+  SUBSCRIPTION_ID int(11) NOT NULL AUTO_INCREMENT,
+  TENANT_ID int(11) NOT NULL,
+  CARTRIDGE varchar(30) NOT NULL,
+  PROVIDER varchar(30) NOT NULL,
+  HOSTNAME varchar(255) NOT NULL,
+  POLICY varchar(50) NULL,
+  CLUSTER_DOMAIN varchar(255) NOT NULL,
+  CLUSTER_SUBDOMAIN varchar(255) NOT NULL,
+  MGT_DOMAIN varchar(255) NOT NULL,
+  MGT_SUBDOMAIN varchar(255) NOT NULL,
+  STATE varchar(30) NOT NULL,
+  ALIAS varchar(255) NOT NULL,
+  TENANT_DOMAIN varchar(255) NOT NULL,
+  BASE_DIR varchar(255) NOT NULL,
+  REPO_ID int(11) DEFAULT NULL,
+  DATA_CARTRIDGE_ID int(11) DEFAULT NULL,
+  MAPPED_DOMAIN varchar(255),
+  PRIMARY KEY (SUBSCRIPTION_ID)
+);
+
+
+
+--
+-- Definition of table DATA_CARTRIDGE
+--
+
+DROP TABLE IF EXISTS DATA_CARTRIDGE;
+CREATE TABLE  DATA_CARTRIDGE (
+  DATA_CART_ID int(11) NOT NULL AUTO_INCREMENT,
+  TYPE varchar(30) NOT NULL,
+  USER_NAME varchar(255) NOT NULL,
+  PASSWORD varchar(255) NOT NULL,
+  STATE varchar(255) NOT NULL,
+  PRIMARY KEY (DATA_CART_ID) 
+);
+
+
+--
+-- Definition of table PORT_MAPPING
+--
+
+DROP TABLE IF EXISTS PORT_MAPPING;
+CREATE TABLE  PORT_MAPPING (
+  PORT_MAPPING_ID int(11) NOT NULL AUTO_INCREMENT,
+  SUBSCRIPTION_ID int(11) NOT NULL,
+  TYPE varchar(30) NOT NULL,
+  PRIMARY_PORT varchar(30) NOT NULL,
+  PROXY_PORT varchar(30) NOT NULL,
+  STATE varchar(30) NOT NULL,
+  PRIMARY KEY (PORT_MAPPING_ID)
+);
+
+
+--
+-- Definition of table REPOSITORY
+--
+
+DROP TABLE IF EXISTS REPOSITORY;
+CREATE TABLE  REPOSITORY (
+  REPO_ID int(11) NOT NULL AUTO_INCREMENT,
+  REPO_NAME varchar(255) NOT NULL,
+  STATE varchar(30) NOT NULL,
+  REPO_USER_NAME varchar(255) NOT NULL,
+  REPO_USER_PASSWORD varchar(255) NOT NULL,
+  PRIMARY KEY (REPO_ID)
+);

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c67e7c5b/products/stratos-controller/dbscripts/stratos_mysql.sql
----------------------------------------------------------------------
diff --git a/products/stratos-controller/dbscripts/stratos_mysql.sql b/products/stratos-controller/dbscripts/stratos_mysql.sql
new file mode 100644
index 0000000..8aa3269
--- /dev/null
+++ b/products/stratos-controller/dbscripts/stratos_mysql.sql
@@ -0,0 +1,121 @@
+-- MySQL Administrator dump 1.4
+--
+-- ------------------------------------------------------
+-- Server version	5.5.24-0ubuntu0.12.04.1
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+
+
+--
+-- Create schema stratos_foundation
+--
+
+CREATE DATABASE IF NOT EXISTS stratos_foundation;
+USE stratos_foundation;
+
+--
+-- Definition of table `stratos_foundation`.`CARTRIDGE_INSTANCE`
+--
+
+DROP TABLE IF EXISTS `stratos_foundation`.`CARTRIDGE_INSTANCE`;
+CREATE TABLE  `stratos_foundation`.`CARTRIDGE_INSTANCE` (
+  `ID` int(11) NOT NULL AUTO_INCREMENT,
+  `INSTANCE_IP` varchar(255) NOT NULL,
+  `TENANT_ID` int(11) DEFAULT NULL,
+  `TENANT_DOMAIN` varchar(255) DEFAULT NULL,
+  `CARTRIDGE_TYPE` varchar(255) NOT NULL,
+  `STATE` varchar(255) NOT NULL,
+  `CLUSTER_DOMAIN` varchar(255) NOT NULL,
+  `CLUSTER_SUBDOMAIN` varchar(255) NOT NULL,
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+
+--
+-- Definition of table `stratos_foundation`.`CARTRIDGE_SUBSCRIPTION`
+--
+
+DROP TABLE IF EXISTS `stratos_foundation`.`CARTRIDGE_SUBSCRIPTION`;
+CREATE TABLE  `stratos_foundation`.`CARTRIDGE_SUBSCRIPTION` (
+  `SUBSCRIPTION_ID` int(11) NOT NULL AUTO_INCREMENT,
+  `TENANT_ID` int(11) NOT NULL,
+  `CARTRIDGE` varchar(30) NOT NULL,
+  `PROVIDER` varchar(30) NOT NULL,
+  `HOSTNAME` varchar(255) NOT NULL,
+  `POLICY` varchar(50) NULL,
+  `CLUSTER_DOMAIN` varchar(255) NOT NULL,
+  `CLUSTER_SUBDOMAIN` varchar(255) NOT NULL,
+  `MGT_DOMAIN` varchar(255) NOT NULL,
+  `MGT_SUBDOMAIN` varchar(255) NOT NULL,
+  `STATE` varchar(30) NOT NULL,
+  `ALIAS` varchar(255) NOT NULL,
+  `TENANT_DOMAIN` varchar(255) NOT NULL,
+  `BASE_DIR` varchar(255) NOT NULL,
+  `REPO_ID` int(11) DEFAULT NULL,
+  `DATA_CARTRIDGE_ID` int(11) DEFAULT NULL,
+  `MAPPED_DOMAIN` varchar(255),
+  PRIMARY KEY (`SUBSCRIPTION_ID`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+
+
+
+--
+-- Definition of table `stratos_foundation`.`DATA_CARTRIDGE`
+--
+
+DROP TABLE IF EXISTS `stratos_foundation`.`DATA_CARTRIDGE`;
+CREATE TABLE  `stratos_foundation`.`DATA_CARTRIDGE` (
+  `DATA_CART_ID` int(11) NOT NULL AUTO_INCREMENT,
+  `TYPE` varchar(30) NOT NULL,
+  `USER_NAME` varchar(255) NOT NULL,
+  `PASSWORD` varchar(255) NOT NULL,
+  `STATE` varchar(255) NOT NULL,
+  PRIMARY KEY (`DATA_CART_ID`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+
+
+--
+-- Definition of table `stratos_foundation`.`PORT_MAPPING`
+--
+
+DROP TABLE IF EXISTS `stratos_foundation`.`PORT_MAPPING`;
+CREATE TABLE  `stratos_foundation`.`PORT_MAPPING` (
+  `PORT_MAPPING_ID` int(11) NOT NULL AUTO_INCREMENT,
+  `SUBSCRIPTION_ID` int(11) NOT NULL,
+  `TYPE` varchar(30) NOT NULL,
+  `PRIMARY_PORT` varchar(30) NOT NULL,
+  `PROXY_PORT` varchar(30) NOT NULL,
+  `STATE` varchar(30) NOT NULL,
+  PRIMARY KEY (`PORT_MAPPING_ID`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+
+
+--
+-- Definition of table `stratos_foundation`.`REPOSITORY`
+--
+
+DROP TABLE IF EXISTS `stratos_foundation`.`REPOSITORY`;
+CREATE TABLE  `stratos_foundation`.`REPOSITORY` (
+  `REPO_ID` int(11) NOT NULL AUTO_INCREMENT,
+  `REPO_NAME` varchar(255) NOT NULL,
+  `STATE` varchar(30) NOT NULL,
+  `REPO_USER_NAME` varchar(255) NOT NULL,
+  `REPO_USER_PASSWORD` varchar(255) NOT NULL,
+  PRIMARY KEY (`REPO_ID`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c67e7c5b/products/stratos-controller/dbscripts/wso2_rss.sql
----------------------------------------------------------------------
diff --git a/products/stratos-controller/dbscripts/wso2_rss.sql b/products/stratos-controller/dbscripts/wso2_rss.sql
new file mode 100755
index 0000000..411b1ce
--- /dev/null
+++ b/products/stratos-controller/dbscripts/wso2_rss.sql
@@ -0,0 +1,81 @@
+
+CREATE TABLE RSS_INSTANCE (
+  rss_instance_id INTEGER AUTO_INCREMENT,
+  name VARCHAR(128) NOT NULL,
+  server_url VARCHAR(1024) NOT NULL,
+  dbms_type VARCHAR(128) NOT NULL,
+  instance_type VARCHAR(128) NOT NULL,
+  server_category VARCHAR(128) NOT NULL,
+  admin_username VARCHAR(128),
+  admin_password VARCHAR(128),
+  tenant_id INTEGER NOT NULL,
+  UNIQUE (name, tenant_id),
+  PRIMARY KEY (rss_instance_id)
+) ENGINE="InnoDB";
+
+CREATE TABLE DATABASE_INSTANCE (
+  database_instance_id INTEGER AUTO_INCREMENT,
+  name VARCHAR(128) NOT NULL,
+  rss_instance_id INTEGER,
+  tenant_id INTEGER,
+  UNIQUE (name, rss_instance_id),
+  PRIMARY KEY (database_instance_id),
+  FOREIGN KEY (rss_instance_id) REFERENCES RSS_INSTANCE (rss_instance_id)
+) ENGINE="InnoDB";
+
+CREATE TABLE DATABASE_USER (
+  user_id INTEGER AUTO_INCREMENT,
+  db_username VARCHAR(128) NOT NULL,
+  rss_instance_id INTEGER,
+  user_tenant_id INTEGER,
+  UNIQUE (db_username, rss_instance_id, user_tenant_id),
+  PRIMARY KEY (user_id),
+  FOREIGN KEY (rss_instance_id) REFERENCES RSS_INSTANCE (rss_instance_id)
+) ENGINE="InnoDB";
+
+CREATE TABLE DATABASE_INSTANCE_PROPERTY (
+  db_property_id INTEGER AUTO_INCREMENT,
+  prop_name VARCHAR(128) NOT NULL,
+  prop_value TEXT,
+  database_instance_id INTEGER,
+  UNIQUE (prop_name, database_instance_id),
+  PRIMARY KEY (db_property_id),
+  FOREIGN KEY (database_instance_id) REFERENCES DATABASE_INSTANCE (database_instance_id)
+) ENGINE="InnoDB";
+
+CREATE TABLE USER_DATABASE_ENTRY (
+  user_id INTEGER,
+  database_instance_id INTEGER,
+  PRIMARY KEY (user_id, database_instance_id),
+  FOREIGN KEY (user_id) REFERENCES DATABASE_USER (user_id),
+  FOREIGN KEY (database_instance_id) REFERENCES DATABASE_INSTANCE (database_instance_id)
+) ENGINE="InnoDB";
+
+CREATE TABLE USER_DATABASE_PERMISSION (
+  user_id INTEGER,
+  database_instance_id INTEGER,
+  perm_name VARCHAR(128) NOT NULL,
+  perm_value VARCHAR(128),
+  PRIMARY KEY (user_id, database_instance_id, perm_name),
+  FOREIGN KEY (user_id) REFERENCES DATABASE_USER (user_id),
+  FOREIGN KEY (database_instance_id) REFERENCES DATABASE_INSTANCE (database_instance_id)
+) ENGINE="InnoDB";
+
+CREATE TABLE WSO2_RSS_DATABASE_INSTANCE_COUNT (
+  instance_count INTEGER NOT NULL DEFAULT 0
+) ENGINE="InnoDB";
+
+CREATE TABLE USER_PRIVILEGE_GROUP (
+  priv_group_id INTEGER AUTO_INCREMENT,
+  priv_group_name VARCHAR(128),
+  tenant_id INTEGER,
+  PRIMARY KEY (priv_group_id, priv_group_name, tenant_id)
+) ENGINE="InnoDB";
+
+CREATE TABLE USER_PRIVILEGE_GROUP_ENTRY (
+  priv_group_id INTEGER,
+  perm_name VARCHAR(128),
+  perm_value CHAR(1),
+  PRIMARY KEY (priv_group_id, perm_name),
+  FOREIGN KEY (priv_group_id) REFERENCES USER_PRIVILEGE_GROUP (priv_group_id)
+) ENGINE="InnoDB";

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c67e7c5b/products/stratos-controller/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/distribution/pom.xml b/products/stratos-controller/modules/distribution/pom.xml
index 527f28c..a93dc7e 100755
--- a/products/stratos-controller/modules/distribution/pom.xml
+++ b/products/stratos-controller/modules/distribution/pom.xml
@@ -521,8 +521,8 @@
                                     <classpath>
                                         <path refid="h2.classpath"/>
                                     </classpath>
-                                    <fileset file="../../billing-script/billing-h2.sql"/>
-                                    <fileset file="../../billing-script/metering_h2.sql"/>
+                                    <fileset file="../../dbscripts/billing-h2.sql"/>
+                                    <fileset file="../../dbscripts/metering_h2.sql"/>
                                 </sql>
                                 <echo
                                         message="##################### END ########################"/>
@@ -551,7 +551,7 @@
                                     <classpath>
                                         <path refid="h2.classpath"/>
                                     </classpath>
-                                    <fileset file="../../billing-script/s2_h2.sql"/>
+                                    <fileset file="../../dbscripts/s2_h2.sql"/>
                                 </sql>
                                 <echo
                                         message="##################### END ########################"/>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c67e7c5b/products/stratos-controller/modules/distribution/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/distribution/src/assembly/bin.xml b/products/stratos-controller/modules/distribution/src/assembly/bin.xml
index 52da673..ba2abbe 100755
--- a/products/stratos-controller/modules/distribution/src/assembly/bin.xml
+++ b/products/stratos-controller/modules/distribution/src/assembly/bin.xml
@@ -307,7 +307,7 @@
                    </includes>
                 </fileSet>
 		<fileSet>
-                   <directory>../../billing-script/</directory>
+                   <directory>../../dbscripts/</directory>
                    <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts</outputDirectory>
                 </fileSet>
 		<fileSet>