You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/10/13 12:05:42 UTC

[51/51] [abbrv] [partial] stratos git commit: Restructing das extension repository

Restructing das extension repository


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

Branch: refs/heads/stratos-4.1.x
Commit: 53c98dd9b3602eb2c9e3f2f03760b932c4e460fa
Parents: d2c842a
Author: Thanuja <th...@wso2.com>
Authored: Mon Oct 12 13:36:56 2015 +0530
Committer: gayangunarathne <ga...@wso2.com>
Committed: Tue Oct 13 15:33:35 2015 +0530

----------------------------------------------------------------------
 extensions/das/README.md                        |    10 -
 extensions/das/metering-service/capps/README.md |    17 -
 extensions/das/metering-service/capps/build.xml |    45 -
 .../capps/jaggery-files/applications.jag        |    41 -
 .../capps/jaggery-files/clusters.jag            |    42 -
 .../capps/jaggery-files/member-count.jag        |   104 -
 .../capps/jaggery-files/member-info.jag         |    70 -
 .../capps/jaggery-files/member-status.jag       |    90 -
 .../capps/jaggery-files/schema.jag              |    63 -
 .../das/metering-service/capps/mysqlscript.sql  |     4 -
 extensions/das/metering-service/capps/pom.xml   |    72 -
 .../Dashboard/artifact.xml                      |    24 -
 .../Dashboard/stratos-metering-dashboard.json   |   267 -
 .../MemberInfoEventReceiver.xml                 |    29 -
 .../EventReceiver_MemberInfo/artifact.xml       |    24 -
 .../MemberLifecycleEventReceiver.xml            |    29 -
 .../EventReceiver_MemberLifecycle/artifact.xml  |    24 -
 .../EventStore_MemberInfo/artifact.xml          |    24 -
 .../EventStore_MemberInfo/member_info.xml       |   148 -
 .../EventStore_MemberLifecycle/artifact.xml     |    24 -
 .../member_lifecycle.xml                        |    99 -
 .../EventStream_MemberInfo/artifact.xml         |    24 -
 .../member_info_1.0.0.json                      |    76 -
 .../EventStream_MemberLifecycle/artifact.xml    |    24 -
 .../member_lifecycle_1.0.0.json                 |    48 -
 .../Member_Count/css/bootstrap.min.css          |  5935 ------
 .../Member_Count/css/d3.geomap.css              |    34 -
 .../Member_Count/css/igviz.css                  |    86 -
 .../Member_Count/gadget.json                    |    19 -
 .../Gadget_Member_Count/Member_Count/index.xml  |    85 -
 .../js/d3.geomap.dependencies.min.js            |  8235 --------
 .../Member_Count/js/d3.geomap.min.js            |   524 -
 .../Member_Count/js/d3.min.js                   |  6312 -------
 .../Member_Count/js/excanvas.min.js             |   934 -
 .../Member_Count/js/gadgetconf.js               |    56 -
 .../Member_Count/js/igviz.js                    |  3565 ----
 .../Member_Count/js/jquery.js                   |  9496 ----------
 .../Gadget_Member_Count/Member_Count/js/main.js |   170 -
 .../Member_Count/js/outputAdapterUiLibrary.js   |   275 -
 .../Gadget_Member_Count/Member_Count/js/vega.js |  7986 --------
 .../Gadget_Member_Count/artifact.xml            |    24 -
 .../Member_Details_Filter/css/jquery-ui.css     |  1225 --
 .../Member_Details_Filter/css/style.css         |   221 -
 .../Member_Details_Filter/gadget.json           |    23 -
 .../Member_Details_Filter/index.png             |   Bin 6754 -> 0 bytes
 .../Member_Details_Filter/index.xml             |    67 -
 .../Member_Details_Filter/js/jquery-ui.js       | 16617 -----------------
 .../js/member-details-filter.js                 |   138 -
 .../Gadget_Member_Details_Filter/artifact.xml   |    24 -
 .../Member_Information/css/bootstrap.min.css    |  5935 ------
 .../Member_Information/css/d3.geomap.css        |    34 -
 .../Member_Information/css/igviz.css            |    66 -
 .../Member_Information/gadget.json              |    19 -
 .../Member_Information/index.xml                |    88 -
 .../js/d3.geomap.dependencies.min.js            |  8235 --------
 .../Member_Information/js/d3.geomap.min.js      |   524 -
 .../Member_Information/js/d3.min.js             |  6312 -------
 .../Member_Information/js/excanvas.min.js       |   934 -
 .../Member_Information/js/gadgetconf.js         |    89 -
 .../Member_Information/js/igviz.js              |  3545 ----
 .../Member_Information/js/jquery.js             |  9496 ----------
 .../Member_Information/js/main.js               |   168 -
 .../js/outputAdapterUiLibrary.js                |   276 -
 .../Member_Information/js/vega.js               |  7986 --------
 .../Gadget_Member_Information/artifact.xml      |    24 -
 .../Member_Status/css/bootstrap.min.css         |  5935 ------
 .../Member_Status/css/d3.geomap.css             |    34 -
 .../Member_Status/css/igviz.css                 |    66 -
 .../Member_Status/gadget.json                   |    19 -
 .../Member_Status/index.xml                     |    87 -
 .../js/d3.geomap.dependencies.min.js            |  8235 --------
 .../Member_Status/js/d3.geomap.min.js           |   524 -
 .../Member_Status/js/d3.min.js                  |  6312 -------
 .../Member_Status/js/excanvas.min.js            |   934 -
 .../Member_Status/js/gadgetconf.js              |    50 -
 .../Member_Status/js/igviz.js                   |  3545 ----
 .../Member_Status/js/jquery.js                  |  9496 ----------
 .../Member_Status/js/main.js                    |   170 -
 .../Member_Status/js/outputAdapterUiLibrary.js  |   276 -
 .../Member_Status/js/vega.js                    |  7986 --------
 .../Gadget_Member_Status/artifact.xml           |    24 -
 .../Member_Status_Filter/css/jquery-ui.css      |  1225 --
 .../Member_Status_Filter/css/style.css          |   253 -
 .../Member_Status_Filter/gadget.json            |    23 -
 .../Member_Status_Filter/index.png              |   Bin 12554 -> 0 bytes
 .../Member_Status_Filter/index.xml              |    52 -
 .../Member_Status_Filter/js/jquery-ui.js        | 16617 -----------------
 .../js/member-status-filter.js                  |   140 -
 .../Gadget_Member_Status_Filter/artifact.xml    |    24 -
 .../Layout/artifact.xml                         |    24 -
 .../Layout/single-column/index.hbs              |    27 -
 .../Layout/single-column/index.jpg              |   Bin 1270 -> 0 bytes
 .../Layout/single-column/index.png              |   Bin 4958 -> 0 bytes
 .../Layout/single-column/layout.json            |     8 -
 .../SparkScript_MemberInfo/artifact.xml         |    24 -
 .../member_information.xml                      |    36 -
 .../SparkScript_MemberLifecycle/artifact.xml    |    24 -
 .../member_count.xml                            |    55 -
 .../stratos-metering-service/artifacts.xml      |    48 -
 extensions/das/metering-service/pom.xml         |    38 -
 .../das/metering-service/spark-udfs/README.md   |     8 -
 .../das/metering-service/spark-udfs/pom.xml     |    40 -
 .../spark-udfs/spark-time-udf/pom.xml           |    37 -
 .../das/extension/spark/udf/TimeUDF.java        |    49 -
 .../das/metering-service/ues-patch/README.md    |     8 -
 .../metering-service/ues-patch/dashboard.jag    |    85 -
 .../ues-patch/ues-dashboards.js                 |   188 -
 .../metering-service/ues-patch/ues-pubsub.js    |    27 -
 .../artifacts/metering-dashboard/README.md      |    12 +
 .../metering-dashboard/capps/build.xml          |    40 +
 .../artifacts/metering-dashboard/capps/pom.xml  |    73 +
 .../Dashboard_1.0.0/artifact.xml                |    24 +
 .../stratos-metering-dashboard.json             |   267 +
 .../EventreceiverMemberInfo_1.0.0/artifact.xml  |    24 +
 .../member_info_receiver.xml                    |    29 +
 .../artifact.xml                                |    24 +
 .../member_lifecycle_receiver.xml               |    29 +
 .../EventstoreMemberInfo_1.0.0/artifact.xml     |    24 +
 .../EventstoreMemberInfo_1.0.0/member_info.xml  |   148 +
 .../artifact.xml                                |    24 +
 .../member_lifecycle.xml                        |    99 +
 .../EventstreamMemberInfo_1.0.0/artifact.xml    |    24 +
 .../member_info_1.0.0.json                      |    76 +
 .../artifact.xml                                |    24 +
 .../member_lifecycle_1.0.0.json                 |    48 +
 .../Member_Count/css/bootstrap.min.css          |  5935 ++++++
 .../Member_Count/css/d3.geomap.css              |    34 +
 .../Member_Count/css/igviz.css                  |    86 +
 .../Member_Count/gadget.json                    |    19 +
 .../Member_Count/index.xml                      |    85 +
 .../js/d3.geomap.dependencies.min.js            |  8235 ++++++++
 .../Member_Count/js/d3.geomap.min.js            |   524 +
 .../Member_Count/js/d3.min.js                   |  6312 +++++++
 .../Member_Count/js/excanvas.min.js             |   934 +
 .../Member_Count/js/gadgetconf.js               |    56 +
 .../Member_Count/js/igviz.js                    |  3565 ++++
 .../Member_Count/js/jquery.js                   |  9496 ++++++++++
 .../Member_Count/js/main.js                     |   170 +
 .../Member_Count/js/outputAdapterUiLibrary.js   |   275 +
 .../Member_Count/js/vega.js                     |  7986 ++++++++
 .../GadgetMemberCount_1.0.0/artifact.xml        |    24 +
 .../Member_Details_Filter/css/jquery-ui.css     |  1225 ++
 .../Member_Details_Filter/css/style.css         |   221 +
 .../Member_Details_Filter/gadget.json           |    23 +
 .../Member_Details_Filter/index.png             |   Bin 0 -> 6754 bytes
 .../Member_Details_Filter/index.xml             |    67 +
 .../Member_Details_Filter/js/jquery-ui.js       | 16617 +++++++++++++++++
 .../js/member-details-filter.js                 |   138 +
 .../artifact.xml                                |    24 +
 .../Member_Information/css/bootstrap.min.css    |  5935 ++++++
 .../Member_Information/css/d3.geomap.css        |    34 +
 .../Member_Information/css/igviz.css            |    66 +
 .../Member_Information/gadget.json              |    19 +
 .../Member_Information/index.xml                |    88 +
 .../js/d3.geomap.dependencies.min.js            |  8235 ++++++++
 .../Member_Information/js/d3.geomap.min.js      |   524 +
 .../Member_Information/js/d3.min.js             |  6312 +++++++
 .../Member_Information/js/excanvas.min.js       |   934 +
 .../Member_Information/js/gadgetconf.js         |    89 +
 .../Member_Information/js/igviz.js              |  3545 ++++
 .../Member_Information/js/jquery.js             |  9496 ++++++++++
 .../Member_Information/js/main.js               |   168 +
 .../js/outputAdapterUiLibrary.js                |   276 +
 .../Member_Information/js/vega.js               |  7986 ++++++++
 .../GadgetMemberInformation_1.0.0/artifact.xml  |    24 +
 .../Member_Status_Filter/css/jquery-ui.css      |  1225 ++
 .../Member_Status_Filter/css/style.css          |   253 +
 .../Member_Status_Filter/gadget.json            |    23 +
 .../Member_Status_Filter/index.png              |   Bin 0 -> 12554 bytes
 .../Member_Status_Filter/index.xml              |    52 +
 .../Member_Status_Filter/js/jquery-ui.js        | 16617 +++++++++++++++++
 .../js/member-status-filter.js                  |   140 +
 .../GadgetMemberStatusFilter_1.0.0/artifact.xml |    24 +
 .../Member_Status/css/bootstrap.min.css         |  5935 ++++++
 .../Member_Status/css/d3.geomap.css             |    34 +
 .../Member_Status/css/igviz.css                 |    66 +
 .../Member_Status/gadget.json                   |    19 +
 .../Member_Status/index.xml                     |    87 +
 .../js/d3.geomap.dependencies.min.js            |  8235 ++++++++
 .../Member_Status/js/d3.geomap.min.js           |   524 +
 .../Member_Status/js/d3.min.js                  |  6312 +++++++
 .../Member_Status/js/excanvas.min.js            |   934 +
 .../Member_Status/js/gadgetconf.js              |    50 +
 .../Member_Status/js/igviz.js                   |  3545 ++++
 .../Member_Status/js/jquery.js                  |  9496 ++++++++++
 .../Member_Status/js/main.js                    |   170 +
 .../Member_Status/js/outputAdapterUiLibrary.js  |   276 +
 .../Member_Status/js/vega.js                    |  7986 ++++++++
 .../GadgetMemberStatus_1.0.0/artifact.xml       |    24 +
 .../SparkscriptsMemberInfo_1.0.0/artifact.xml   |    24 +
 .../member_information.xml                      |    36 +
 .../artifact.xml                                |    24 +
 .../member_count.xml                            |    55 +
 .../stratos-metering-service/artifacts.xml      |    47 +
 .../jaggery-files/applications.jag              |    41 +
 .../jaggery-files/clusters.jag                  |    42 +
 .../jaggery-files/member-count.jag              |   104 +
 .../jaggery-files/member-info.jag               |    70 +
 .../jaggery-files/member-status.jag             |    90 +
 .../metering-dashboard/jaggery-files/schema.jag |    63 +
 .../metering-dashboard/mysqlscript.sql          |     4 +
 .../metering-dashboard/ues-patch/README.md      |     8 +
 .../metering-dashboard/ues-patch/dashboard.jag  |    85 +
 .../ues-patch/ues-dashboards.js                 |   188 +
 .../metering-dashboard/ues-patch/ues-pubsub.js  |    27 +
 extensions/das/modules/distribution/README.md   |     9 +
 extensions/das/modules/distribution/pom.xml     |    66 +
 .../modules/distribution/src/assembly/bin.xml   |    69 +
 .../distribution/src/main/license/LICENSE       |   204 +
 .../modules/distribution/src/main/notice/NOTICE |     7 +
 .../stratos-das-extension/spark-udfs/README.md  |     8 +
 .../stratos-das-extension/spark-udfs/pom.xml    |    40 +
 .../spark-udfs/spark-time-udf/pom.xml           |    36 +
 .../das/extension/spark/udf/TimeUDF.java        |    49 +
 extensions/das/pom.xml                          |     6 +-
 215 files changed, 170198 insertions(+), 169959 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/README.md
----------------------------------------------------------------------
diff --git a/extensions/das/README.md b/extensions/das/README.md
deleted file mode 100644
index 00be297..0000000
--- a/extensions/das/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Apache Stratos DAS Extensions
-
-Apache Stratos Data Analytics Server (DAS) extensions include DAS artifacts and spark udf to run spark script.
-These extensions need to be deployed manually when running DAS externally.
-
-Please refer below link for more information on WSO2 DAS.
-https://docs.wso2.com/display/DAS300/WSO2+Data+Analytics+Server+Documentation
-
-Thank you for using Apache Stratos!
-The Stratos Team
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/README.md
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/README.md b/extensions/das/metering-service/capps/README.md
deleted file mode 100644
index e93fcd6..0000000
--- a/extensions/das/metering-service/capps/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Apache Stratos Metering Dashboard
-
-This directory contains Composite Applications (CApps) required for Stratos Metering Service.
-It includes all Event Stream, Event receiver, Even Store, Gadgets and Dashboard artifacts bundle inside the car file.
-Follow the below steps to generate the metering dashboard:
-1. Enable thrift stats publisher for das in thrift-client-config.xml file and update DAS server IP and thrift port in the same file as follow:
-    <config>
-        <name>das</name>
-        <statsPublisherEnabled>false</statsPublisherEnabled>
-        <username>admin</username>
-        <password>admin</password>
-        <ip>localhost</ip> <!-- DAS server IP -->
-        <port>7612</port> <!-- DAS thrift port -->
-    </config>
-2. Add the jaggery files which can be found inside directory 'jaggery-files' to DAS server path '/jaggeryapps/portal/controllers/apis'
-3. Create MySQL database and tables using queries in 'mysqlscript.sql' manually.
-4. Add the car file to DAS server to gene rate the metering dashboard.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/build.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/build.xml b/extensions/das/metering-service/capps/build.xml
deleted file mode 100644
index b1b43d8..0000000
--- a/extensions/das/metering-service/capps/build.xml
+++ /dev/null
@@ -1,45 +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.
-
--->
-<project name="stratos-metering-service" default="zip" basedir=".">
-
-    <property name="project-name" value="${ant.project.name}"/>
-    <property name="target-dir" value="target"/>
-
-    <property name="stratos_metering_service_dir" value="stratos-metering-service"/>
-
-    <target name="clean">
-        <delete dir="${target-dir}"/>
-    </target>
-
-    <target name="pre-configure">
-        <mkdir dir="${target-dir}"/>
-        <copy file="README.md" todir="${target-dir}"/>
-    </target>
-
-    <target name="zip" depends="clean,pre-configure">
-        <zip destfile="${target-dir}/${stratos_metering_service_dir}.car">
-            <zipfileset dir="${stratos_metering_service_dir}"/>
-        </zip>
-    </target>
-
-</project>
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/jaggery-files/applications.jag
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/jaggery-files/applications.jag b/extensions/das/metering-service/capps/jaggery-files/applications.jag
deleted file mode 100644
index c2f6b97..0000000
--- a/extensions/das/metering-service/capps/jaggery-files/applications.jag
+++ /dev/null
@@ -1,41 +0,0 @@
-<%
-/*
- * 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.
- *
- */
-(function () {
-    var log = new Log();
-    var HTTP_INTERNAL_ERROR = 500;
-
-    var db = new Database("WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB");
-
-    try {
-        var result = db.query("SELECT DISTINCT ApplicationId FROM MEMBER_COUNT");
-
-        if (result != null) {
-            print(result);
-        }
-    }
-    catch (e) {
-        print(e.toString());
-    }
-    finally {
-        db.close();
-    }
-}());
-%>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/jaggery-files/clusters.jag
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/jaggery-files/clusters.jag b/extensions/das/metering-service/capps/jaggery-files/clusters.jag
deleted file mode 100644
index cdfe745..0000000
--- a/extensions/das/metering-service/capps/jaggery-files/clusters.jag
+++ /dev/null
@@ -1,42 +0,0 @@
-<%
-/*
- * 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.
- *
- */
-(function () {
-    var log = new Log();
-    var HTTP_INTERNAL_ERROR = 500;
-
-    var db = new Database("WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB");
-
-    try {
-        var applicationId = request.getParameter('applicationId');
-        var result = db.query("SELECT DISTINCT ClusterAlias FROM MEMBER_COUNT WHERE ApplicationId = ?", applicationId);
-
-        if (result != null) {
-            print(result);
-        }
-    }
-    catch (e) {
-        print(e.toString());
-    }
-    finally {
-        db.close();
-    }
-}());
-%>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/jaggery-files/member-count.jag
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/jaggery-files/member-count.jag b/extensions/das/metering-service/capps/jaggery-files/member-count.jag
deleted file mode 100644
index 4d403a2..0000000
--- a/extensions/das/metering-service/capps/jaggery-files/member-count.jag
+++ /dev/null
@@ -1,104 +0,0 @@
-<%
-/*
- * 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.
- *
- */
-(function () {
-    var log = new Log();
-    var TABLE_NAME = "tableName";
-
-    var HTTP_INTERNAL_ERROR = 500;
-
-    var carbon = require('carbon');
-    var configs = require('/configs/designer.json');
-
-    var tableName = encodeURIComponent(request.getParameter(TABLE_NAME));
-    if (tableName == null) {
-        log.error("Table name param is not provided!");
-        response.status = HTTP_INTERNAL_ERROR;
-        print('{ "status": "Failed", "message": "Table name param is empty" }');
-        return;
-    }
-
-    var TIME_INTERVAL_1 = '30 Min';
-    var TIME_INTERVAL_2 = '1 Hour';
-    var TIME_INTERVAL_3 = '1 Day';
-    var TIME_INTERVAL_4 = '1 Week';
-    var TIME_INTERVAL_5 = '1 Month';
-    var ALL_CLUSTERS = 'All Clusters';
-
-    var carbon = require('carbon');
-    var configs = require('/configs/designer.json');
-    var content = request.getContent();
-    var contentAsString = null;
-    if (content != '' && content != null) {
-        contentAsString = stringify(content);
-        if (log.isDebugEnabled()) {
-            log.debug("Value of content: " + contentAsString);
-        }
-    }
-
-    var db = new Database("WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB");
-
-    try {
-        var result;
-
-        var timeInterval = request.getParameter("time");
-        var interval = 1800000;
-        var x_axis_interval;
-        var time_format;
-        if (timeInterval === TIME_INTERVAL_1) {
-            interval = 1800000;
-            x_axis_interval = 60;
-            time_format = '%h:%i';
-        } else if (timeInterval === TIME_INTERVAL_2) {
-            interval = 3600000;
-            x_axis_interval = 120;
-            time_format = '%h:%i';
-        } else if (timeInterval === TIME_INTERVAL_3) {
-            interval = 86400000;
-            x_axis_interval = 2880;
-            time_format = '%Y:%m:%d %h:%i';
-        } else if (timeInterval === TIME_INTERVAL_4) {
-            interval = 604800000;
-            x_axis_interval = 20160;
-            time_format = '%Y:%m:%d %h:%i';
-        } else if (timeInterval === TIME_INTERVAL_5) {
-            interval = 2419200000;
-            x_axis_interval = 80640;
-            time_format = '%Y:%m:%d';
-        }
-        var applicationId = request.getParameter("applicationId");
-        var clusterId = request.getParameter("clusterId");
-
-        if (clusterId == ALL_CLUSTERS) {
-            result = db.query("SELECT FROM_UNIXTIME(CEILING( Time/('" + x_axis_interval + "'*1000)) *'" + x_axis_interval + "', '" + time_format + "') AS Time, SUM(CreatedInstanceCount) AS CreatedInstanceCount , SUM(InitializedInstanceCount) AS InitializedInstanceCount , SUM(ActiveInstanceCount) AS ActiveInstanceCount, SUM(TerminatedInstanceCount) AS TerminatedInstanceCount FROM " + tableName + " WHERE ApplicationId=? AND Time > ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000-'" + interval + "' ) AND Time <= ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000) GROUP BY FROM_UNIXTIME( CEILING( Time/('" + x_axis_interval + "'*1000)) *'"+x_axis_interval+"', '%Y:%m:%d %h:%i'), ApplicationId", applicationId);
-        } else {
-            result = db.query("SELECT FROM_UNIXTIME(CEILING( Time/('" + x_axis_interval + "'*1000)) *'" + x_axis_interval + "', '" + time_format + "') AS Time, SUM(CreatedInstanceCount) AS CreatedInstanceCount , SUM(InitializedInstanceCount) AS InitializedInstanceCount , SUM(ActiveInstanceCount) AS ActiveInstanceCount, SUM(TerminatedInstanceCount) AS TerminatedInstanceCount FROM " + tableName + " WHERE ApplicationId=? AND ClusterAlias=? AND Time > ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000-'" + interval + "' ) AND Time <= ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000) GROUP BY FROM_UNIXTIME( CEILING( Time/('" + x_axis_interval + "'*1000)) *'"+x_axis_interval+"', '%Y:%m:%d %h:%i')",applicationId, clusterId);
-        }
-        print(result);
-
-    }
-    catch (e) {
-        print(e.toString());
-    }
-    finally {
-        db.close();
-    }
-}());
-%>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/jaggery-files/member-info.jag
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/jaggery-files/member-info.jag b/extensions/das/metering-service/capps/jaggery-files/member-info.jag
deleted file mode 100644
index ed7f8e6..0000000
--- a/extensions/das/metering-service/capps/jaggery-files/member-info.jag
+++ /dev/null
@@ -1,70 +0,0 @@
-<%
-/*
- * 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.
- *
- */
-(function () {
-    var log = new Log();
-    var TABLE_NAME = "tableName";
-
-    var HTTP_INTERNAL_ERROR = 500;
-
-    var carbon = require('carbon');
-    var configs = require('/configs/designer.json');
-
-    var tableName = encodeURIComponent(request.getParameter(TABLE_NAME));
-    if (tableName == null) {
-        log.error("Table name param is not provided!");
-        response.status = HTTP_INTERNAL_ERROR;
-        print('{ "status": "Failed", "message": "Table name param is empty" }');
-        return;
-    }
-
-    var ALL_CLUSTERS = 'All Clusters';
-
-    var content = request.getContent();
-    var contentAsString = null;
-    if (content != '' && content != null) {
-        contentAsString = stringify(content);
-        if (log.isDebugEnabled()) {
-            log.debug("Value of content: " + contentAsString);
-        }
-    }
-
-    var db = new Database("WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB");
-
-    try {
-        var result;
-        var applicationId = request.getParameter("applicationId");
-        var clusterId = request.getParameter("clusterId");
-
-        if (clusterId == ALL_CLUSTERS) {
-            result = db.query("SELECT * FROM " + tableName + " WHERE MemberId IN (SELECT DISTINCT MemberId FROM ANALYTICS_PROCESSED_DATA_STORE.MEMBER_STATUS WHERE ApplicationId= ?)", applicationId);
-        } else {
-            result = db.query("SELECT * FROM " + tableName + " WHERE MemberId IN (SELECT DISTINCT MemberId FROM ANALYTICS_PROCESSED_DATA_STORE.MEMBER_STATUS WHERE ApplicationId= ? AND ClusterAlias= ?)", applicationId, clusterId);
-        }
-        print(result);
-    }
-    catch (e) {
-        print(e.toString());
-    }
-    finally {
-        db.close();
-    }
-}());
-%>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/jaggery-files/member-status.jag
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/jaggery-files/member-status.jag b/extensions/das/metering-service/capps/jaggery-files/member-status.jag
deleted file mode 100644
index be40e78..0000000
--- a/extensions/das/metering-service/capps/jaggery-files/member-status.jag
+++ /dev/null
@@ -1,90 +0,0 @@
-<%
-/*
- * 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.
- *
- */
-(function () {
-    var log = new Log();
-
-    var TABLE_NAME = "tableName";
-
-    var HTTP_INTERNAL_ERROR = 500;
-
-    var TIME_INTERVAL_1 = '30 Min';
-    var TIME_INTERVAL_2 = '1 Hour';
-    var TIME_INTERVAL_3 = '1 Day';
-    var TIME_INTERVAL_4 = '1 Week';
-    var TIME_INTERVAL_5 = '1 Month';
-    var ALL_CLUSTERS = 'All Clusters';
-
-    var carbon = require('carbon');
-    var configs = require('/configs/designer.json');
-
-    var tableName = encodeURIComponent(request.getParameter(TABLE_NAME));
-    if (tableName == null) {
-        log.error("Table name param is not provided!");
-        response.status = HTTP_INTERNAL_ERROR;
-        print('{ "status": "Failed", "message": "Table name param is empty" }');
-        return;
-    }
-
-    var content = request.getContent();
-    var contentAsString = null;
-    if (content != '' && content != null) {
-        contentAsString = stringify(content);
-        if (log.isDebugEnabled()) {
-            log.debug("Value of content: " + contentAsString);
-        }
-    }
-
-    var db = new Database("WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB");
-
-    try {
-        var result;
-
-        var timeInterval = request.getParameter("time");
-        var interval = 1800000;
-        if (timeInterval === TIME_INTERVAL_1) {
-            interval = 1800000;
-        } else if (timeInterval === TIME_INTERVAL_2) {
-            interval = 3600000;
-        } else if (timeInterval === TIME_INTERVAL_3) {
-            interval = 86400000;
-        } else if (timeInterval === TIME_INTERVAL_4) {
-            interval = 604800000;
-        } else if (timeInterval === TIME_INTERVAL_5) {
-            interval = 2419200000;
-        }
-        var applicationId = request.getParameter("applicationId");
-        var clusterId = request.getParameter("clusterId");
-
-        if (clusterId == ALL_CLUSTERS) {
-            result = db.query("SELECT FROM_UNIXTIME(Time/1000, '%Y:%m:%d %h:%i:%s') AS Time, MemberId, MemberStatus FROM " + tableName + " WHERE ApplicationId= ? AND Time > ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000-'" + interval + "' ) AND Time <= ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000) ORDER BY MemberID, Time", applicationId);
-        }else {
-            result = db.query("SELECT FROM_UNIXTIME(Time/1000, '%Y:%m:%d %h:%i:%s') AS Time, MemberId, MemberStatus FROM " + tableName + " WHERE ApplicationId= ? AND ClusterAlias= ? AND Time > ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000-'" + interval + "' ) AND Time <= ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000) ORDER BY MemberID, Time", applicationId, clusterId);
-        }
-        print(result);
-    }
-    catch (e) {
-        print(e.toString());
-    }
-    finally {
-        db.close();
-    }
-}());
-%>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/jaggery-files/schema.jag
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/jaggery-files/schema.jag b/extensions/das/metering-service/capps/jaggery-files/schema.jag
deleted file mode 100644
index 2d076d5..0000000
--- a/extensions/das/metering-service/capps/jaggery-files/schema.jag
+++ /dev/null
@@ -1,63 +0,0 @@
-<%
-/*
- * 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.
- *
- */
-(function () {
-    var log = new Log();
-
-    var TABLE_NAME = "tableName";
-
-    var HTTP_INTERNAL_ERROR = 500;
-
-    var carbon = require('carbon');
-    var configs = require('/configs/designer.json');
-
-    var tableName = encodeURIComponent(request.getParameter(TABLE_NAME));
-    if (tableName == null) {
-        log.error("Table name param is not provided!");
-        response.status = HTTP_INTERNAL_ERROR;
-        print('{ "status": "Failed", "message": "Table name param is empty" }');
-        return;
-    }
-
-    var content = request.getContent();
-    var contentAsString = null;
-    if (content != '' && content != null) {
-        contentAsString = stringify(content);
-        if (log.isDebugEnabled()) {
-            log.debug("Value of content: " + contentAsString);
-        }
-    }
-
-    var db = new Database("WSO2_ANALYTICS_PROCESSED_DATA_STORE_DB");
-
-    try {
-        var result = db.query("SELECT COLUMN_NAME,DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA='ANALYTICS_PROCESSED_DATA_STORE' AND TABLE_NAME = ?", tableName);
-        if (result != null) {
-            print(result);
-        }
-    }
-    catch (e) {
-        print(e.toString());
-    }
-    finally {
-        db.close();
-    }
-}());
-%>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/mysqlscript.sql
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/mysqlscript.sql b/extensions/das/metering-service/capps/mysqlscript.sql
deleted file mode 100644
index 71e7dc9..0000000
--- a/extensions/das/metering-service/capps/mysqlscript.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-CREATE DATABASE ANALYTICS_PROCESSED_DATA_STORE;
-CREATE TABLE ANALYTICS_PROCESSED_DATA_STORE.MEMBER_STATUS(Time long, ApplicationId VARCHAR(150), ClusterAlias VARCHAR(150), MemberId VARCHAR(150), MemberStatus VARCHAR(50));
-CREATE TABLE ANALYTICS_PROCESSED_DATA_STORE.MEMBER_COUNT(Time long, ApplicationId VARCHAR(150), ClusterAlias VARCHAR(150), CreatedInstanceCount int, InitializedInstanceCount int, ActiveInstanceCount int, TerminatedInstanceCount int);
-CREATE TABLE ANALYTICS_PROCESSED_DATA_STORE.MEMBER_INFORMATION(MemberId VARCHAR(150), InstanceType VARCHAR(150), ImageId VARCHAR(150), HostName VARCHAR(150), PrivateIPAddresses VARCHAR(150), PublicIPAddresses VARCHAR(150), Hypervisor VARCHAR(150), CPU VARCHAR(10) , RAM VARCHAR(10), OSName VARCHAR(150), OSVersion VARCHAR(150));

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/pom.xml b/extensions/das/metering-service/capps/pom.xml
deleted file mode 100644
index cc9a445..0000000
--- a/extensions/das/metering-service/capps/pom.xml
+++ /dev/null
@@ -1,72 +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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>apache-stratos-metering-service</artifactId>
-        <groupId>org.apache.stratos</groupId>
-        <version>4.1.4-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>metring-service-capps</artifactId>
-    <name>Stratos Metering Service - Composite Applications</name>
-    <packaging>pom</packaging>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>2.4.1</version>
-                <executions>
-                    <execution>
-                        <id>auto-clean</id>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.7</version>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <configuration>
-                            <target>
-                                <ant antfile="build.xml" target="zip"/>
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-
-</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/stratos-metering-service/Dashboard/artifact.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/Dashboard/artifact.xml b/extensions/das/metering-service/capps/stratos-metering-service/Dashboard/artifact.xml
deleted file mode 100644
index bd6d164..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/Dashboard/artifact.xml
+++ /dev/null
@@ -1,24 +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.
-
--->
-<artifact name="Dashboard" version="1.0.0" type="dashboards/dashboard" serverRole="DataAnalyticsServer">
-    <file>stratos-metering-dashboard.json</file>
-</artifact>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/stratos-metering-service/Dashboard/stratos-metering-dashboard.json
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/Dashboard/stratos-metering-dashboard.json b/extensions/das/metering-service/capps/stratos-metering-service/Dashboard/stratos-metering-dashboard.json
deleted file mode 100644
index 96413db..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/Dashboard/stratos-metering-dashboard.json
+++ /dev/null
@@ -1,267 +0,0 @@
-{
-  "id": "stratos-metering-dashboard",
-  "title": "Stratos Metering Dashboard",
-  "description": "This dashboard is to show metering data.",
-  "permissions": {
-    "viewers": [],
-    "editors": [
-      "Internal/everyone"
-    ]
-  },
-  "pages": [
-    {
-      "id": "member-status",
-      "title": "Member Status",
-      "layout": {
-        "id": "single-column",
-        "title": "Single Column",
-        "description": "This is a layout generated through single-column.io",
-        "thumbnail": "store://layout/single-column/index.png",
-        "url": "store://layout/single-column/index.hbs",
-        "content": "<!--\n\n Licensed to the Apache Software Foundation (ASF) under one\n or more contributor license agreements.  See the NOTICE file\n distributed with this work for additional information\n regarding copyright ownership.  The ASF licenses this file\n to you under the Apache License, Version 2.0 (the\n \"License\"); you may not use this file except in compliance\n with the License.  You may obtain a copy of the License at\n\n   http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing,\n software distributed under the License is distributed on an\n \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n KIND, either express or implied.  See the License for the\n specific language governing permissions and limitations\n under the License.\n\n-->\n<div class=\"container\">\n<div class=\"row\">\n    <div id=\"a\" class=\"col-md-12 ues-component-box\"></div>\n    <div id=\"b\" class=\"col-md-12 ues-component-box\"></div
 >\n    <div id=\"c\" class=\"col-md-12 ues-component-box\"></div>\n</div>\n</div>\n"
-      },
-      "content": {
-        "a": [
-          {
-            "id": "ehng97cyk3kxogvi",
-            "content": {
-              "id": "Member_Status_Filter",
-              "title": "Member Status Filter",
-              "type": "gadget",
-              "thumbnail": "store://gadget/Member_Status_Filter/index.png",
-              "data": {
-                "url": "store://gadget/Member_Status_Filter/index.xml"
-              },
-              "styles": {
-                "title": "",
-                "height": "100",
-                "borders": false,
-                "titlePosition": "left"
-              },
-              "notify": {
-                "member-status-filter": {
-                  "type": "address",
-                  "description": "This notifies time interval"
-                },
-                "cancel": {
-                  "type": "boolean",
-                  "description": "This notifies cancellation of state selection"
-                }
-              },
-              "options": {},
-              "settings": {}
-            }
-          }
-        ],
-        "b": [
-          {
-            "id": "q1pf6m8s5bq08uxr",
-            "content": {
-              "id": "Member_Count",
-              "title": "Member Count",
-              "type": "gadget",
-              "thumbnail": "local://store/carbon.super/gadget/usa-business-revenue/index.png",
-              "data": {
-                "url": "local://store/carbon.super/gadget/Member_Count/index.xml"
-              },
-              "listen": {
-                "member-status-filter": {
-                  "type": "address",
-                  "description": "Used to filter based on state",
-                  "on": [
-                    {
-                      "from": "ehng97cyk3kxogvi",
-                      "event": "member-status-filter"
-                    }
-                  ]
-                },
-                "auto-update": {
-                  "type": "boolean",
-                  "description": "Used to filter based on state",
-                  "on": []
-                }
-              },
-              "styles": {
-                "title": "",
-                "height": "400",
-                "borders": true,
-                "titlePosition": "left"
-              },
-              "options": {
-                "dataSource": {
-                  "type": "STRING",
-                  "title": "Data Source",
-                  "value": "/portal/gadgets/bar-chart/datasource/dataFile4.jag",
-                  "options": [],
-                  "required": false
-                },
-                "updateGraph": {
-                  "type": "STRING",
-                  "title": "Update Interval (s)",
-                  "value": "No",
-                  "options": [],
-                  "required": false
-                }
-              },
-              "settings": {}
-            }
-          }
-        ],
-        "c": [
-          {
-            "id": "qf9lnn9oiv1pds4i",
-            "content": {
-              "id": "Member_Update",
-              "title": "Member Status",
-              "type": "gadget",
-              "thumbnail": "local://store/carbon.super/gadget/usa-business-revenue/index.png",
-              "data": {
-                "url": "local://store/carbon.super/gadget/Member_Status/index.xml"
-              },
-              "listen": {
-                "member-status-filter": {
-                  "type": "address",
-                  "description": "Used to filter based on state",
-                  "on": [
-                    {
-                      "from": "ehng97cyk3kxogvi",
-                      "event": "member-status-filter"
-                    }
-                  ]
-                },
-                "auto-update": {
-                  "type": "boolean",
-                  "description": "Used to filter based on state",
-                  "on": []
-                }
-              },
-              "styles": {
-                "title": "",
-                "height": "800",
-                "borders": true,
-                "titlePosition": "left"
-              },
-              "options": {
-                "dataSource": {
-                  "type": "STRING",
-                  "title": "Data Source",
-                  "value": "/portal/gadgets/bar-chart/datasource/dataFile4.jag",
-                  "options": [],
-                  "required": false
-                },
-                "updateGraph": {
-                  "type": "STRING",
-                  "title": "Update Interval (s)",
-                  "value": "No",
-                  "options": [],
-                  "required": false
-                }
-              },
-              "settings": {}
-            }
-          }
-        ]
-      }
-    },
-    {
-      "id": "member-details",
-      "title": "Member Details",
-      "layout": {
-        "id": "single-column",
-        "title": "Single Column",
-        "description": "This is a layout generated through single-column.io",
-        "thumbnail": "store://layout/single-column/index.png",
-        "url": "store://layout/single-column/index.hbs",
-        "content": "<!--\n\n Licensed to the Apache Software Foundation (ASF) under one\n or more contributor license agreements.  See the NOTICE file\n distributed with this work for additional information\n regarding copyright ownership.  The ASF licenses this file\n to you under the Apache License, Version 2.0 (the\n \"License\"); you may not use this file except in compliance\n with the License.  You may obtain a copy of the License at\n\n   http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing,\n software distributed under the License is distributed on an\n \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n KIND, either express or implied.  See the License for the\n specific language governing permissions and limitations\n under the License.\n\n-->\n<div class=\"container\">\n<div class=\"row\">\n    <div id=\"a\" class=\"col-md-12 ues-component-box\"></div>\n    <div id=\"b\" class=\"col-md-12 ues-component-box\"></div
 >\n    <div id=\"c\" class=\"col-md-12 ues-component-box\"></div>\n</div>\n</div>\n"
-      },
-      "content": {
-        "a": [
-          {
-            "id": "8zgl65uoackgldi",
-            "content": {
-              "id": "Member_Details_Filter",
-              "title": "Member Details Filter",
-              "type": "gadget",
-              "thumbnail": "store://gadget/Member_Details_Filter/index.png",
-              "data": {
-                "url": "store://gadget/Member_Details_Filter/index.xml"
-              },
-              "styles": {
-                "title": "",
-                "height": "100",
-                "borders": false,
-                "titlePosition": "left"
-              },
-              "notify": {
-                "member-details-filter": {
-                  "type": "address",
-                  "description": "This notifies applicationId and clusterId"
-                }
-              },
-              "cancel": {
-                "type": "boolean",
-                "description": "This notifies cancellation of state selection"
-              },
-              "options": {},
-              "settings": {}
-            }
-          }
-        ],
-        "b": [
-          {
-            "id": "hoqfz4b6z91nstt9",
-            "content": {
-              "id": "Member_Details",
-              "title": "Member Details",
-              "type": "gadget",
-              "thumbnail": "local://store/carbon.super/gadget/usa-business-revenue/index.png",
-              "data": {
-                "url": "local://store/carbon.super/gadget/Member_Information/index.xml"
-              },
-              "listen": {
-                "member-details-filter": {
-                  "type": "address",
-                  "description": "Used to filter based on state",
-                  "on": [
-                    {
-                      "from": "8zgl65uoackgldi",
-                      "event": "member-details-filter"
-                    }
-                  ]
-                },
-                "auto-update": {
-                  "type": "boolean",
-                  "description": "Used to filter based on state"
-                }
-              },
-              "styles": {
-                "title": "",
-                "height": "800",
-                "borders": true,
-                "titlePosition": "left"
-              },
-              "options": {
-                "dataSource": {
-                  "type": "STRING",
-                  "title": "Data Source",
-                  "value": "/portal/gadgets/bar-chart/datasource/dataFile4.jag",
-                  "options": [],
-                  "required": false
-                },
-                "updateGraph": {
-                  "type": "STRING",
-                  "title": "Update Interval (s)",
-                  "value": "No",
-                  "options": [],
-                  "required": false
-                }
-              },
-              "settings": {}
-            }
-          }
-        ]
-      }
-    }
-  ],
-  "landing": "member-status"
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_MemberInfo/MemberInfoEventReceiver.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_MemberInfo/MemberInfoEventReceiver.xml b/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_MemberInfo/MemberInfoEventReceiver.xml
deleted file mode 100644
index 509788e..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_MemberInfo/MemberInfoEventReceiver.xml
+++ /dev/null
@@ -1,29 +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.
-
--->
-<eventReceiver name="MemberInfoEventReceiver" statistics="disable"
-               trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
-    <from eventAdapterType="wso2event">
-        <property name="events.duplicated.in.cluster">false</property>
-    </from>
-    <mapping customMapping="disable" type="wso2event"/>
-    <to streamName="member_info" version="1.0.0"/>
-</eventReceiver>

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_MemberInfo/artifact.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_MemberInfo/artifact.xml b/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_MemberInfo/artifact.xml
deleted file mode 100644
index 388b225..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_MemberInfo/artifact.xml
+++ /dev/null
@@ -1,24 +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.
-
--->
-<artifact name="EventReceiver_MemberInfo" version="1.0.0" type="event/receiver" serverRole="DataAnalyticsServer">
-    <file>MemberInfoEventReceiver.xml</file>
-</artifact>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_MemberLifecycle/MemberLifecycleEventReceiver.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_MemberLifecycle/MemberLifecycleEventReceiver.xml b/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_MemberLifecycle/MemberLifecycleEventReceiver.xml
deleted file mode 100644
index 146a5bc..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_MemberLifecycle/MemberLifecycleEventReceiver.xml
+++ /dev/null
@@ -1,29 +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.
-
--->
-<eventReceiver name="MemberLifecycleEventReceiver" statistics="disable"
-               trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
-    <from eventAdapterType="wso2event">
-        <property name="events.duplicated.in.cluster">false</property>
-    </from>
-    <mapping customMapping="disable" type="wso2event"/>
-    <to streamName="member_lifecycle" version="1.0.0"/>
-</eventReceiver>

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_MemberLifecycle/artifact.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_MemberLifecycle/artifact.xml b/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_MemberLifecycle/artifact.xml
deleted file mode 100644
index be65f9e..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/EventReceiver_MemberLifecycle/artifact.xml
+++ /dev/null
@@ -1,24 +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.
-
--->
-<artifact name="EventReceiver_MemberLifecycle" version="1.0.0" type="event/receiver" serverRole="DataAnalyticsServer">
-    <file>MemberLifecycleEventReceiver.xml</file>
-</artifact>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/stratos-metering-service/EventStore_MemberInfo/artifact.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/EventStore_MemberInfo/artifact.xml b/extensions/das/metering-service/capps/stratos-metering-service/EventStore_MemberInfo/artifact.xml
deleted file mode 100644
index 9804c9d..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/EventStore_MemberInfo/artifact.xml
+++ /dev/null
@@ -1,24 +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.
-
--->
-<artifact name="EventStore_MemberInfo" version="1.0.0" type="analytics/eventstore" serverRole="DataAnalyticsServer">
-    <file>member_info.xml</file>
-</artifact>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/stratos-metering-service/EventStore_MemberInfo/member_info.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/EventStore_MemberInfo/member_info.xml b/extensions/das/metering-service/capps/stratos-metering-service/EventStore_MemberInfo/member_info.xml
deleted file mode 100644
index 8b33298..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/EventStore_MemberInfo/member_info.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- 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.
-
--->
-<EventStoreConfiguration>
-    <TableSchema>
-        <ColumnDefinition>
-            <Name>member_id</Name>
-            <EnableIndexing>true</EnableIndexing>
-            <IsPrimaryKey>true</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>instance_type</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>scaling_decision_id</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>is_multi_tenant</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>private_IP_addresses</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>public_IP_addresses</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>allocated_IP_addresses</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>host_name</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>hypervisor</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>cpu</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>ram</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>image_id</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>login_port</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>INTEGER</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>os_name</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>os_version</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>os_architecture</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>is_64bit_os</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>BOOLEAN</Type>
-        </ColumnDefinition>
-    </TableSchema>
-    <Source>
-        <StreamId>member_info:1.0.0</StreamId>
-    </Source>
-    <RecordStoreName>EVENT_STORE</RecordStoreName>
-</EventStoreConfiguration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/stratos-metering-service/EventStore_MemberLifecycle/artifact.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/EventStore_MemberLifecycle/artifact.xml b/extensions/das/metering-service/capps/stratos-metering-service/EventStore_MemberLifecycle/artifact.xml
deleted file mode 100644
index 49b6260..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/EventStore_MemberLifecycle/artifact.xml
+++ /dev/null
@@ -1,24 +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.
-
--->
-<artifact name="EventStore_MemberLifecycle" version="1.0.0" type="analytics/eventstore" serverRole="DataAnalyticsServer">
-    <file>member_lifecycle.xml</file>
-</artifact>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/stratos-metering-service/EventStore_MemberLifecycle/member_lifecycle.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/EventStore_MemberLifecycle/member_lifecycle.xml b/extensions/das/metering-service/capps/stratos-metering-service/EventStore_MemberLifecycle/member_lifecycle.xml
deleted file mode 100644
index bf3b220..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/EventStore_MemberLifecycle/member_lifecycle.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- 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.
-
--->
-<EventStoreConfiguration>
-    <TableSchema>
-        <ColumnDefinition>
-            <Name>timestamp</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>LONG</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>application_id</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>cluster_id</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>cluster_alias</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>cluster_instance_id</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>service_name</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>network_partition_id</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>partition_id</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>member_id</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-        <ColumnDefinition>
-            <Name>member_status</Name>
-            <EnableIndexing>false</EnableIndexing>
-            <IsPrimaryKey>false</IsPrimaryKey>
-            <EnableScoreParam>false</EnableScoreParam>
-            <Type>STRING</Type>
-        </ColumnDefinition>
-    </TableSchema>
-    <Source>
-        <StreamId>member_lifecycle:1.0.0</StreamId>
-    </Source>
-    <RecordStoreName>EVENT_STORE</RecordStoreName>
-</EventStoreConfiguration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/stratos-metering-service/EventStream_MemberInfo/artifact.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/EventStream_MemberInfo/artifact.xml b/extensions/das/metering-service/capps/stratos-metering-service/EventStream_MemberInfo/artifact.xml
deleted file mode 100644
index 17d3e30..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/EventStream_MemberInfo/artifact.xml
+++ /dev/null
@@ -1,24 +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.
-
--->
-<artifact name="EventStream_MemberInfo" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
-    <file>member_info_1.0.0.json</file>
-</artifact>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/stratos-metering-service/EventStream_MemberInfo/member_info_1.0.0.json
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/EventStream_MemberInfo/member_info_1.0.0.json b/extensions/das/metering-service/capps/stratos-metering-service/EventStream_MemberInfo/member_info_1.0.0.json
deleted file mode 100644
index d0b89a6..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/EventStream_MemberInfo/member_info_1.0.0.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "name": "member_info",
-  "version": "1.0.0",
-  "nickName": "Member Information",
-  "description": "Member Information",
-  "payloadData": [
-    {
-      "name": "member_id",
-      "type": "STRING"
-    },
-    {
-      "name": "instance_type",
-      "type": "STRING"
-    },
-    {
-      "name": "scaling_decision_id",
-      "type": "STRING"
-    },
-    {
-      "name": "is_multi_tenant",
-      "type": "STRING"
-    },
-    {
-      "name": "private_IP_addresses",
-      "type": "STRING"
-    },
-    {
-      "name": "public_IP_addresses",
-      "type": "STRING"
-    },
-    {
-      "name": "allocated_IP_addresses",
-      "type": "STRING"
-    },
-    {
-      "name": "host_name",
-      "type": "STRING"
-    },
-    {
-      "name": "hypervisor",
-      "type": "STRING"
-    },
-    {
-      "name": "cpu",
-      "type": "STRING"
-    },
-    {
-      "name": "ram",
-      "type": "STRING"
-    },
-    {
-      "name": "image_id",
-      "type": "STRING"
-    },
-    {
-      "name": "login_port",
-      "type": "INT"
-    },
-    {
-      "name": "os_name",
-      "type": "STRING"
-    },
-    {
-      "name": "os_version",
-      "type": "STRING"
-    },
-    {
-      "name": "os_architecture",
-      "type": "STRING"
-    },
-    {
-      "name": "is_64bit_os",
-      "type": "BOOL"
-    }
-  ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/stratos-metering-service/EventStream_MemberLifecycle/artifact.xml
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/EventStream_MemberLifecycle/artifact.xml b/extensions/das/metering-service/capps/stratos-metering-service/EventStream_MemberLifecycle/artifact.xml
deleted file mode 100644
index 8c97790..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/EventStream_MemberLifecycle/artifact.xml
+++ /dev/null
@@ -1,24 +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.
-
--->
-<artifact name="EventStream_MemberLifecycle" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
-    <file>member_lifecycle_1.0.0.json</file>
-</artifact>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/53c98dd9/extensions/das/metering-service/capps/stratos-metering-service/EventStream_MemberLifecycle/member_lifecycle_1.0.0.json
----------------------------------------------------------------------
diff --git a/extensions/das/metering-service/capps/stratos-metering-service/EventStream_MemberLifecycle/member_lifecycle_1.0.0.json b/extensions/das/metering-service/capps/stratos-metering-service/EventStream_MemberLifecycle/member_lifecycle_1.0.0.json
deleted file mode 100644
index 4e6699a..0000000
--- a/extensions/das/metering-service/capps/stratos-metering-service/EventStream_MemberLifecycle/member_lifecycle_1.0.0.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "name": "member_lifecycle",
-  "version": "1.0.0",
-  "nickName": "Member Lifecycle",
-  "description": "Member Lifecycle",
-  "payloadData": [
-    {
-      "name": "timestamp",
-      "type": "LONG"
-    },
-    {
-      "name": "application_id",
-      "type": "STRING"
-    },
-    {
-      "name": "cluster_id",
-      "type": "STRING"
-    },
-    {
-      "name": "cluster_alias",
-      "type": "STRING"
-    },
-    {
-      "name": "cluster_instance_id",
-      "type": "STRING"
-    },
-    {
-      "name": "service_name",
-      "type": "STRING"
-    },
-    {
-      "name": "network_partition_id",
-      "type": "STRING"
-    },
-    {
-      "name": "partition_id",
-      "type": "STRING"
-    },
-    {
-      "name": "member_id",
-      "type": "STRING"
-    },
-    {
-      "name": "member_status",
-      "type": "STRING"
-    }
-  ]
-}
\ No newline at end of file