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/12/17 12:38:00 UTC

[1/4] Rename CEP extention folder names

Updated Branches:
  refs/heads/master ea1804c9e -> 8c20289e7


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/stream-definitions/stream-manager-config.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/stream-definitions/stream-manager-config.xml b/extensions/cep/artifacts/stream-definitions/stream-manager-config.xml
deleted file mode 100755
index 7aa5bfb..0000000
--- a/extensions/cep/artifacts/stream-definitions/stream-manager-config.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<streamManagerConfiguration xmlns="http://wso2.org/carbon/streammanager">
-    <!-- in-flight requests stream definitions start -->
-    <streamDefinition name="in_flight_requests" version="1.0.0">
-         <description>in-flight request count</description>
-         <nickName>in-flight requests</nickName>
-         <metaData>
-         </metaData>
-         <correlationData>
-         </correlationData>
-         <payloadData>
-             <property name="cluster_id" type="String"/>
-             <property name="network_partition_id" type="String"/>
-             <property name="in_flight_request_count" type="int"/>
-         </payloadData>
-     </streamDefinition> 
-
-    <streamDefinition name="gradient_in_flight_requests" version="1.0.0">
-         <description>gradient of in flight request count</description>
-         <nickName>gradient in flight requests</nickName>
-         <metaData>
-         </metaData>
-         <correlationData>
-         </correlationData>
-         <payloadData>
-             <property name="cluster_id" type="String"/>
-             <property name="network_partition_id" type="String"/>
-             <property name="count" type="double"/>
-         </payloadData>
-     </streamDefinition>
-
-    <streamDefinition name="average_in_flight_requests" version="1.0.0">
-         <description>average of in-flight request count</description>
-         <nickName>average in-flight requests</nickName>
-         <metaData>
-         </metaData>
-         <correlationData>
-         </correlationData>
-         <payloadData>
-             <property name="cluster_id" type="String"/>
-             <property name="network_partition_id" type="String"/>
-             <property name="count" type="double"/>
-         </payloadData>
-     </streamDefinition> 
-
-    <streamDefinition name="second_derivative_in_flight_requests" version="1.0.0">
-         <description>second derivative of in-flight request count</description>
-         <nickName>second derivative in-flight requests</nickName>
-         <metaData>
-         </metaData>
-         <correlationData>
-         </correlationData>
-         <payloadData>
-             <property name="cluster_id" type="String"/>
-             <property name="network_partition_id" type="String"/>
-             <property name="count" type="double"/>
-         </payloadData>
-    </streamDefinition>
-    <!-- in-flight requests stream definitions end -->
-
-    <!-- cartridge agent health stats stream definitions start -->
-    <streamDefinition name="cartridge_agent_health_stats" version="1.0.0">
-         <description>agent health stats</description>
-         <nickName>agent health stats</nickName>
-         <metaData>
-         </metaData>
-         <correlationData>
-         </correlationData>
-         <payloadData>
-	     <property name="cluster_id" type="String" />
-             <property name="network_partition_id" type="String"/>
-             <property name="member_id" type="String" />
-             <property name="partition_id" type="String" />
-             <property name="health_description" type="String"/>
-             <property name="value" type="double"/>
-         </payloadData>
-     </streamDefinition>
-
-    <streamDefinition name="average_load_average_stats" version="1.0.0">
-         <description>average load average stats</description>
-         <nickName>average load average stats</nickName>
-         <metaData>
-         </metaData>
-         <correlationData>
-         </correlationData>
-         <payloadData>
-	     <property name="cluster_id" type="String" />
-             <property name="network_partition_id" type="String"/>
-             <property name="average_load_average" type="double"/>
-         </payloadData>
-     </streamDefinition>
-
-    <streamDefinition name="average_memory_consumption_stats" version="1.0.0">
-         <description>average memory consumption stats</description>
-         <nickName>average memory consumption stats</nickName>
-         <metaData>
-         </metaData>
-         <correlationData>
-         </correlationData>
-         <payloadData>
-             <property name="cluster_id" type="String"/>
-             <property name="network_partition_id" type="String"/>
-             <property name="average_memory_consumption" type="double"/>
-         </payloadData>
-     </streamDefinition>
-
-    <streamDefinition name="gradient_load_average_stats" version="1.0.0">
-         <description>gradient load average stats</description>
-         <nickName>gradient load average stats</nickName>
-         <metaData>
-         </metaData>
-         <correlationData>
-         </correlationData>
-         <payloadData>
-	     <property name="cluster_id" type="String" />
-             <property name="network_partition_id" type="String"/>
-             <property name="gradient_load_average" type="double"/>
-         </payloadData>
-     </streamDefinition>
-
-    <streamDefinition name="gradient_memory_consumption_stats" version="1.0.0">
-         <description>gradient memoryconsumption stats</description>
-         <nickName>gradient memoryconsumption stats</nickName>
-         <metaData>
-         </metaData>
-         <correlationData>
-         </correlationData>
-         <payloadData>
-	     <property name="cluster_id" type="String" />
-             <property name="network_partition_id" type="String"/>
-             <property name="gradient_memory_consumption" type="double"/>
-         </payloadData>
-     </streamDefinition>
-
-    <streamDefinition name="second_derivative_memory_consumption_stats" version="1.0.0">
-         <description>second derivative memory consumption stats</description>
-         <nickName>second derivative memory consumption stats</nickName>
-         <metaData>
-         </metaData>
-         <correlationData>
-         </correlationData>
-         <payloadData>
-	     <property name="cluster_id" type="String" />
-             <property name="network_partition_id" type="String"/>
-             <property name="second_derivative_memory_consumption" type="double"/>
-         </payloadData>
-     </streamDefinition>
-
-    <streamDefinition name="second_derivative_load_average_stats" version="1.0.0">
-         <description>second derivative load average stats</description>
-         <nickName>second derivative load average stats</nickName>
-         <metaData>
-         </metaData>
-         <correlationData>
-         </correlationData>
-         <payloadData>
-	     <property name="cluster_id" type="String" />
-             <property name="network_partition_id" type="String"/>
-             <property name="second_derivative_load_average" type="double"/>
-         </payloadData>
-     </streamDefinition>
-
-    <streamDefinition name="fault_message" version="1.0.0">
-         <description>fault message</description>
-         <nickName>fault message</nickName>
-         <metaData>
-         </metaData>
-         <correlationData>
-         </correlationData>
-         <payloadData>
-             <property name="cluster_id" type="String"/>
-             <property name="network_partition_id" type="String"/>
-             <property name="member_id" type="String"/>
-             <property name="partition_id" type="String"/>
-         </payloadData>
-    </streamDefinition>
-    <!-- cartridge agent health stats stream definitions end -->
-
-    <!-- This is for member_id wise grouping-->
-    <streamDefinition name="member_average_load_average_stats" version="1.0.0">
-         <description>average load average stats</description>
-         <nickName>average load average stats</nickName>
-         <metaData>
-         </metaData>
-         <correlationData>
-         </correlationData>
-         <payloadData>
-             <property name="member_id" type="String" />
-             <property name="cluster_id" type="String" />
-             <property name="network_partition_id" type="String"/>
-             <property name="member_average_load_average" type="double"/>
-         </payloadData>
-     </streamDefinition>
-
-    <streamDefinition name="member_average_memory_consumption_stats" version="1.0.0">
-         <description>average memory consumption stats</description>
-         <nickName>average memory consumption stats</nickName>
-         <metaData>
-         </metaData>
-         <correlationData>
-         </correlationData>
-         <payloadData>
-             <property name="member_id" type="String"/>
-             <property name="cluster_id" type="String"/>
-             <property name="network_partition_id" type="String"/>
-             <property name="member_average_memory_consumption" type="double"/>
-         </payloadData>
-     </streamDefinition>
-
-    <streamDefinition name="member_gradient_load_average_stats" version="1.0.0">
-         <description>gradient load average stats</description>
-         <nickName>gradient load average stats</nickName>
-         <metaData>
-         </metaData>
-         <correlationData>
-         </correlationData>
-         <payloadData>
-             <property name="member_id" type="String" />
-             <property name="cluster_id" type="String" />
-             <property name="network_partition_id" type="String"/>
-             <property name="member_gradient_load_average" type="double"/>
-         </payloadData>
-     </streamDefinition>
-
-    <streamDefinition name="member_gradient_memory_consumption_stats" version="1.0.0">
-         <description>gradient memoryconsumption stats</description>
-         <nickName>gradient memoryconsumption stats</nickName>
-         <metaData>
-         </metaData>
-         <correlationData>
-         </correlationData>
-         <payloadData>
-             <property name="member_id" type="String" />
-             <property name="cluster_id" type="String" />
-             <property name="network_partition_id" type="String"/>
-             <property name="member_gradient_memory_consumption" type="double"/>
-         </payloadData>
-     </streamDefinition>
-
-    <streamDefinition name="member_second_derivative_memory_consumption_stats" version="1.0.0">
-         <description>second derivative memory consumption stats</description>
-         <nickName>second derivative memory consumption stats</nickName>
-         <metaData>
-         </metaData>
-         <correlationData>
-         </correlationData>
-         <payloadData>
-             <property name="member_id" type="String" />
-             <property name="cluster_id" type="String" />
-             <property name="network_partition_id" type="String"/>
-             <property name="member_second_derivative_memory_consumption" type="double"/>
-         </payloadData>
-     </streamDefinition>
-
-    <streamDefinition name="member_second_derivative_load_average_stats" version="1.0.0">
-         <description>second derivative load average stats</description>
-         <nickName>second derivative load average stats</nickName>
-         <metaData>
-         </metaData>
-         <correlationData>
-         </correlationData>
-         <payloadData>
-             <property name="member_id" type="String" />
-             <property name="cluster_id" type="String" />
-             <property name="network_partition_id" type="String"/>
-             <property name="member_second_derivative_load_average" type="double"/>
-         </payloadData>
-     </streamDefinition>
-
-</streamManagerConfiguration>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/streamdefinitions/stream-manager-config.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/streamdefinitions/stream-manager-config.xml b/extensions/cep/artifacts/streamdefinitions/stream-manager-config.xml
new file mode 100755
index 0000000..7aa5bfb
--- /dev/null
+++ b/extensions/cep/artifacts/streamdefinitions/stream-manager-config.xml
@@ -0,0 +1,269 @@
+<streamManagerConfiguration xmlns="http://wso2.org/carbon/streammanager">
+    <!-- in-flight requests stream definitions start -->
+    <streamDefinition name="in_flight_requests" version="1.0.0">
+         <description>in-flight request count</description>
+         <nickName>in-flight requests</nickName>
+         <metaData>
+         </metaData>
+         <correlationData>
+         </correlationData>
+         <payloadData>
+             <property name="cluster_id" type="String"/>
+             <property name="network_partition_id" type="String"/>
+             <property name="in_flight_request_count" type="int"/>
+         </payloadData>
+     </streamDefinition> 
+
+    <streamDefinition name="gradient_in_flight_requests" version="1.0.0">
+         <description>gradient of in flight request count</description>
+         <nickName>gradient in flight requests</nickName>
+         <metaData>
+         </metaData>
+         <correlationData>
+         </correlationData>
+         <payloadData>
+             <property name="cluster_id" type="String"/>
+             <property name="network_partition_id" type="String"/>
+             <property name="count" type="double"/>
+         </payloadData>
+     </streamDefinition>
+
+    <streamDefinition name="average_in_flight_requests" version="1.0.0">
+         <description>average of in-flight request count</description>
+         <nickName>average in-flight requests</nickName>
+         <metaData>
+         </metaData>
+         <correlationData>
+         </correlationData>
+         <payloadData>
+             <property name="cluster_id" type="String"/>
+             <property name="network_partition_id" type="String"/>
+             <property name="count" type="double"/>
+         </payloadData>
+     </streamDefinition> 
+
+    <streamDefinition name="second_derivative_in_flight_requests" version="1.0.0">
+         <description>second derivative of in-flight request count</description>
+         <nickName>second derivative in-flight requests</nickName>
+         <metaData>
+         </metaData>
+         <correlationData>
+         </correlationData>
+         <payloadData>
+             <property name="cluster_id" type="String"/>
+             <property name="network_partition_id" type="String"/>
+             <property name="count" type="double"/>
+         </payloadData>
+    </streamDefinition>
+    <!-- in-flight requests stream definitions end -->
+
+    <!-- cartridge agent health stats stream definitions start -->
+    <streamDefinition name="cartridge_agent_health_stats" version="1.0.0">
+         <description>agent health stats</description>
+         <nickName>agent health stats</nickName>
+         <metaData>
+         </metaData>
+         <correlationData>
+         </correlationData>
+         <payloadData>
+	     <property name="cluster_id" type="String" />
+             <property name="network_partition_id" type="String"/>
+             <property name="member_id" type="String" />
+             <property name="partition_id" type="String" />
+             <property name="health_description" type="String"/>
+             <property name="value" type="double"/>
+         </payloadData>
+     </streamDefinition>
+
+    <streamDefinition name="average_load_average_stats" version="1.0.0">
+         <description>average load average stats</description>
+         <nickName>average load average stats</nickName>
+         <metaData>
+         </metaData>
+         <correlationData>
+         </correlationData>
+         <payloadData>
+	     <property name="cluster_id" type="String" />
+             <property name="network_partition_id" type="String"/>
+             <property name="average_load_average" type="double"/>
+         </payloadData>
+     </streamDefinition>
+
+    <streamDefinition name="average_memory_consumption_stats" version="1.0.0">
+         <description>average memory consumption stats</description>
+         <nickName>average memory consumption stats</nickName>
+         <metaData>
+         </metaData>
+         <correlationData>
+         </correlationData>
+         <payloadData>
+             <property name="cluster_id" type="String"/>
+             <property name="network_partition_id" type="String"/>
+             <property name="average_memory_consumption" type="double"/>
+         </payloadData>
+     </streamDefinition>
+
+    <streamDefinition name="gradient_load_average_stats" version="1.0.0">
+         <description>gradient load average stats</description>
+         <nickName>gradient load average stats</nickName>
+         <metaData>
+         </metaData>
+         <correlationData>
+         </correlationData>
+         <payloadData>
+	     <property name="cluster_id" type="String" />
+             <property name="network_partition_id" type="String"/>
+             <property name="gradient_load_average" type="double"/>
+         </payloadData>
+     </streamDefinition>
+
+    <streamDefinition name="gradient_memory_consumption_stats" version="1.0.0">
+         <description>gradient memoryconsumption stats</description>
+         <nickName>gradient memoryconsumption stats</nickName>
+         <metaData>
+         </metaData>
+         <correlationData>
+         </correlationData>
+         <payloadData>
+	     <property name="cluster_id" type="String" />
+             <property name="network_partition_id" type="String"/>
+             <property name="gradient_memory_consumption" type="double"/>
+         </payloadData>
+     </streamDefinition>
+
+    <streamDefinition name="second_derivative_memory_consumption_stats" version="1.0.0">
+         <description>second derivative memory consumption stats</description>
+         <nickName>second derivative memory consumption stats</nickName>
+         <metaData>
+         </metaData>
+         <correlationData>
+         </correlationData>
+         <payloadData>
+	     <property name="cluster_id" type="String" />
+             <property name="network_partition_id" type="String"/>
+             <property name="second_derivative_memory_consumption" type="double"/>
+         </payloadData>
+     </streamDefinition>
+
+    <streamDefinition name="second_derivative_load_average_stats" version="1.0.0">
+         <description>second derivative load average stats</description>
+         <nickName>second derivative load average stats</nickName>
+         <metaData>
+         </metaData>
+         <correlationData>
+         </correlationData>
+         <payloadData>
+	     <property name="cluster_id" type="String" />
+             <property name="network_partition_id" type="String"/>
+             <property name="second_derivative_load_average" type="double"/>
+         </payloadData>
+     </streamDefinition>
+
+    <streamDefinition name="fault_message" version="1.0.0">
+         <description>fault message</description>
+         <nickName>fault message</nickName>
+         <metaData>
+         </metaData>
+         <correlationData>
+         </correlationData>
+         <payloadData>
+             <property name="cluster_id" type="String"/>
+             <property name="network_partition_id" type="String"/>
+             <property name="member_id" type="String"/>
+             <property name="partition_id" type="String"/>
+         </payloadData>
+    </streamDefinition>
+    <!-- cartridge agent health stats stream definitions end -->
+
+    <!-- This is for member_id wise grouping-->
+    <streamDefinition name="member_average_load_average_stats" version="1.0.0">
+         <description>average load average stats</description>
+         <nickName>average load average stats</nickName>
+         <metaData>
+         </metaData>
+         <correlationData>
+         </correlationData>
+         <payloadData>
+             <property name="member_id" type="String" />
+             <property name="cluster_id" type="String" />
+             <property name="network_partition_id" type="String"/>
+             <property name="member_average_load_average" type="double"/>
+         </payloadData>
+     </streamDefinition>
+
+    <streamDefinition name="member_average_memory_consumption_stats" version="1.0.0">
+         <description>average memory consumption stats</description>
+         <nickName>average memory consumption stats</nickName>
+         <metaData>
+         </metaData>
+         <correlationData>
+         </correlationData>
+         <payloadData>
+             <property name="member_id" type="String"/>
+             <property name="cluster_id" type="String"/>
+             <property name="network_partition_id" type="String"/>
+             <property name="member_average_memory_consumption" type="double"/>
+         </payloadData>
+     </streamDefinition>
+
+    <streamDefinition name="member_gradient_load_average_stats" version="1.0.0">
+         <description>gradient load average stats</description>
+         <nickName>gradient load average stats</nickName>
+         <metaData>
+         </metaData>
+         <correlationData>
+         </correlationData>
+         <payloadData>
+             <property name="member_id" type="String" />
+             <property name="cluster_id" type="String" />
+             <property name="network_partition_id" type="String"/>
+             <property name="member_gradient_load_average" type="double"/>
+         </payloadData>
+     </streamDefinition>
+
+    <streamDefinition name="member_gradient_memory_consumption_stats" version="1.0.0">
+         <description>gradient memoryconsumption stats</description>
+         <nickName>gradient memoryconsumption stats</nickName>
+         <metaData>
+         </metaData>
+         <correlationData>
+         </correlationData>
+         <payloadData>
+             <property name="member_id" type="String" />
+             <property name="cluster_id" type="String" />
+             <property name="network_partition_id" type="String"/>
+             <property name="member_gradient_memory_consumption" type="double"/>
+         </payloadData>
+     </streamDefinition>
+
+    <streamDefinition name="member_second_derivative_memory_consumption_stats" version="1.0.0">
+         <description>second derivative memory consumption stats</description>
+         <nickName>second derivative memory consumption stats</nickName>
+         <metaData>
+         </metaData>
+         <correlationData>
+         </correlationData>
+         <payloadData>
+             <property name="member_id" type="String" />
+             <property name="cluster_id" type="String" />
+             <property name="network_partition_id" type="String"/>
+             <property name="member_second_derivative_memory_consumption" type="double"/>
+         </payloadData>
+     </streamDefinition>
+
+    <streamDefinition name="member_second_derivative_load_average_stats" version="1.0.0">
+         <description>second derivative load average stats</description>
+         <nickName>second derivative load average stats</nickName>
+         <metaData>
+         </metaData>
+         <correlationData>
+         </correlationData>
+         <payloadData>
+             <property name="member_id" type="String" />
+             <property name="cluster_id" type="String" />
+             <property name="network_partition_id" type="String"/>
+             <property name="member_second_derivative_load_average" type="double"/>
+         </payloadData>
+     </streamDefinition>
+
+</streamManagerConfiguration>


[4/4] git commit: Remove lb related configurations

Posted by ma...@apache.org.
Remove lb related configurations

Signed-off-by: Manula Thantriwatte <ma...@apache.org>


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

Branch: refs/heads/master
Commit: 8c20289e7c7c40f0e02b069c2e88982d47ffbc17
Parents: baba9d2
Author: Dinesh Bandara <di...@wso2.com>
Authored: Tue Dec 17 14:33:55 2013 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Tue Dec 17 17:06:29 2013 +0530

----------------------------------------------------------------------
 tools/stratos-installer/conf/setup.conf         | 14 +---
 .../repository/conf/cartridge-config.properties |  8 +-
 tools/stratos-installer/setup.sh                | 77 ++------------------
 tools/stratos-installer/start-servers.sh        | 19 +----
 4 files changed, 16 insertions(+), 102 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8c20289e/tools/stratos-installer/conf/setup.conf
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/conf/setup.conf b/tools/stratos-installer/conf/setup.conf
index 5280294..630dec3 100644
--- a/tools/stratos-installer/conf/setup.conf
+++ b/tools/stratos-installer/conf/setup.conf
@@ -61,7 +61,6 @@ export mb_hostname="mb.$stratos_domain"
 export cep_hostname="cep.$stratos_domain"
 export sm_hostname="$stratos_domain"
 export cc_hostname="cc.$stratos_domain"
-export lb_hostname="lb.$stratos_domain"
 export as_hostname="as.$stratos_domain"
 
 export resource_path=$setup_path/resources
@@ -89,18 +88,6 @@ export cep_mb_listen_port=$((5672 + $mb_port_offset))
 
 
 # ----------------------------------------------------------------------------
-# LB configuration
-# ----------------------------------------------------------------------------
-export lb_path=$stratos_path/"apache-stratos-load-balancer-4.0.0-SNAPSHOT"
-export lb_pack_path=$stratos_pack_path/"apache-stratos-load-balancer-4.0.0-SNAPSHOT.zip"
-
-export lb_mb_ip=$mb_ip
-export lb_mb_listen_port=$((5672 + $mb_port_offset))
-export lb_cep_ip=$cep_ip
-export lb_cep_tcp_port=$((7611 + $cep_port_offset))
-
-
-# ----------------------------------------------------------------------------
 # CC configuration
 # ----------------------------------------------------------------------------
 export cc_path=$stratos_path/"apache-stratos-cc-4.0.0-SNAPSHOT"
@@ -179,6 +166,7 @@ export stratos_foundation_db_pass="mysql"
 
 export sm_mb_listen_port=$((5672 + $mb_port_offset))
 export sm_cc_https_port=$((9443 + $cc_port_offset))
+export sm_as_https_port=$((9443 + $as_port_offset))
 export sm_https_port=$((9443 + $sm_port_offset))
 export sm_http_port=$((9763 + $sm_port_offset))
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8c20289e/tools/stratos-installer/config/sm/repository/conf/cartridge-config.properties
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/config/sm/repository/conf/cartridge-config.properties b/tools/stratos-installer/config/sm/repository/conf/cartridge-config.properties
index 398c2da..37f1f59 100644
--- a/tools/stratos-installer/config/sm/repository/conf/cartridge-config.properties
+++ b/tools/stratos-installer/config/sm/repository/conf/cartridge-config.properties
@@ -23,13 +23,15 @@
 
 sc.ip=SC_IP
 autoscalerService.url=https://CC_HOSTNAME:CC_HTTPS_PORT/services/CloudControllerService/
+autoscaler.service.url=https://AS_HOSTNAME:AS_HTTPS_PORT/services/AutoScalerService/
+cloud.controller.service.url=https://CC_HOSTNAME:CC_HTTPS_PORT/services/CloudControllerService/
 autoscaler.time.out=190000
 cartridge.agent.epr=https://AGENT_HOSTNAME:AGENT_PORT/services/CartridgeAgentService
 git.host.name=git.STRATOS_DOMAIN
 git.host.ip=GIT_IP
-git.repo.notification.url=https://SC_HOSTNAME:SC_HTTPS_PORT/services/RepoNotificationService/
-identity.server.url=https://SC_HOSTNAME:SC_HTTPS_PORT/services/RepoNotificationService/
-repository.info.epr=https://SC_HOSTNAME:SC_HTTPS_PORT/services/RepositoryInformationService
+git.repo.notification.url=https://SM_HOSTNAME:SM_HTTPS_PORT/services/RepoNotificationService/
+identity.server.url=https://SM_HOSTNAME:SM_HTTPS_PORT/services/RepoNotificationService/
+repository.info.epr=https://SM_HOSTNAME:SM_HTTPS_PORT/services/RepositoryInformationService
 
 adc.jdbc.url=jdbc:mysql://STRATOS_FOUNDATION_DB_HOSTNAME:STRATOS_FOUNDATION_DB_PORT/STRATOS_FOUNDATION_DB_SCHEMA
 adc.jdbc.username=STRATOS_FOUNDATION_DB_USER

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8c20289e/tools/stratos-installer/setup.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/setup.sh b/tools/stratos-installer/setup.sh
index 2e9b3f5..dee666a 100755
--- a/tools/stratos-installer/setup.sh
+++ b/tools/stratos-installer/setup.sh
@@ -37,21 +37,21 @@ lb="false"
 as="false"
 sm="false"
 cep="false"
-product_list="mb;cc;cep;lb;as;sm"
+product_list="mb;cc;cep;as;sm"
 enable_internal_git=false
 
 function help {
     echo ""
     echo "Usage:"
     echo "setup.sh -u <host username> -p \"<product list>\""
-    echo "product list : [mb, cc, lb, as, sm, cep]"
+    echo "product list : [mb, cc, as, sm, cep]"
     echo "Example:"
-    echo "sudo ./setup.sh -p \"cc lb\""
+    echo "sudo ./setup.sh -p \"cc\""
     echo "sudo ./setup.sh -p \"all\""
     echo ""
     echo "-u: <host username> The login user of the host."
     echo "-p: <product list> Apache Stratos products to be installed on this node. Provide one or more names of the servers."
-    echo "    The available servers are cc, lb, as, sm or all. 'all' means you need to setup all servers in this machine. Default is all"
+    echo "    The available servers are cc, as, sm or all. 'all' means you need to setup all servers in this machine. Default is all"
     echo "-g: <enable_internal_git> true|false Whether enable internal git repo for Stratos2. Default is false"
     echo ""
 }
@@ -86,9 +86,6 @@ do
     if [[ $x = "cep" ]]; then
         cep="true"
     fi
-    if [[ $x = "lb" ]]; then
-        lb="true"
-    fi
     if [[ $x = "as" ]]; then
         as="true"
     fi
@@ -99,7 +96,6 @@ do
         mb="true"
         cep="true"
         cc="true"
-        lb="true"
         as="true"
         sm="true"
     fi
@@ -193,20 +189,6 @@ function cep_conf_validate {
     fi
 }
 
-function lb_conf_validate {
-    if [[ -z $lb_path ]]; then
-	helpsetup LB
-	exit 1
-    fi
-    if [[ -z $lb_cep_ip ]]; then
-	echo "Please specify the ip of CEP in conf/setup.conf"
-	exit 1
-    elif !(valid_ip $lb_cep_ip); then 
-        echo "Please provide valid ip for CEP's ip"
-        exit 1
-    fi
-}
-
 function cc_conf_validate {
     if [[ (-z $cc_path || -z $cc_port_offset) ]]; then
 	helpsetup CC
@@ -274,9 +256,6 @@ fi
 if [[ $cep = "true" ]]; then
     cep_conf_validate
 fi
-if [[ $lb = "true" ]]; then
-    lb_conf_validate
-fi
 if [[ $cc = "true" ]]; then
     cc_conf_validate
 fi
@@ -315,11 +294,6 @@ if [[ $cep = "true" ]]; then
         unzip $cep_pack_path -d $stratos_path
     fi
 fi
-if [[ $lb = "true" ]]; then
-    if [[ ! -d $lb_path ]]; then
-        unzip $lb_pack_path -d $stratos_path
-    fi
-fi
 if [[ $cc = "true" ]]; then
     if [[ ! -d $cc_path ]]; then
         unzip $cc_pack_path -d $stratos_path
@@ -401,38 +375,6 @@ if [[ $cep = "true" ]]; then
     cep_setup
 fi
 
-# ------------------------------------------------
-# Setup LB
-# ------------------------------------------------    
-function lb_setup {
-    echo "Setup LB" >> $LOG
-    echo "Configuring the Load Balancer"
-
-    cp -f ./config/lb/repository/conf/loadbalancer.conf $lb_path/repository/conf/
-    cp -f ./config/lb/repository/conf/axis2/axis2.xml $lb_path/repository/conf/axis2/
-
-    pushd $lb_path
-
-    echo "In repository/conf/loadbalancer.conf" >> $LOG
-    cp -f repository/conf/loadbalancer.conf repository/conf/loadbalancer.conf.orig
-    cat repository/conf/loadbalancer.conf.orig | sed -e "s@MB_IP@$lb_mb_ip@g" > repository/conf/loadbalancer.conf
-
-    cp -f repository/conf/loadbalancer.conf repository/conf/loadbalancer.conf.orig
-    cat repository/conf/loadbalancer.conf.orig | sed -e "s@MB_LISTEN_PORT@$lb_mb_listen_port@g" > repository/conf/loadbalancer.conf
-    
-    cp -f repository/conf/loadbalancer.conf repository/conf/loadbalancer.conf.orig
-    cat repository/conf/loadbalancer.conf.orig | sed -e "s@CEP_IP@$lb_cep_ip@g" > repository/conf/loadbalancer.conf
-
-    cp -f repository/conf/loadbalancer.conf repository/conf/loadbalancer.conf.orig
-    cat repository/conf/loadbalancer.conf.orig | sed -e "s@CEP_LISTEN_PORT@$lb_cep_tcp_port@g" > repository/conf/loadbalancer.conf
-
-    popd #lb_path
-    echo "End configuring the Load Balancer"
-}
-
-if [[ $lb = "true" ]]; then
-    lb_setup
-fi
 
 # ------------------------------------------------
 # Setup CC
@@ -538,10 +480,13 @@ function sm_setup {
     cat repository/conf/cartridge-config.properties.orig | sed -e "s@CC_HOSTNAME:CC_HTTPS_PORT@$cc_hostname:$sm_cc_https_port@g" > repository/conf/cartridge-config.properties
 
     cp -f repository/conf/cartridge-config.properties repository/conf/cartridge-config.properties.orig
+    cat repository/conf/cartridge-config.properties.orig | sed -e "s@AS_HOSTNAME:AS_HTTPS_PORT@$as_hostname:$sm_as_https_port@g" > repository/conf/cartridge-config.properties
+
+    cp -f repository/conf/cartridge-config.properties repository/conf/cartridge-config.properties.orig
     cat repository/conf/cartridge-config.properties.orig | sed -e "s@STRATOS_DOMAIN@$stratos_domain@g" > repository/conf/cartridge-config.properties
 
     cp -f repository/conf/cartridge-config.properties repository/conf/cartridge-config.properties.orig
-    cat repository/conf/cartridge-config.properties.orig | sed -e "s@SC_HOSTNAME:SC_HTTPS_PORT@$sm_ip:$sm_https_port@g" > repository/conf/cartridge-config.properties
+    cat repository/conf/cartridge-config.properties.orig | sed -e "s@SM_HOSTNAME:SM_HTTPS_PORT@$sm_ip:$sm_https_port@g" > repository/conf/cartridge-config.properties
 
     cp -f repository/conf/cartridge-config.properties repository/conf/cartridge-config.properties.orig
     cat repository/conf/cartridge-config.properties.orig | sed -e "s@STRATOS_FOUNDATION_DB_HOSTNAME:STRATOS_FOUNDATION_DB_PORT@$stratos_foundation_db_hostname:$stratos_foundation_db_port@g" > repository/conf/cartridge-config.properties
@@ -610,10 +555,6 @@ cp -f /etc/hosts hosts.tmp
 
 echo "$mb_ip $mb_hostname	# message broker hostname"	>> hosts.tmp
 
-if [[ $lb = "true" ]]; then
-    echo "$lb_cep_ip $cep_hostname	# load balancer hostname"	>> hosts.tmp
-fi
-
 if [[ $sm = "true" ]]; then
     echo "$sm_ip $sm_hostname	# stratos domain"	>> hosts.tmp
     echo "$cc_ip $cc_hostname	# cloud controller hostname"	>> hosts.tmp
@@ -627,8 +568,6 @@ mv -f ./hosts.tmp /etc/hosts
 # Starting the servers
 # ------------------------------------------------
 echo "Starting the servers" >> $LOG
-#Starting the servers in the following order is recommended
-#mb, cc, elb, is, agent, sm
 
 echo "Starting up servers. This may take time. Look at $LOG file for server startup details"
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8c20289e/tools/stratos-installer/start-servers.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/start-servers.sh b/tools/stratos-installer/start-servers.sh
index 414b8ab..2921381 100755
--- a/tools/stratos-installer/start-servers.sh
+++ b/tools/stratos-installer/start-servers.sh
@@ -36,11 +36,11 @@ fi
 function help {
     echo ""
     echo "Give one or more of the servers to start on this machine. The available servers are"
-    echo "mb, cc, lb, as, sc, cep, all. 'all' means you need to start all servers."
+    echo "mb, cc, as, sm, cep, all. 'all' means you need to start all servers."
     echo "usage:"
     echo "setup.sh -p\"<product list>\""
     echo "eg."
-    echo "setup.sh -p\"cc lb\""
+    echo "setup.sh -p\"cc sm\""
     echo ""
 }
 
@@ -70,9 +70,6 @@ do
     if [[ $x = "cc" ]]; then
         cc="true"
     fi
-    if [[ $x = "lb" ]]; then
-        lb="true"
-    fi
     if [[ $x = "as" ]]; then
         as="true"
     fi
@@ -82,7 +79,6 @@ do
     if [[ $x = "all" ]]; then
 	mb="true"
         cc="true"
-        lb="true"
         as="true"
         sc="true"
         cep="true"
@@ -90,10 +86,8 @@ do
     if [[ $x = "demo" ]]; then
         demo="true"
         cc="true"
-        lb="true"
         as="true"
         sc="true"
-	bam="true"
     fi
 done
 product_list=`echo $product_list | sed 's/^ *//g' | sed 's/ *$//g'`
@@ -132,15 +126,6 @@ if [[ $cc = "true" ]]; then
     sleep $SLEEP
 fi
 
-if [[ $lb = "true" ]]; then
-    echo ${lb_path} 
-
-    echo "Starting LB server ..." >> $LOG
-    nohup ${lb_path}/bin/stratos.sh &
-    echo "LB server started" >> $LOG
-    sleep $SLEEP
-fi
-
 if [[ $as = "true" ]]; then
     echo ${as_path}
 


[2/4] git commit: Rename CEP extention folder names

Posted by ma...@apache.org.
Rename CEP extention folder names


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

Branch: refs/heads/master
Commit: 09caa6b537936a410c167890e9e37bde40c85ef3
Parents: ea1804c
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Tue Dec 17 17:02:05 2013 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Tue Dec 17 17:02:05 2013 +0530

----------------------------------------------------------------------
 .../HealthStatisticsEventBuilder.xml            |  10 -
 .../InstanceStatusStatisticsBuilder.xml         |  10 -
 .../LoadBalancerStatisticsEventBuilder.xml      |  10 -
 .../AverageInFlightRequestsEventFormatter.xml   |  11 -
 .../AverageLoadAverageEventFormatter.xml        |  11 -
 .../AverageMemoryConsumptionEventFormatter.xml  |  11 -
 .../FaultMessageEventFormatter.xml              |  11 -
 .../GradientInFlightRequestsEventFormatter.xml  |  11 -
 .../GradientLoadAverageEventFormatter.xml       |  11 -
 .../GradientMemoryConsumptionEventFormatter.xml |  11 -
 .../MemberAverageLoadAverageEventFormatter.xml  |  11 -
 ...erAverageMemoryConsumptionEventFormatter.xml |  11 -
 .../MemberGradientLoadAverageEventFormatter.xml |  11 -
 ...rGradientMemoryConsumptionEventFormatter.xml |  11 -
 ...econdDerivativeLoadAverageEventFormatter.xml |  11 -
 ...erivativeMemoryConsumptionEventFormatter.xml |  11 -
 ...DerivativeInFlightRequestsEventFormatter.xml |  11 -
 ...econdDerivativeLoadAverageEventFormatter.xml |  11 -
 ...erivativeMemoryConsumptionEventFormatter.xml |  11 -
 .../HealthStatisticsEventBuilder.xml            |  10 +
 .../InstanceStatusStatisticsBuilder.xml         |  10 +
 .../LoadBalancerStatisticsEventBuilder.xml      |  10 +
 .../AverageInFlightRequestsEventFormatter.xml   |  11 +
 .../AverageLoadAverageEventFormatter.xml        |  11 +
 .../AverageMemoryConsumptionEventFormatter.xml  |  11 +
 .../FaultMessageEventFormatter.xml              |  11 +
 .../GradientInFlightRequestsEventFormatter.xml  |  11 +
 .../GradientLoadAverageEventFormatter.xml       |  11 +
 .../GradientMemoryConsumptionEventFormatter.xml |  11 +
 .../MemberAverageLoadAverageEventFormatter.xml  |  11 +
 ...erAverageMemoryConsumptionEventFormatter.xml |  11 +
 .../MemberGradientLoadAverageEventFormatter.xml |  11 +
 ...rGradientMemoryConsumptionEventFormatter.xml |  11 +
 ...econdDerivativeLoadAverageEventFormatter.xml |  11 +
 ...erivativeMemoryConsumptionEventFormatter.xml |  11 +
 ...DerivativeInFlightRequestsEventFormatter.xml |  11 +
 ...econdDerivativeLoadAverageEventFormatter.xml |  11 +
 ...erivativeMemoryConsumptionEventFormatter.xml |  11 +
 .../execution-plans/AverageHeathRequest.xml     |  29 --
 .../AverageInFlightRequestsFinder.xml           |  19 --
 .../execution-plans/GradientOfHealthRequest.xml |  30 ---
 .../GradientOfRequestsInFlightFinder.xml        |  18 --
 .../SecondDerivativeOfHealthRequest.xml         |  27 --
 ...SecondDerivativeOfRequestsInFlightFinder.xml |  19 --
 .../executionplans/AverageHeathRequest.xml      |  29 ++
 .../AverageInFlightRequestsFinder.xml           |  19 ++
 .../executionplans/GradientOfHealthRequest.xml  |  30 +++
 .../GradientOfRequestsInFlightFinder.xml        |  18 ++
 .../SecondDerivativeOfHealthRequest.xml         |  27 ++
 ...SecondDerivativeOfRequestsInFlightFinder.xml |  19 ++
 .../DefaultWSO2EventInputAdaptor.xml            |   3 -
 .../DefaultWSO2EventInputAdaptor.xml            |   3 +
 .../DefaultWSO2EventOutputAdaptor.xml           |   8 -
 .../output-event-adaptors/JMSOutputAdaptor.xml  |   8 -
 .../DefaultWSO2EventOutputAdaptor.xml           |   8 +
 .../outputeventadaptors/JMSOutputAdaptor.xml    |   8 +
 .../stream-manager-config.xml                   | 269 -------------------
 .../streamdefinitions/stream-manager-config.xml | 269 +++++++++++++++++++
 58 files changed, 636 insertions(+), 636 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/event-builders/HealthStatisticsEventBuilder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-builders/HealthStatisticsEventBuilder.xml b/extensions/cep/artifacts/event-builders/HealthStatisticsEventBuilder.xml
deleted file mode 100644
index 763f7d8..0000000
--- a/extensions/cep/artifacts/event-builders/HealthStatisticsEventBuilder.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventBuilder name="HealthStatisticsEventBuilder" statistics="disable"
-    trace="enable" xmlns="http://wso2.org/carbon/eventbuilder">
-    <from eventAdaptorName="DefaultWSO2EventInputAdaptor" eventAdaptorType="wso2event">
-        <property name="stream">cartridge_agent_health_stats</property>
-        <property name="version">1.0.0</property>
-    </from>
-    <mapping customMapping="disable" type="wso2event"/>
-    <to streamName="cartridge_agent_health_stats" version="1.0.0"/>
-</eventBuilder>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/event-builders/InstanceStatusStatisticsBuilder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-builders/InstanceStatusStatisticsBuilder.xml b/extensions/cep/artifacts/event-builders/InstanceStatusStatisticsBuilder.xml
deleted file mode 100644
index ed133c9..0000000
--- a/extensions/cep/artifacts/event-builders/InstanceStatusStatisticsBuilder.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventBuilder name="InstanceStatusStatisticsBuilder"
-    statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventbuilder">
-    <from eventAdaptorName="DefaultWSO2EventInputAdaptor" eventAdaptorType="wso2event">
-        <property name="stream">stratos.instance.stats</property>
-        <property name="version">1.0.0</property>
-    </from>
-    <mapping customMapping="disable" type="wso2event"/>
-    <to streamName="stratos.instance.stats" version="1.0.0"/>
-</eventBuilder>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/event-builders/LoadBalancerStatisticsEventBuilder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-builders/LoadBalancerStatisticsEventBuilder.xml b/extensions/cep/artifacts/event-builders/LoadBalancerStatisticsEventBuilder.xml
deleted file mode 100644
index a3bf644..0000000
--- a/extensions/cep/artifacts/event-builders/LoadBalancerStatisticsEventBuilder.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventBuilder name="LoadBalancerStatisticsEventBuilder"
-    statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventbuilder">
-    <from eventAdaptorName="DefaultWSO2EventInputAdaptor" eventAdaptorType="wso2event">
-        <property name="stream">in_flight_requests</property>
-        <property name="version">1.0.0</property>
-    </from>
-    <mapping customMapping="disable" type="wso2event"/>
-    <to streamName="in_flight_requests" version="1.0.0"/>
-</eventBuilder>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/event-formatters/AverageInFlightRequestsEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/AverageInFlightRequestsEventFormatter.xml b/extensions/cep/artifacts/event-formatters/AverageInFlightRequestsEventFormatter.xml
deleted file mode 100644
index b3347d6..0000000
--- a/extensions/cep/artifacts/event-formatters/AverageInFlightRequestsEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="AverageRequestsInflightEventFormatter"
-  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
-  <from streamName="average_in_flight_requests" version="1.0.0"/>
-  <mapping customMapping="enable" type="json">
-    <inline>{"average_in_flight_requests":{"cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{count}}"}}</inline>
-  </mapping>
-  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
-    <property name="transport.jms.Destination">summarized-health-stats</property>
-  </to>
-</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/event-formatters/AverageLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/AverageLoadAverageEventFormatter.xml b/extensions/cep/artifacts/event-formatters/AverageLoadAverageEventFormatter.xml
deleted file mode 100644
index 046e746..0000000
--- a/extensions/cep/artifacts/event-formatters/AverageLoadAverageEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="AverageLoadAverageEventFormatter"
-  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
-  <from streamName="average_load_average_stats" version="1.0.0"/>
-  <mapping customMapping="enable" type="json">
-    <inline>{"average_load_average":{"cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{average_load_average}}"}}</inline>
-  </mapping>
-  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
-    <property name="transport.jms.Destination">summarized-health-stats</property>
-  </to>
-</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/event-formatters/AverageMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/AverageMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/event-formatters/AverageMemoryConsumptionEventFormatter.xml
deleted file mode 100644
index 40780f1..0000000
--- a/extensions/cep/artifacts/event-formatters/AverageMemoryConsumptionEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="AverageMemoryConsumptionEventFormatter"
-  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
-  <from streamName="average_memory_consumption_stats" version="1.0.0"/>
-  <mapping customMapping="enable" type="json">
-    <inline>{"average_memory_consumption":{"cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{average_memory_consumption}}"}}</inline>
-  </mapping>
-  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
-    <property name="transport.jms.Destination">summarized-health-stats</property>
-  </to>
-</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/event-formatters/FaultMessageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/FaultMessageEventFormatter.xml b/extensions/cep/artifacts/event-formatters/FaultMessageEventFormatter.xml
deleted file mode 100644
index a46241a..0000000
--- a/extensions/cep/artifacts/event-formatters/FaultMessageEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="FaultMessageEventFormatter"
-  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
-  <from streamName="fault_message" version="1.0.0"/>
-  <mapping customMapping="enable" type="json">
-    <inline>{"member_fault":{"cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","member_id":"{{member_id}}","partition_id":"{{partition_id}}"}}</inline>
-  </mapping>
-  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
-    <property name="transport.jms.Destination">summarized-health-stats</property>
-  </to>
-</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/event-formatters/GradientInFlightRequestsEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/GradientInFlightRequestsEventFormatter.xml b/extensions/cep/artifacts/event-formatters/GradientInFlightRequestsEventFormatter.xml
deleted file mode 100644
index 1504c9c..0000000
--- a/extensions/cep/artifacts/event-formatters/GradientInFlightRequestsEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="GradientInFlightRequestsEventFormatter" statistics="disable"
-  trace="disable" xmlns="http://wso2.org/carbon/eventformatter">
-  <from streamName="gradient_in_flight_requests" version="1.0.0"/>
-  <mapping customMapping="enable" type="json">
-    <inline>{"gradient_in_flight_requests":{"cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{count}}"}}</inline>
-  </mapping>
-  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
-    <property name="transport.jms.Destination">summarized-health-stats</property>
-  </to>
-</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/event-formatters/GradientLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/GradientLoadAverageEventFormatter.xml b/extensions/cep/artifacts/event-formatters/GradientLoadAverageEventFormatter.xml
deleted file mode 100644
index a82e44d..0000000
--- a/extensions/cep/artifacts/event-formatters/GradientLoadAverageEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="GradientLoadAverageEventFormatter"
-  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
-  <from streamName="gradient_load_average_stats" version="1.0.0"/>
-  <mapping customMapping="enable" type="json">
-    <inline>{"gradient_load_average":{"cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{gradient_load_average}}"}}</inline>
-  </mapping>
-  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
-    <property name="transport.jms.Destination">summarized-health-stats</property>
-  </to>
-</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/event-formatters/GradientMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/GradientMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/event-formatters/GradientMemoryConsumptionEventFormatter.xml
deleted file mode 100644
index fa65b3c..0000000
--- a/extensions/cep/artifacts/event-formatters/GradientMemoryConsumptionEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="GradientMemoryConsumptionEventFormatter"
-  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
-  <from streamName="gradient_memory_consumption_stats" version="1.0.0"/>
-  <mapping customMapping="enable" type="json">
-    <inline>{"gradient_memory_consumption":{"cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{gradient_memory_consumption}}"}}</inline>
-  </mapping>
-  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
-    <property name="transport.jms.Destination">summarized-health-stats</property>
-  </to>
-</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/event-formatters/MemberAverageLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/MemberAverageLoadAverageEventFormatter.xml b/extensions/cep/artifacts/event-formatters/MemberAverageLoadAverageEventFormatter.xml
deleted file mode 100644
index 582a6ef..0000000
--- a/extensions/cep/artifacts/event-formatters/MemberAverageLoadAverageEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="MemberAverageLoadAverageEventFormatter"
-  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
-  <from streamName="member_average_load_average_stats" version="1.0.0"/>
-  <mapping customMapping="enable" type="json">
-    <inline>{"member_average_load_average":{"member_id":"{{member_id}}","cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{member_average_load_average}}"}}</inline>
-  </mapping>
-  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
-    <property name="transport.jms.Destination">summarized-health-stats</property>
-  </to>
-</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/event-formatters/MemberAverageMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/MemberAverageMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/event-formatters/MemberAverageMemoryConsumptionEventFormatter.xml
deleted file mode 100644
index 631256e..0000000
--- a/extensions/cep/artifacts/event-formatters/MemberAverageMemoryConsumptionEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="MemberAverageMemoryConsumptionEventFormatter"
-  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
-  <from streamName="member_average_memory_consumption_stats" version="1.0.0"/>
-  <mapping customMapping="enable" type="json">
-    <inline>{"member_average_memory_consumption":{"member_id":"{{member_id}}","cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{member_average_memory_consumption}}"}}</inline>
-  </mapping>
-  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
-    <property name="transport.jms.Destination">summarized-health-stats</property>
-  </to>
-</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/event-formatters/MemberGradientLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/MemberGradientLoadAverageEventFormatter.xml b/extensions/cep/artifacts/event-formatters/MemberGradientLoadAverageEventFormatter.xml
deleted file mode 100644
index 3cd3427..0000000
--- a/extensions/cep/artifacts/event-formatters/MemberGradientLoadAverageEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="MemberGradientLoadAverageEventFormatter"
-  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
-  <from streamName="member_gradient_load_average_stats" version="1.0.0"/>
-  <mapping customMapping="enable" type="json">
-    <inline>{"member_gradient_load_average":{"member_id":"{{member_id}}","cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{member_gradient_load_average}}"}}</inline>
-  </mapping>
-  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
-    <property name="transport.jms.Destination">summarized-health-stats</property>
-  </to>
-</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/event-formatters/MemberGradientMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/MemberGradientMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/event-formatters/MemberGradientMemoryConsumptionEventFormatter.xml
deleted file mode 100644
index 9dd43b6..0000000
--- a/extensions/cep/artifacts/event-formatters/MemberGradientMemoryConsumptionEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="MemberGradientMemoryConsumptionEventFormatter"
-  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
-  <from streamName="member_gradient_memory_consumption_stats" version="1.0.0"/>
-  <mapping customMapping="enable" type="json">
-    <inline>{"member_gradient_memory_consumption":{"member_id":"{{member_id}}","cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{member_gradient_memory_consumption}}"}}</inline>
-  </mapping>
-  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
-    <property name="transport.jms.Destination">summarized-health-stats</property>
-  </to>
-</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/event-formatters/MemberSecondDerivativeLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/MemberSecondDerivativeLoadAverageEventFormatter.xml b/extensions/cep/artifacts/event-formatters/MemberSecondDerivativeLoadAverageEventFormatter.xml
deleted file mode 100644
index 15ec828..0000000
--- a/extensions/cep/artifacts/event-formatters/MemberSecondDerivativeLoadAverageEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="MemberSecondDerivativeLoadAverageEventFormatter"
-  statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter">
-  <from streamName="member_second_derivative_load_average_stats" version="1.0.0"/>
-  <mapping customMapping="enable" type="json">
-    <inline>{"member_second_derivative_load_average":{"member_id":"{{member_id}}","cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{member_second_derivative_load_average}}"}}</inline>
-  </mapping>
-  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
-    <property name="transport.jms.Destination">summarized-health-stats</property>
-  </to>
-</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/event-formatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/event-formatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml
deleted file mode 100644
index 6fdf2e6..0000000
--- a/extensions/cep/artifacts/event-formatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="MemberSecondDerivativeMemoryConsumptionEventFormatter"
-  statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter">
-  <from streamName="member_second_derivative_memory_consumption_stats" version="1.0.0"/>
-  <mapping customMapping="enable" type="json">
-    <inline>{"member_second_derivative_memory_consumption":{"member_id":"{{member_id}}","cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{member_second_derivative_memory_consumption}}"}}</inline>
-  </mapping>
-  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
-    <property name="transport.jms.Destination">summarized-health-stats</property>
-  </to>
-</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/event-formatters/SecondDerivativeInFlightRequestsEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/SecondDerivativeInFlightRequestsEventFormatter.xml b/extensions/cep/artifacts/event-formatters/SecondDerivativeInFlightRequestsEventFormatter.xml
deleted file mode 100644
index c93bd12..0000000
--- a/extensions/cep/artifacts/event-formatters/SecondDerivativeInFlightRequestsEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="SecondDerivativeEventFormatter"
-  statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter">
-  <from streamName="second_derivative_in_flight_requests" version="1.0.0"/>
-  <mapping customMapping="enable" type="json">
-    <inline>{"second_derivative_in_flight_requests":{"cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{count}}"}}</inline>
-  </mapping>
-  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
-    <property name="transport.jms.Destination">summarized-health-stats</property>
-  </to>
-</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/event-formatters/SecondDerivativeLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/SecondDerivativeLoadAverageEventFormatter.xml b/extensions/cep/artifacts/event-formatters/SecondDerivativeLoadAverageEventFormatter.xml
deleted file mode 100644
index 7364f77..0000000
--- a/extensions/cep/artifacts/event-formatters/SecondDerivativeLoadAverageEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="SecondDerivativeLoadAverageEventFormatter"
-  statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter">
-  <from streamName="second_derivative_load_average_stats" version="1.0.0"/>
-  <mapping customMapping="enable" type="json">
-    <inline>{"second_derivative_load_average":{"cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{second_derivative_load_average}}"}}</inline>
-  </mapping>
-  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
-    <property name="transport.jms.Destination">summarized-health-stats</property>
-  </to>
-</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/event-formatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/event-formatters/SecondDerivativeMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/event-formatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
deleted file mode 100644
index b6f5295..0000000
--- a/extensions/cep/artifacts/event-formatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventFormatter name="SecondDerivativeMemoryConsumptionEventFormatter"
-  statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter">
-  <from streamName="second_derivative_memory_consumption_stats" version="1.0.0"/>
-  <mapping customMapping="enable" type="json">
-    <inline>{"second_derivative_memory_consumption":{"cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{second_derivative_memory_consumption}}"}}</inline>
-  </mapping>
-  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
-    <property name="transport.jms.Destination">summarized-health-stats</property>
-  </to>
-</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/eventbuilders/HealthStatisticsEventBuilder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventbuilders/HealthStatisticsEventBuilder.xml b/extensions/cep/artifacts/eventbuilders/HealthStatisticsEventBuilder.xml
new file mode 100644
index 0000000..763f7d8
--- /dev/null
+++ b/extensions/cep/artifacts/eventbuilders/HealthStatisticsEventBuilder.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventBuilder name="HealthStatisticsEventBuilder" statistics="disable"
+    trace="enable" xmlns="http://wso2.org/carbon/eventbuilder">
+    <from eventAdaptorName="DefaultWSO2EventInputAdaptor" eventAdaptorType="wso2event">
+        <property name="stream">cartridge_agent_health_stats</property>
+        <property name="version">1.0.0</property>
+    </from>
+    <mapping customMapping="disable" type="wso2event"/>
+    <to streamName="cartridge_agent_health_stats" version="1.0.0"/>
+</eventBuilder>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/eventbuilders/InstanceStatusStatisticsBuilder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventbuilders/InstanceStatusStatisticsBuilder.xml b/extensions/cep/artifacts/eventbuilders/InstanceStatusStatisticsBuilder.xml
new file mode 100644
index 0000000..ed133c9
--- /dev/null
+++ b/extensions/cep/artifacts/eventbuilders/InstanceStatusStatisticsBuilder.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventBuilder name="InstanceStatusStatisticsBuilder"
+    statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventbuilder">
+    <from eventAdaptorName="DefaultWSO2EventInputAdaptor" eventAdaptorType="wso2event">
+        <property name="stream">stratos.instance.stats</property>
+        <property name="version">1.0.0</property>
+    </from>
+    <mapping customMapping="disable" type="wso2event"/>
+    <to streamName="stratos.instance.stats" version="1.0.0"/>
+</eventBuilder>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/eventbuilders/LoadBalancerStatisticsEventBuilder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventbuilders/LoadBalancerStatisticsEventBuilder.xml b/extensions/cep/artifacts/eventbuilders/LoadBalancerStatisticsEventBuilder.xml
new file mode 100644
index 0000000..a3bf644
--- /dev/null
+++ b/extensions/cep/artifacts/eventbuilders/LoadBalancerStatisticsEventBuilder.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventBuilder name="LoadBalancerStatisticsEventBuilder"
+    statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventbuilder">
+    <from eventAdaptorName="DefaultWSO2EventInputAdaptor" eventAdaptorType="wso2event">
+        <property name="stream">in_flight_requests</property>
+        <property name="version">1.0.0</property>
+    </from>
+    <mapping customMapping="disable" type="wso2event"/>
+    <to streamName="in_flight_requests" version="1.0.0"/>
+</eventBuilder>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/eventformatters/AverageInFlightRequestsEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/AverageInFlightRequestsEventFormatter.xml b/extensions/cep/artifacts/eventformatters/AverageInFlightRequestsEventFormatter.xml
new file mode 100644
index 0000000..b3347d6
--- /dev/null
+++ b/extensions/cep/artifacts/eventformatters/AverageInFlightRequestsEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="AverageRequestsInflightEventFormatter"
+  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
+  <from streamName="average_in_flight_requests" version="1.0.0"/>
+  <mapping customMapping="enable" type="json">
+    <inline>{"average_in_flight_requests":{"cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{count}}"}}</inline>
+  </mapping>
+  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
+    <property name="transport.jms.Destination">summarized-health-stats</property>
+  </to>
+</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/eventformatters/AverageLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/AverageLoadAverageEventFormatter.xml b/extensions/cep/artifacts/eventformatters/AverageLoadAverageEventFormatter.xml
new file mode 100644
index 0000000..046e746
--- /dev/null
+++ b/extensions/cep/artifacts/eventformatters/AverageLoadAverageEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="AverageLoadAverageEventFormatter"
+  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
+  <from streamName="average_load_average_stats" version="1.0.0"/>
+  <mapping customMapping="enable" type="json">
+    <inline>{"average_load_average":{"cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{average_load_average}}"}}</inline>
+  </mapping>
+  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
+    <property name="transport.jms.Destination">summarized-health-stats</property>
+  </to>
+</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/eventformatters/AverageMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/AverageMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/eventformatters/AverageMemoryConsumptionEventFormatter.xml
new file mode 100644
index 0000000..40780f1
--- /dev/null
+++ b/extensions/cep/artifacts/eventformatters/AverageMemoryConsumptionEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="AverageMemoryConsumptionEventFormatter"
+  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
+  <from streamName="average_memory_consumption_stats" version="1.0.0"/>
+  <mapping customMapping="enable" type="json">
+    <inline>{"average_memory_consumption":{"cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{average_memory_consumption}}"}}</inline>
+  </mapping>
+  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
+    <property name="transport.jms.Destination">summarized-health-stats</property>
+  </to>
+</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/eventformatters/FaultMessageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/FaultMessageEventFormatter.xml b/extensions/cep/artifacts/eventformatters/FaultMessageEventFormatter.xml
new file mode 100644
index 0000000..a46241a
--- /dev/null
+++ b/extensions/cep/artifacts/eventformatters/FaultMessageEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="FaultMessageEventFormatter"
+  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
+  <from streamName="fault_message" version="1.0.0"/>
+  <mapping customMapping="enable" type="json">
+    <inline>{"member_fault":{"cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","member_id":"{{member_id}}","partition_id":"{{partition_id}}"}}</inline>
+  </mapping>
+  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
+    <property name="transport.jms.Destination">summarized-health-stats</property>
+  </to>
+</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/eventformatters/GradientInFlightRequestsEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/GradientInFlightRequestsEventFormatter.xml b/extensions/cep/artifacts/eventformatters/GradientInFlightRequestsEventFormatter.xml
new file mode 100644
index 0000000..1504c9c
--- /dev/null
+++ b/extensions/cep/artifacts/eventformatters/GradientInFlightRequestsEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="GradientInFlightRequestsEventFormatter" statistics="disable"
+  trace="disable" xmlns="http://wso2.org/carbon/eventformatter">
+  <from streamName="gradient_in_flight_requests" version="1.0.0"/>
+  <mapping customMapping="enable" type="json">
+    <inline>{"gradient_in_flight_requests":{"cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{count}}"}}</inline>
+  </mapping>
+  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
+    <property name="transport.jms.Destination">summarized-health-stats</property>
+  </to>
+</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/eventformatters/GradientLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/GradientLoadAverageEventFormatter.xml b/extensions/cep/artifacts/eventformatters/GradientLoadAverageEventFormatter.xml
new file mode 100644
index 0000000..a82e44d
--- /dev/null
+++ b/extensions/cep/artifacts/eventformatters/GradientLoadAverageEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="GradientLoadAverageEventFormatter"
+  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
+  <from streamName="gradient_load_average_stats" version="1.0.0"/>
+  <mapping customMapping="enable" type="json">
+    <inline>{"gradient_load_average":{"cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{gradient_load_average}}"}}</inline>
+  </mapping>
+  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
+    <property name="transport.jms.Destination">summarized-health-stats</property>
+  </to>
+</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/eventformatters/GradientMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/GradientMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/eventformatters/GradientMemoryConsumptionEventFormatter.xml
new file mode 100644
index 0000000..fa65b3c
--- /dev/null
+++ b/extensions/cep/artifacts/eventformatters/GradientMemoryConsumptionEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="GradientMemoryConsumptionEventFormatter"
+  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
+  <from streamName="gradient_memory_consumption_stats" version="1.0.0"/>
+  <mapping customMapping="enable" type="json">
+    <inline>{"gradient_memory_consumption":{"cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{gradient_memory_consumption}}"}}</inline>
+  </mapping>
+  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
+    <property name="transport.jms.Destination">summarized-health-stats</property>
+  </to>
+</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/eventformatters/MemberAverageLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/MemberAverageLoadAverageEventFormatter.xml b/extensions/cep/artifacts/eventformatters/MemberAverageLoadAverageEventFormatter.xml
new file mode 100644
index 0000000..582a6ef
--- /dev/null
+++ b/extensions/cep/artifacts/eventformatters/MemberAverageLoadAverageEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="MemberAverageLoadAverageEventFormatter"
+  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
+  <from streamName="member_average_load_average_stats" version="1.0.0"/>
+  <mapping customMapping="enable" type="json">
+    <inline>{"member_average_load_average":{"member_id":"{{member_id}}","cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{member_average_load_average}}"}}</inline>
+  </mapping>
+  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
+    <property name="transport.jms.Destination">summarized-health-stats</property>
+  </to>
+</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/eventformatters/MemberAverageMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/MemberAverageMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/eventformatters/MemberAverageMemoryConsumptionEventFormatter.xml
new file mode 100644
index 0000000..631256e
--- /dev/null
+++ b/extensions/cep/artifacts/eventformatters/MemberAverageMemoryConsumptionEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="MemberAverageMemoryConsumptionEventFormatter"
+  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
+  <from streamName="member_average_memory_consumption_stats" version="1.0.0"/>
+  <mapping customMapping="enable" type="json">
+    <inline>{"member_average_memory_consumption":{"member_id":"{{member_id}}","cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{member_average_memory_consumption}}"}}</inline>
+  </mapping>
+  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
+    <property name="transport.jms.Destination">summarized-health-stats</property>
+  </to>
+</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/eventformatters/MemberGradientLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/MemberGradientLoadAverageEventFormatter.xml b/extensions/cep/artifacts/eventformatters/MemberGradientLoadAverageEventFormatter.xml
new file mode 100644
index 0000000..3cd3427
--- /dev/null
+++ b/extensions/cep/artifacts/eventformatters/MemberGradientLoadAverageEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="MemberGradientLoadAverageEventFormatter"
+  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
+  <from streamName="member_gradient_load_average_stats" version="1.0.0"/>
+  <mapping customMapping="enable" type="json">
+    <inline>{"member_gradient_load_average":{"member_id":"{{member_id}}","cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{member_gradient_load_average}}"}}</inline>
+  </mapping>
+  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
+    <property name="transport.jms.Destination">summarized-health-stats</property>
+  </to>
+</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/eventformatters/MemberGradientMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/MemberGradientMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/eventformatters/MemberGradientMemoryConsumptionEventFormatter.xml
new file mode 100644
index 0000000..9dd43b6
--- /dev/null
+++ b/extensions/cep/artifacts/eventformatters/MemberGradientMemoryConsumptionEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="MemberGradientMemoryConsumptionEventFormatter"
+  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventformatter">
+  <from streamName="member_gradient_memory_consumption_stats" version="1.0.0"/>
+  <mapping customMapping="enable" type="json">
+    <inline>{"member_gradient_memory_consumption":{"member_id":"{{member_id}}","cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{member_gradient_memory_consumption}}"}}</inline>
+  </mapping>
+  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
+    <property name="transport.jms.Destination">summarized-health-stats</property>
+  </to>
+</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeLoadAverageEventFormatter.xml b/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeLoadAverageEventFormatter.xml
new file mode 100644
index 0000000..15ec828
--- /dev/null
+++ b/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeLoadAverageEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="MemberSecondDerivativeLoadAverageEventFormatter"
+  statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter">
+  <from streamName="member_second_derivative_load_average_stats" version="1.0.0"/>
+  <mapping customMapping="enable" type="json">
+    <inline>{"member_second_derivative_load_average":{"member_id":"{{member_id}}","cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{member_second_derivative_load_average}}"}}</inline>
+  </mapping>
+  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
+    <property name="transport.jms.Destination">summarized-health-stats</property>
+  </to>
+</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml
new file mode 100644
index 0000000..6fdf2e6
--- /dev/null
+++ b/extensions/cep/artifacts/eventformatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="MemberSecondDerivativeMemoryConsumptionEventFormatter"
+  statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter">
+  <from streamName="member_second_derivative_memory_consumption_stats" version="1.0.0"/>
+  <mapping customMapping="enable" type="json">
+    <inline>{"member_second_derivative_memory_consumption":{"member_id":"{{member_id}}","cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{member_second_derivative_memory_consumption}}"}}</inline>
+  </mapping>
+  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
+    <property name="transport.jms.Destination">summarized-health-stats</property>
+  </to>
+</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/eventformatters/SecondDerivativeInFlightRequestsEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/SecondDerivativeInFlightRequestsEventFormatter.xml b/extensions/cep/artifacts/eventformatters/SecondDerivativeInFlightRequestsEventFormatter.xml
new file mode 100644
index 0000000..c93bd12
--- /dev/null
+++ b/extensions/cep/artifacts/eventformatters/SecondDerivativeInFlightRequestsEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="SecondDerivativeEventFormatter"
+  statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter">
+  <from streamName="second_derivative_in_flight_requests" version="1.0.0"/>
+  <mapping customMapping="enable" type="json">
+    <inline>{"second_derivative_in_flight_requests":{"cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{count}}"}}</inline>
+  </mapping>
+  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
+    <property name="transport.jms.Destination">summarized-health-stats</property>
+  </to>
+</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/eventformatters/SecondDerivativeLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/SecondDerivativeLoadAverageEventFormatter.xml b/extensions/cep/artifacts/eventformatters/SecondDerivativeLoadAverageEventFormatter.xml
new file mode 100644
index 0000000..7364f77
--- /dev/null
+++ b/extensions/cep/artifacts/eventformatters/SecondDerivativeLoadAverageEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="SecondDerivativeLoadAverageEventFormatter"
+  statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter">
+  <from streamName="second_derivative_load_average_stats" version="1.0.0"/>
+  <mapping customMapping="enable" type="json">
+    <inline>{"second_derivative_load_average":{"cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{second_derivative_load_average}}"}}</inline>
+  </mapping>
+  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
+    <property name="transport.jms.Destination">summarized-health-stats</property>
+  </to>
+</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/eventformatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/eventformatters/SecondDerivativeMemoryConsumptionEventFormatter.xml b/extensions/cep/artifacts/eventformatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
new file mode 100644
index 0000000..b6f5295
--- /dev/null
+++ b/extensions/cep/artifacts/eventformatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eventFormatter name="SecondDerivativeMemoryConsumptionEventFormatter"
+  statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventformatter">
+  <from streamName="second_derivative_memory_consumption_stats" version="1.0.0"/>
+  <mapping customMapping="enable" type="json">
+    <inline>{"second_derivative_memory_consumption":{"cluster_id":"{{cluster_id}}","network_partition_id":"{{network_partition_id}}","value":"{{second_derivative_memory_consumption}}"}}</inline>
+  </mapping>
+  <to eventAdaptorName="JMSOutputAdaptor" eventAdaptorType="jms">
+    <property name="transport.jms.Destination">summarized-health-stats</property>
+  </to>
+</eventFormatter>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/execution-plans/AverageHeathRequest.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/execution-plans/AverageHeathRequest.xml b/extensions/cep/artifacts/execution-plans/AverageHeathRequest.xml
deleted file mode 100644
index d3cf7ff..0000000
--- a/extensions/cep/artifacts/execution-plans/AverageHeathRequest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<executionPlan name="AverageHeathRequest" statistics="disable"
-  trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
-  <description>This will average health stats of an instance over a minute.</description>
-  <siddhiConfiguration>
-    <property name="siddhi.enable.distributed.processing">false</property>
-    <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
-  </siddhiConfiguration>
-  <importedStreams>
-    <stream as="healthStats1" name="cartridge_agent_health_stats" version="1.0.0"/>
-  </importedStreams>
-  <queryExpressions><![CDATA[from healthStats1 [health_description == 'port_not_open'] select cluster_id, network_partition_id, member_id, partition_id insert into fault_message;
-  from healthStats1 [health_description == 'load_average'] #window.timeBatch(1 min) select cluster_id, network_partition_id, avg(value) as average_load_average group by cluster_id, network_partition_id insert into average_load_average_stats;
-  from healthStats1 [health_description == 'load_average'] #window.timeBatch(1 min) select member_id, cluster_id, network_partition_id, avg(value) as member_average_load_average group by member_id insert into member_average_load_average_stats;
-  from healthStats1 [health_description == 'memory_consumption'] #window.timeBatch(1 min) select member_id, cluster_id, network_partition_id, avg(value) as member_average_memory_consumption group by member_id insert into member_average_memory_consumption_stats;
-  from healthStats1 [health_description == 'memory_consumption'] #window.timeBatch(1 min) select cluster_id, network_partition_id, avg(value) as average_memory_consumption group by cluster_id, network_partition_id insert into average_memory_consumption_stats;]]></queryExpressions>
-  <exportedStreams>
-    <stream name="average_load_average_stats" passthroughFlow="disable"
-      valueOf="average_load_average_stats" version="1.0.0"/>
-    <stream name="member_average_load_average_stats" passthroughFlow="disable"
-      valueOf="member_average_load_average_stats" version="1.0.0"/>
-    <stream name="member_average_memory_consumption_stats" passthroughFlow="disable"
-      valueOf="member_average_memory_consumption_stats" version="1.0.0"/>
-    <stream name="average_memory_consumption_stats" passthroughFlow="disable"
-      valueOf="average_memory_consumption_stats" version="1.0.0"/>
-    <stream name="fault_message" passthroughFlow="disable"
-      valueOf="fault_message" version="1.0.0"/>
-  </exportedStreams>
-</executionPlan>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/execution-plans/AverageInFlightRequestsFinder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/execution-plans/AverageInFlightRequestsFinder.xml b/extensions/cep/artifacts/execution-plans/AverageInFlightRequestsFinder.xml
deleted file mode 100644
index 5022bde..0000000
--- a/extensions/cep/artifacts/execution-plans/AverageInFlightRequestsFinder.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<executionPlan name="AverageInFlightRequestsFinder" statistics="disable"
-  trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
-  <description>This will average the number of requests in flight over a minute.</description>
-  <siddhiConfiguration>
-    <property name="siddhi.enable.distributed.processing">false</property>
-    <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
-  </siddhiConfiguration>
-  <importedStreams>
-    <stream as="lbStats1" name="in_flight_requests" version="1.0.0"/>
-  </importedStreams>
-  <queryExpressions><![CDATA[ 
-from lbStats1#window.timeBatch(1 min)
-select cluster_id,network_partition_id, avg(in_flight_request_count) as count group by cluster_id,network_partition_id  insert into average_in_flight_requests;]]></queryExpressions>
-  <exportedStreams>
-    <stream name="average_in_flight_requests"
-      valueOf="average_in_flight_requests" version="1.0.0"/>
-  </exportedStreams>
-</executionPlan>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/execution-plans/GradientOfHealthRequest.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/execution-plans/GradientOfHealthRequest.xml b/extensions/cep/artifacts/execution-plans/GradientOfHealthRequest.xml
deleted file mode 100644
index 75406f9..0000000
--- a/extensions/cep/artifacts/execution-plans/GradientOfHealthRequest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<executionPlan name="GradientOfHealthRequest" statistics="disable"
-  trace="disable" xmlns="http://wso2.org/carbon/eventprocessor">
-  <description>This will find the gradient of the heath request over a minute.</description>
-  <siddhiConfiguration>
-    <property name="siddhi.enable.distributed.processing">false</property>
-    <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
-  </siddhiConfiguration>
-  <importedStreams>
-    <stream as="healthStats2" name="cartridge_agent_health_stats" version="1.0.0"/>
-  </importedStreams>
-  <queryExpressions><![CDATA[
-  from healthStats2 #window.stratos:faultHandling(1min, member_id) select cluster_id, network_partition_id, member_id, partition_id group by cluster_id, network_partition_id insert into fault_message;
-  from healthStats2 [health_description == 'load_average'] #window.stratos:gradient(1 min, value) select cluster_id, network_partition_id, value as gradient_load_average group by cluster_id, network_partition_id insert into gradient_load_average_stats;
-  from healthStats2 [health_description == 'load_average'] #window.stratos:gradient(1 min, value) select member_id, cluster_id, network_partition_id, value as member_gradient_load_average group by member_id insert into member_gradient_load_average_stats;
-  from healthStats2 [health_description == 'memory_consumption'] #window.stratos:gradient(1 min, value) select member_id, cluster_id, network_partition_id, value as member_gradient_memory_consumption group by member_id insert into member_gradient_memory_consumption_stats;
-  from healthStats2 [health_description == 'memory_consumption'] #window.stratos:gradient(1 min, value) select cluster_id, network_partition_id, value as gradient_memory_consumption group by cluster_id, network_partition_id insert into gradient_memory_consumption_stats;]]></queryExpressions>
-  <exportedStreams>
-    <stream name="gradient_load_average_stats"
-      valueOf="gradient_load_average_stats" version="1.0.0"/>
-    <stream name="gradient_memory_consumption_stats"
-      valueOf="gradient_memory_consumption_stats" version="1.0.0"/>
-    <stream name="member_gradient_load_average_stats"
-      valueOf="member_gradient_load_average_stats" version="1.0.0"/>
-    <stream name="member_gradient_memory_consumption_stats"
-      valueOf="member_gradient_memory_consumption_stats" version="1.0.0"/>
-    <stream name="fault_message" passthroughFlow="disable"
-      valueOf="fault_message" version="1.0.0"/>
-  </exportedStreams>
-</executionPlan>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/execution-plans/GradientOfRequestsInFlightFinder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/execution-plans/GradientOfRequestsInFlightFinder.xml b/extensions/cep/artifacts/execution-plans/GradientOfRequestsInFlightFinder.xml
deleted file mode 100644
index 507fdbe..0000000
--- a/extensions/cep/artifacts/execution-plans/GradientOfRequestsInFlightFinder.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<executionPlan name="GradientOfRequestsInFlightFinder"
-  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
-  <description>This will find the gradient of the number of requests in flight over a minute.</description>
-  <siddhiConfiguration>
-    <property name="siddhi.enable.distributed.processing">false</property>
-    <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
-  </siddhiConfiguration>
-  <importedStreams>
-    <stream as="lbStats2" name="in_flight_requests" version="1.0.0"/>
-  </importedStreams>
-  <queryExpressions><![CDATA[ 
-from lbStats2#window.stratos:gradient(1 min, in_flight_request_count)
-select cluster_id,network_partition_id,in_flight_request_count as count group by cluster_id,network_partition_id insert into gradient_in_flight_requests;]]></queryExpressions>
-  <exportedStreams>
-    <stream name="gradient_in_flight_requests" valueOf="gradient_in_flight_requests" version="1.0.0"/>
-  </exportedStreams>
-</executionPlan>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/execution-plans/SecondDerivativeOfHealthRequest.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/execution-plans/SecondDerivativeOfHealthRequest.xml b/extensions/cep/artifacts/execution-plans/SecondDerivativeOfHealthRequest.xml
deleted file mode 100644
index fefa306..0000000
--- a/extensions/cep/artifacts/execution-plans/SecondDerivativeOfHealthRequest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<executionPlan name="SecondDerivativeOfHealthRequest"
-  statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventprocessor">
-  <description>This will find the second derivative of health stats over a minute.</description>
-  <siddhiConfiguration>
-    <property name="siddhi.enable.distributed.processing">false</property>
-    <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
-  </siddhiConfiguration>
-  <importedStreams>
-    <stream as="healthStats3" name="cartridge_agent_health_stats" version="1.0.0"/>
-  </importedStreams>
-  <queryExpressions><![CDATA[ 
-    from healthStats3 [health_description == 'memory_consumption'] #window.stratos:secondDerivative(1 min, value) select cluster_id, network_partition_id, value as second_derivative_memory_consumption group by cluster_id,network_partition_id insert into second_derivative_memory_consumption_stats;
-    from healthStats3 [health_description == 'memory_consumption'] #window.stratos:secondDerivative(1 min, value) select member_id, cluster_id, network_partition_id, value as member_second_derivative_memory_consumption group by member_id insert into member_second_derivative_memory_consumption_stats;
-  from healthStats3 [health_description == 'load_average'] #window.stratos:secondDerivative(1 min, value) select member_id, cluster_id, network_partition_id, value as member_second_derivative_load_average group by member_id insert into member_second_derivative_load_average_stats;
-  from healthStats3 [health_description == 'load_average'] #window.stratos:secondDerivative(1 min, value) select cluster_id, network_partition_id, value as second_derivative_load_average group by cluster_id,network_partition_id insert into second_derivative_load_average_stats;]]></queryExpressions>
-  <exportedStreams>
-    <stream name="second_derivative_memory_consumption_stats"
-      valueOf="second_derivative_memory_consumption_stats" version="1.0.0"/>
-    <stream name="second_derivative_load_average_stats"
-      valueOf="second_derivative_load_average_stats" version="1.0.0"/>
-    <stream name="member_second_derivative_memory_consumption_stats"
-      valueOf="member_second_derivative_memory_consumption_stats" version="1.0.0"/>
-    <stream name="member_second_derivative_load_average_stats"
-      valueOf="member_second_derivative_load_average_stats" version="1.0.0"/>
-  </exportedStreams>
-</executionPlan>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/execution-plans/SecondDerivativeOfRequestsInFlightFinder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/execution-plans/SecondDerivativeOfRequestsInFlightFinder.xml b/extensions/cep/artifacts/execution-plans/SecondDerivativeOfRequestsInFlightFinder.xml
deleted file mode 100644
index a576657..0000000
--- a/extensions/cep/artifacts/execution-plans/SecondDerivativeOfRequestsInFlightFinder.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<executionPlan name="SecondDerivativeOfRequestsInFlightFinder"
-  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
-  <description>This will find the second derivative of the number of requests in flight over a minute.</description>
-  <siddhiConfiguration>
-    <property name="siddhi.enable.distributed.processing">false</property>
-    <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
-  </siddhiConfiguration>
-  <importedStreams>
-    <stream as="lbStats3" name="in_flight_requests" version="1.0.0"/>
-  </importedStreams>
-  <queryExpressions><![CDATA[ 
-from lbStats3#window.stratos:secondDerivative(1 min, in_flight_request_count)
-select cluster_id,network_partition_id,in_flight_request_count as count group by cluster_id,network_partition_id insert into second_derivative_in_flight_requests;]]></queryExpressions>
-  <exportedStreams>
-    <stream name="second_derivative_in_flight_requests"
-      valueOf="second_derivative_in_flight_requests" version="1.0.0"/>
-  </exportedStreams>
-</executionPlan>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml b/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml
new file mode 100644
index 0000000..d3cf7ff
--- /dev/null
+++ b/extensions/cep/artifacts/executionplans/AverageHeathRequest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<executionPlan name="AverageHeathRequest" statistics="disable"
+  trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
+  <description>This will average health stats of an instance over a minute.</description>
+  <siddhiConfiguration>
+    <property name="siddhi.enable.distributed.processing">false</property>
+    <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
+  </siddhiConfiguration>
+  <importedStreams>
+    <stream as="healthStats1" name="cartridge_agent_health_stats" version="1.0.0"/>
+  </importedStreams>
+  <queryExpressions><![CDATA[from healthStats1 [health_description == 'port_not_open'] select cluster_id, network_partition_id, member_id, partition_id insert into fault_message;
+  from healthStats1 [health_description == 'load_average'] #window.timeBatch(1 min) select cluster_id, network_partition_id, avg(value) as average_load_average group by cluster_id, network_partition_id insert into average_load_average_stats;
+  from healthStats1 [health_description == 'load_average'] #window.timeBatch(1 min) select member_id, cluster_id, network_partition_id, avg(value) as member_average_load_average group by member_id insert into member_average_load_average_stats;
+  from healthStats1 [health_description == 'memory_consumption'] #window.timeBatch(1 min) select member_id, cluster_id, network_partition_id, avg(value) as member_average_memory_consumption group by member_id insert into member_average_memory_consumption_stats;
+  from healthStats1 [health_description == 'memory_consumption'] #window.timeBatch(1 min) select cluster_id, network_partition_id, avg(value) as average_memory_consumption group by cluster_id, network_partition_id insert into average_memory_consumption_stats;]]></queryExpressions>
+  <exportedStreams>
+    <stream name="average_load_average_stats" passthroughFlow="disable"
+      valueOf="average_load_average_stats" version="1.0.0"/>
+    <stream name="member_average_load_average_stats" passthroughFlow="disable"
+      valueOf="member_average_load_average_stats" version="1.0.0"/>
+    <stream name="member_average_memory_consumption_stats" passthroughFlow="disable"
+      valueOf="member_average_memory_consumption_stats" version="1.0.0"/>
+    <stream name="average_memory_consumption_stats" passthroughFlow="disable"
+      valueOf="average_memory_consumption_stats" version="1.0.0"/>
+    <stream name="fault_message" passthroughFlow="disable"
+      valueOf="fault_message" version="1.0.0"/>
+  </exportedStreams>
+</executionPlan>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/executionplans/AverageInFlightRequestsFinder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/AverageInFlightRequestsFinder.xml b/extensions/cep/artifacts/executionplans/AverageInFlightRequestsFinder.xml
new file mode 100644
index 0000000..5022bde
--- /dev/null
+++ b/extensions/cep/artifacts/executionplans/AverageInFlightRequestsFinder.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<executionPlan name="AverageInFlightRequestsFinder" statistics="disable"
+  trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
+  <description>This will average the number of requests in flight over a minute.</description>
+  <siddhiConfiguration>
+    <property name="siddhi.enable.distributed.processing">false</property>
+    <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
+  </siddhiConfiguration>
+  <importedStreams>
+    <stream as="lbStats1" name="in_flight_requests" version="1.0.0"/>
+  </importedStreams>
+  <queryExpressions><![CDATA[ 
+from lbStats1#window.timeBatch(1 min)
+select cluster_id,network_partition_id, avg(in_flight_request_count) as count group by cluster_id,network_partition_id  insert into average_in_flight_requests;]]></queryExpressions>
+  <exportedStreams>
+    <stream name="average_in_flight_requests"
+      valueOf="average_in_flight_requests" version="1.0.0"/>
+  </exportedStreams>
+</executionPlan>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml b/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml
new file mode 100644
index 0000000..75406f9
--- /dev/null
+++ b/extensions/cep/artifacts/executionplans/GradientOfHealthRequest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<executionPlan name="GradientOfHealthRequest" statistics="disable"
+  trace="disable" xmlns="http://wso2.org/carbon/eventprocessor">
+  <description>This will find the gradient of the heath request over a minute.</description>
+  <siddhiConfiguration>
+    <property name="siddhi.enable.distributed.processing">false</property>
+    <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
+  </siddhiConfiguration>
+  <importedStreams>
+    <stream as="healthStats2" name="cartridge_agent_health_stats" version="1.0.0"/>
+  </importedStreams>
+  <queryExpressions><![CDATA[
+  from healthStats2 #window.stratos:faultHandling(1min, member_id) select cluster_id, network_partition_id, member_id, partition_id group by cluster_id, network_partition_id insert into fault_message;
+  from healthStats2 [health_description == 'load_average'] #window.stratos:gradient(1 min, value) select cluster_id, network_partition_id, value as gradient_load_average group by cluster_id, network_partition_id insert into gradient_load_average_stats;
+  from healthStats2 [health_description == 'load_average'] #window.stratos:gradient(1 min, value) select member_id, cluster_id, network_partition_id, value as member_gradient_load_average group by member_id insert into member_gradient_load_average_stats;
+  from healthStats2 [health_description == 'memory_consumption'] #window.stratos:gradient(1 min, value) select member_id, cluster_id, network_partition_id, value as member_gradient_memory_consumption group by member_id insert into member_gradient_memory_consumption_stats;
+  from healthStats2 [health_description == 'memory_consumption'] #window.stratos:gradient(1 min, value) select cluster_id, network_partition_id, value as gradient_memory_consumption group by cluster_id, network_partition_id insert into gradient_memory_consumption_stats;]]></queryExpressions>
+  <exportedStreams>
+    <stream name="gradient_load_average_stats"
+      valueOf="gradient_load_average_stats" version="1.0.0"/>
+    <stream name="gradient_memory_consumption_stats"
+      valueOf="gradient_memory_consumption_stats" version="1.0.0"/>
+    <stream name="member_gradient_load_average_stats"
+      valueOf="member_gradient_load_average_stats" version="1.0.0"/>
+    <stream name="member_gradient_memory_consumption_stats"
+      valueOf="member_gradient_memory_consumption_stats" version="1.0.0"/>
+    <stream name="fault_message" passthroughFlow="disable"
+      valueOf="fault_message" version="1.0.0"/>
+  </exportedStreams>
+</executionPlan>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml b/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml
new file mode 100644
index 0000000..507fdbe
--- /dev/null
+++ b/extensions/cep/artifacts/executionplans/GradientOfRequestsInFlightFinder.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<executionPlan name="GradientOfRequestsInFlightFinder"
+  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
+  <description>This will find the gradient of the number of requests in flight over a minute.</description>
+  <siddhiConfiguration>
+    <property name="siddhi.enable.distributed.processing">false</property>
+    <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
+  </siddhiConfiguration>
+  <importedStreams>
+    <stream as="lbStats2" name="in_flight_requests" version="1.0.0"/>
+  </importedStreams>
+  <queryExpressions><![CDATA[ 
+from lbStats2#window.stratos:gradient(1 min, in_flight_request_count)
+select cluster_id,network_partition_id,in_flight_request_count as count group by cluster_id,network_partition_id insert into gradient_in_flight_requests;]]></queryExpressions>
+  <exportedStreams>
+    <stream name="gradient_in_flight_requests" valueOf="gradient_in_flight_requests" version="1.0.0"/>
+  </exportedStreams>
+</executionPlan>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml b/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml
new file mode 100644
index 0000000..fefa306
--- /dev/null
+++ b/extensions/cep/artifacts/executionplans/SecondDerivativeOfHealthRequest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<executionPlan name="SecondDerivativeOfHealthRequest"
+  statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventprocessor">
+  <description>This will find the second derivative of health stats over a minute.</description>
+  <siddhiConfiguration>
+    <property name="siddhi.enable.distributed.processing">false</property>
+    <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
+  </siddhiConfiguration>
+  <importedStreams>
+    <stream as="healthStats3" name="cartridge_agent_health_stats" version="1.0.0"/>
+  </importedStreams>
+  <queryExpressions><![CDATA[ 
+    from healthStats3 [health_description == 'memory_consumption'] #window.stratos:secondDerivative(1 min, value) select cluster_id, network_partition_id, value as second_derivative_memory_consumption group by cluster_id,network_partition_id insert into second_derivative_memory_consumption_stats;
+    from healthStats3 [health_description == 'memory_consumption'] #window.stratos:secondDerivative(1 min, value) select member_id, cluster_id, network_partition_id, value as member_second_derivative_memory_consumption group by member_id insert into member_second_derivative_memory_consumption_stats;
+  from healthStats3 [health_description == 'load_average'] #window.stratos:secondDerivative(1 min, value) select member_id, cluster_id, network_partition_id, value as member_second_derivative_load_average group by member_id insert into member_second_derivative_load_average_stats;
+  from healthStats3 [health_description == 'load_average'] #window.stratos:secondDerivative(1 min, value) select cluster_id, network_partition_id, value as second_derivative_load_average group by cluster_id,network_partition_id insert into second_derivative_load_average_stats;]]></queryExpressions>
+  <exportedStreams>
+    <stream name="second_derivative_memory_consumption_stats"
+      valueOf="second_derivative_memory_consumption_stats" version="1.0.0"/>
+    <stream name="second_derivative_load_average_stats"
+      valueOf="second_derivative_load_average_stats" version="1.0.0"/>
+    <stream name="member_second_derivative_memory_consumption_stats"
+      valueOf="member_second_derivative_memory_consumption_stats" version="1.0.0"/>
+    <stream name="member_second_derivative_load_average_stats"
+      valueOf="member_second_derivative_load_average_stats" version="1.0.0"/>
+  </exportedStreams>
+</executionPlan>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml b/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml
new file mode 100644
index 0000000..a576657
--- /dev/null
+++ b/extensions/cep/artifacts/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<executionPlan name="SecondDerivativeOfRequestsInFlightFinder"
+  statistics="disable" trace="enable" xmlns="http://wso2.org/carbon/eventprocessor">
+  <description>This will find the second derivative of the number of requests in flight over a minute.</description>
+  <siddhiConfiguration>
+    <property name="siddhi.enable.distributed.processing">false</property>
+    <property name="siddhi.persistence.snapshot.time.interval.minutes">0</property>
+  </siddhiConfiguration>
+  <importedStreams>
+    <stream as="lbStats3" name="in_flight_requests" version="1.0.0"/>
+  </importedStreams>
+  <queryExpressions><![CDATA[ 
+from lbStats3#window.stratos:secondDerivative(1 min, in_flight_request_count)
+select cluster_id,network_partition_id,in_flight_request_count as count group by cluster_id,network_partition_id insert into second_derivative_in_flight_requests;]]></queryExpressions>
+  <exportedStreams>
+    <stream name="second_derivative_in_flight_requests"
+      valueOf="second_derivative_in_flight_requests" version="1.0.0"/>
+  </exportedStreams>
+</executionPlan>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/input-event-adaptors/DefaultWSO2EventInputAdaptor.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/input-event-adaptors/DefaultWSO2EventInputAdaptor.xml b/extensions/cep/artifacts/input-event-adaptors/DefaultWSO2EventInputAdaptor.xml
deleted file mode 100644
index 8cc5e89..0000000
--- a/extensions/cep/artifacts/input-event-adaptors/DefaultWSO2EventInputAdaptor.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inputEventAdaptor name="DefaultWSO2EventInputAdaptor"
-  statistics="disable" trace="enable" type="wso2event" xmlns="http://wso2.org/carbon/eventadaptormanager"/>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/inputeventadaptors/DefaultWSO2EventInputAdaptor.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/inputeventadaptors/DefaultWSO2EventInputAdaptor.xml b/extensions/cep/artifacts/inputeventadaptors/DefaultWSO2EventInputAdaptor.xml
new file mode 100644
index 0000000..8cc5e89
--- /dev/null
+++ b/extensions/cep/artifacts/inputeventadaptors/DefaultWSO2EventInputAdaptor.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inputEventAdaptor name="DefaultWSO2EventInputAdaptor"
+  statistics="disable" trace="enable" type="wso2event" xmlns="http://wso2.org/carbon/eventadaptormanager"/>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/output-event-adaptors/DefaultWSO2EventOutputAdaptor.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/output-event-adaptors/DefaultWSO2EventOutputAdaptor.xml b/extensions/cep/artifacts/output-event-adaptors/DefaultWSO2EventOutputAdaptor.xml
deleted file mode 100644
index 59ba20d..0000000
--- a/extensions/cep/artifacts/output-event-adaptors/DefaultWSO2EventOutputAdaptor.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<outputEventAdaptor name="DefaultWSO2EventOutputAdaptor"
-  statistics="disable" trace="disable" type="wso2event" xmlns="http://wso2.org/carbon/eventadaptormanager">
-  <property name="username">admin</property>
-  <property name="receiverURL">tcp://localhost:7661</property>
-  <property name="password">admin</property>
-  <property name="authenticatorURL">ssl://localhost:7761</property>
-</outputEventAdaptor>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/output-event-adaptors/JMSOutputAdaptor.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/output-event-adaptors/JMSOutputAdaptor.xml b/extensions/cep/artifacts/output-event-adaptors/JMSOutputAdaptor.xml
deleted file mode 100644
index 8bf0cfc..0000000
--- a/extensions/cep/artifacts/output-event-adaptors/JMSOutputAdaptor.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<outputEventAdaptor name="JMSOutputAdaptor" statistics="disable"
-  trace="enable" type="jms" xmlns="http://wso2.org/carbon/eventadaptormanager">
-  <property name="java.naming.provider.url">$cep-home/repository/conf/jndi.properties</property>
-  <property name="java.naming.factory.initial">org.wso2.andes.jndi.PropertiesFileInitialContextFactory</property>
-  <property name="transport.jms.ConnectionFactoryJNDIName">topicConnectionfactory</property>
-  <property name="transport.jms.DestinationType">topic</property>
-</outputEventAdaptor>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/outputeventadaptors/DefaultWSO2EventOutputAdaptor.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/outputeventadaptors/DefaultWSO2EventOutputAdaptor.xml b/extensions/cep/artifacts/outputeventadaptors/DefaultWSO2EventOutputAdaptor.xml
new file mode 100644
index 0000000..59ba20d
--- /dev/null
+++ b/extensions/cep/artifacts/outputeventadaptors/DefaultWSO2EventOutputAdaptor.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<outputEventAdaptor name="DefaultWSO2EventOutputAdaptor"
+  statistics="disable" trace="disable" type="wso2event" xmlns="http://wso2.org/carbon/eventadaptormanager">
+  <property name="username">admin</property>
+  <property name="receiverURL">tcp://localhost:7661</property>
+  <property name="password">admin</property>
+  <property name="authenticatorURL">ssl://localhost:7761</property>
+</outputEventAdaptor>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/09caa6b5/extensions/cep/artifacts/outputeventadaptors/JMSOutputAdaptor.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/outputeventadaptors/JMSOutputAdaptor.xml b/extensions/cep/artifacts/outputeventadaptors/JMSOutputAdaptor.xml
new file mode 100644
index 0000000..8bf0cfc
--- /dev/null
+++ b/extensions/cep/artifacts/outputeventadaptors/JMSOutputAdaptor.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<outputEventAdaptor name="JMSOutputAdaptor" statistics="disable"
+  trace="enable" type="jms" xmlns="http://wso2.org/carbon/eventadaptormanager">
+  <property name="java.naming.provider.url">$cep-home/repository/conf/jndi.properties</property>
+  <property name="java.naming.factory.initial">org.wso2.andes.jndi.PropertiesFileInitialContextFactory</property>
+  <property name="transport.jms.ConnectionFactoryJNDIName">topicConnectionfactory</property>
+  <property name="transport.jms.DestinationType">topic</property>
+</outputEventAdaptor>


[3/4] git commit: Set CEP_HOME variable

Posted by ma...@apache.org.
Set CEP_HOME variable


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

Branch: refs/heads/master
Commit: baba9d208e84803e65f6b4dbedff25b102e85051
Parents: 09caa6b
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Tue Dec 17 17:02:59 2013 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Tue Dec 17 17:02:59 2013 +0530

----------------------------------------------------------------------
 extensions/cep/artifacts/outputeventadaptors/JMSOutputAdaptor.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/baba9d20/extensions/cep/artifacts/outputeventadaptors/JMSOutputAdaptor.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/artifacts/outputeventadaptors/JMSOutputAdaptor.xml b/extensions/cep/artifacts/outputeventadaptors/JMSOutputAdaptor.xml
index 8bf0cfc..b1e0a7f 100644
--- a/extensions/cep/artifacts/outputeventadaptors/JMSOutputAdaptor.xml
+++ b/extensions/cep/artifacts/outputeventadaptors/JMSOutputAdaptor.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <outputEventAdaptor name="JMSOutputAdaptor" statistics="disable"
   trace="enable" type="jms" xmlns="http://wso2.org/carbon/eventadaptormanager">
-  <property name="java.naming.provider.url">$cep-home/repository/conf/jndi.properties</property>
+  <property name="java.naming.provider.url">CEP_HOME/repository/conf/jndi.properties</property>
   <property name="java.naming.factory.initial">org.wso2.andes.jndi.PropertiesFileInitialContextFactory</property>
   <property name="transport.jms.ConnectionFactoryJNDIName">topicConnectionfactory</property>
   <property name="transport.jms.DestinationType">topic</property>