You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/03/31 09:02:23 UTC

[06/10] git commit: Removed CEP Puppet Module

Removed CEP Puppet Module


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

Branch: refs/heads/master
Commit: 197bd12ca12c63acbc6661c8d20437188bbc9597
Parents: 3a67dfe
Author: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Authored: Mon Mar 31 12:17:30 2014 +0530
Committer: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Committed: Mon Mar 31 12:17:30 2014 +0530

----------------------------------------------------------------------
 tools/puppet3/modules/cep/LICENSE               |  13 -
 .../modules/cep/files/configs/bin/wso2server.sh | 304 --------
 .../dropins/activemq_client_5.8.0_1.0.0.jar     | Bin 1032400 -> 0 bytes
 .../dropins/andes_client_0.13.wso2v8_1.0.0.jar  | Bin 1854829 -> 0 bytes
 ...che.stratos.cep.extension-1.0.0-SNAPSHOT.jar | Bin 16495 -> 0 bytes
 .../repository/conf/siddhi/siddhi.extension     |   3 -
 .../repository/conf/stream-manager-config.xml   | 177 -----
 .../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 -
 .../executionplans/AverageHeathRequest.xml      |  29 -
 .../AverageInFlightRequestsFinder.xml           |  19 -
 .../executionplans/GradientOfHealthRequest.xml  |  30 -
 .../GradientOfRequestsInFlightFinder.xml        |  18 -
 .../SecondDerivativeOfHealthRequest.xml         |  27 -
 ...SecondDerivativeOfRequestsInFlightFinder.xml |  19 -
 .../DefaultWSO2EventInputAdaptor.xml            |   3 -
 .../DefaultWSO2EventOutputAdaptor.xml           |   8 -
 .../outputeventadaptors/JMSOutputAdaptor.xml    |   8 -
 .../streamdefinitions/stream-manager-config.xml | 269 -------
 tools/puppet3/modules/cep/manifests/clean.pp    |  45 --
 tools/puppet3/modules/cep/manifests/deploy.pp   |  43 --
 tools/puppet3/modules/cep/manifests/init.pp     | 101 ---
 .../puppet3/modules/cep/manifests/initialize.pp |  59 --
 tools/puppet3/modules/cep/manifests/params.pp   |  69 --
 .../modules/cep/manifests/push_templates.pp     |  26 -
 tools/puppet3/modules/cep/manifests/start.pp    |  27 -
 .../cep/templates/conf/axis2/axis2.xml.erb      | 698 -------------------
 .../modules/cep/templates/conf/carbon.xml.erb   | 609 ----------------
 .../cep/templates/conf/jndi.properties.erb      |  32 -
 .../JMSOutputAdaptor.xml.erb                    |   8 -
 47 files changed, 2850 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/197bd12c/tools/puppet3/modules/cep/LICENSE
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/LICENSE b/tools/puppet3/modules/cep/LICENSE
deleted file mode 100755
index 1efdbc6..0000000
--- a/tools/puppet3/modules/cep/LICENSE
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright 2005-2013 WSO2, Inc. http://www.wso2.org
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/197bd12c/tools/puppet3/modules/cep/files/configs/bin/wso2server.sh
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/bin/wso2server.sh b/tools/puppet3/modules/cep/files/configs/bin/wso2server.sh
deleted file mode 100755
index 5954c6d..0000000
--- a/tools/puppet3/modules/cep/files/configs/bin/wso2server.sh
+++ /dev/null
@@ -1,304 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-#  Copyright 2005-2012 WSO2, Inc. http://www.wso2.org
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-# ----------------------------------------------------------------------------
-# Main Script for the WSO2 Carbon Server
-#
-# Environment Variable Prequisites
-#
-#   CARBON_HOME   Home of WSO2 Carbon installation. If not set I will  try
-#                   to figure it out.
-#
-#   JAVA_HOME       Must point at your Java Development Kit installation.
-#
-#   JAVA_OPTS       (Optional) Java runtime options used when the commands
-#                   is executed.
-#
-# NOTE: Borrowed generously from Apache Tomcat startup scripts.
-# -----------------------------------------------------------------------------
-
-# OS specific support.  $var _must_ be set to either true or false.
-#ulimit -n 100000
-
-JAVA_HOME="/opt/java"
-
-cygwin=false;
-darwin=false;
-os400=false;
-mingw=false;
-case "`uname`" in
-CYGWIN*) cygwin=true;;
-MINGW*) mingw=true;;
-OS400*) os400=true;;
-Darwin*) darwin=true
-        if [ -z "$JAVA_VERSION" ] ; then
-             JAVA_VERSION="CurrentJDK"
-           else
-             echo "Using Java version: $JAVA_VERSION"
-           fi
-           if [ -z "$JAVA_HOME" ] ; then
-             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
-           fi
-           ;;
-esac
-
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ]; do
-  ls=`ls -ld "$PRG"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '.*/.*' > /dev/null; then
-    PRG="$link"
-  else
-    PRG=`dirname "$PRG"`/"$link"
-  fi
-done
-
-# Get standard environment variables
-PRGDIR=`dirname "$PRG"`
-
-# Only set CARBON_HOME if not already set
-[ -z "$CARBON_HOME" ] && CARBON_HOME=`cd "$PRGDIR/.." ; pwd`
-
-# Set AXIS2_HOME. Needed for One Click JAR Download
-AXIS2_HOME=$CARBON_HOME
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin; then
-  [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-  [ -n "$CARBON_HOME" ] && CARBON_HOME=`cygpath --unix "$CARBON_HOME"`
-  [ -n "$AXIS2_HOME" ] && CARBON_HOME=`cygpath --unix "$CARBON_HOME"`
-fi
-
-# For OS400
-if $os400; then
-  # Set job priority to standard for interactive (interactive - 6) by using
-  # the interactive priority - 6, the helper threads that respond to requests
-  # will be running at the same priority as interactive jobs.
-  COMMAND='chgjob job('$JOBNAME') runpty(6)'
-  system $COMMAND
-
-  # Enable multi threading
-  QIBM_MULTI_THREADED=Y
-  export QIBM_MULTI_THREADED
-fi
-
-# For Migwn, ensure paths are in UNIX format before anything is touched
-if $mingw ; then
-  [ -n "$CARBON_HOME" ] &&
-    CARBON_HOME="`(cd "$CARBON_HOME"; pwd)`"
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
-  [ -n "$AXIS2_HOME" ] &&
-    CARBON_HOME="`(cd "$CARBON_HOME"; pwd)`"
-  # TODO classpath?
-fi
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD=java
-  fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly."
-  echo " CARBON cannot execute $JAVACMD"
-  exit 1
-fi
-
-# if JAVA_HOME is not set we're not happy
-if [ -z "$JAVA_HOME" ]; then
-  echo "You must set the JAVA_HOME variable before running CARBON."
-  exit 1
-fi
-
-if [ -e "$CARBON_HOME/wso2carbon.pid" ]; then
-  PID=`cat "$CARBON_HOME"/wso2carbon.pid`
-fi
-
-# ----- Process the input command ----------------------------------------------
-args=""
-for c in $*
-do
-    if [ "$c" = "--debug" ] || [ "$c" = "-debug" ] || [ "$c" = "debug" ]; then
-          CMD="--debug"
-          continue
-    elif [ "$CMD" = "--debug" ]; then
-          if [ -z "$PORT" ]; then
-                PORT=$c
-          fi
-    elif [ "$c" = "--stop" ] || [ "$c" = "-stop" ] || [ "$c" = "stop" ]; then
-          CMD="stop"
-    elif [ "$c" = "--start" ] || [ "$c" = "-start" ] || [ "$c" = "start" ]; then
-          CMD="start"
-    elif [ "$c" = "--version" ] || [ "$c" = "-version" ] || [ "$c" = "version" ]; then
-          CMD="version"
-    elif [ "$c" = "--restart" ] || [ "$c" = "-restart" ] || [ "$c" = "restart" ]; then
-          CMD="restart"
-    elif [ "$c" = "--test" ] || [ "$c" = "-test" ] || [ "$c" = "test" ]; then
-          CMD="test"
-    else
-        args="$args $c"
-    fi
-done
-
-if [ "$CMD" = "--debug" ]; then
-  if [ "$PORT" = "" ]; then
-    echo " Please specify the debug port after the --debug option"
-    exit 1
-  fi
-  if [ -n "$JAVA_OPTS" ]; then
-    echo "Warning !!!. User specified JAVA_OPTS will be ignored, once you give the --debug option."
-  fi
-  CMD="RUN"
-  JAVA_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=$PORT"
-  echo "Please start the remote debugging client to continue..."
-elif [ "$CMD" = "start" ]; then
-  if [ -e "$CARBON_HOME/wso2carbon.pid" ]; then
-    if  ps -p $PID >&- ; then
-      echo "Process is already running"
-      exit 0
-    fi
-  fi
-  export CARBON_HOME=$CARBON_HOME
-# using nohup bash to avoid erros in solaris OS.TODO
-  nohup bash $CARBON_HOME/bin/wso2server.sh $args > /dev/null 2>&1 &
-  exit 0
-elif [ "$CMD" = "stop" ]; then
-  export CARBON_HOME=$CARBON_HOME
-  kill -term `cat $CARBON_HOME/wso2carbon.pid`
-  exit 0
-elif [ "$CMD" = "restart" ]; then
-  export CARBON_HOME=$CARBON_HOME
-  kill -term `cat $CARBON_HOME/wso2carbon.pid`
-  process_status=0
-  pid=`cat $CARBON_HOME/wso2carbon.pid`
-  while [ "$process_status" -eq "0" ]
-  do
-        sleep 1;
-        ps -p$pid 2>&1 > /dev/null
-        process_status=$?
-  done
-
-# using nohup bash to avoid erros in solaris OS.TODO
-  nohup bash $CARBON_HOME/bin/wso2server.sh $args > /dev/null 2>&1 &
-  exit 0
-elif [ "$CMD" = "test" ]; then
-    JAVACMD="exec "$JAVACMD""
-elif [ "$CMD" = "version" ]; then
-  cat $CARBON_HOME/bin/version.txt
-  cat $CARBON_HOME/bin/wso2carbon-version.txt
-  exit 0
-fi
-
-# ---------- Handle the SSL Issue with proper JDK version --------------------
-jdk_16=`$JAVA_HOME/bin/java -version 2>&1 | grep "1.[6|7]"`
-if [ "$jdk_16" = "" ]; then
-   echo " Starting WSO2 Carbon (in unsupported JDK)"
-   echo " [ERROR] CARBON is supported only on JDK 1.6 and 1.7"
-fi
-
-CARBON_XBOOTCLASSPATH=""
-for f in "$CARBON_HOME"/lib/xboot/*.jar
-do
-    if [ "$f" != "$CARBON_HOME/lib/xboot/*.jar" ];then
-        CARBON_XBOOTCLASSPATH="$CARBON_XBOOTCLASSPATH":$f
-    fi
-done
-
-JAVA_ENDORSED_DIRS="$CARBON_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
-
-CARBON_CLASSPATH=""
-if [ -e "$JAVA_HOME/lib/tools.jar" ]; then
-    CARBON_CLASSPATH="$JAVA_HOME/lib/tools.jar"
-fi
-for f in "$CARBON_HOME"/bin/*.jar
-do
-    if [ "$f" != "$CARBON_HOME/bin/*.jar" ];then
-        CARBON_CLASSPATH="$CARBON_CLASSPATH":$f
-    fi
-done
-for t in "$CARBON_HOME"/lib/commons-lang*.jar
-do
-    CARBON_CLASSPATH="$CARBON_CLASSPATH":$t
-done
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
-  CARBON_HOME=`cygpath --absolute --windows "$CARBON_HOME"`
-  AXIS2_HOME=`cygpath --absolute --windows "$CARBON_HOME"`
-  CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
-  JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
-  CARBON_CLASSPATH=`cygpath --path --windows "$CARBON_CLASSPATH"`
-  CARBON_XBOOTCLASSPATH=`cygpath --path --windows "$CARBON_XBOOTCLASSPATH"`
-fi
-
-# ----- Execute The Requested Command -----------------------------------------
-
-echo JAVA_HOME environment variable is set to $JAVA_HOME
-echo CARBON_HOME environment variable is set to $CARBON_HOME
-
-cd "$CARBON_HOME"
-
-START_EXIT_STATUS=121
-status=$START_EXIT_STATUS
-
-#To monitor a Carbon server in remote JMX mode on linux host machines, set the below system property.
-#   -Djava.rmi.server.hostname="your.IP.goes.here"
-
-while [ "$status" = "$START_EXIT_STATUS" ]
-do
-    $JAVACMD \
-    -Xbootclasspath/a:"$CARBON_XBOOTCLASSPATH" \
-    -Xms256m -Xmx1024m -XX:MaxPermSize=256m \
-    -XX:+HeapDumpOnOutOfMemoryError \
-    -XX:HeapDumpPath="$CARBON_HOME/repository/logs/heap-dump.hprof" \
-    -javaagent:"$CARBON_HOME/repository/components/plugins/jamm_0.2.5.wso2v2.jar" \
-    $JAVA_OPTS \
-    -Dcom.sun.management.jmxremote \
-    -classpath "$CARBON_CLASSPATH" \
-    -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \
-    -Djava.io.tmpdir="$CARBON_HOME/tmp" \
-    -Dcatalina.base="$CARBON_HOME/lib/tomcat" \
-    -Dwso2.server.standalone=true \
-    -Dcarbon.registry.root=/ \
-    -Djava.command="$JAVACMD" \
-    -Dcarbon.home="$CARBON_HOME" \
-    -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
-    -Dcarbon.config.dir.path="$CARBON_HOME/repository/conf" \
-    -Djava.util.logging.config.file="$CARBON_HOME/repository/conf/etc/logging-bridge.properties" \
-    -Dcomponents.repo="$CARBON_HOME/repository/components/plugins" \
-    -Dconf.location="$CARBON_HOME/repository/conf"\
-    -Dcom.atomikos.icatch.file="$CARBON_HOME/lib/transactions.properties" \
-    -Dcom.atomikos.icatch.hide_init_file_path=true \
-    -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true \
-    -Dcom.sun.jndi.ldap.connect.pool.authentication=simple  \
-    -Dcom.sun.jndi.ldap.connect.pool.timeout=3000  \
-    -Dorg.terracotta.quartz.skipUpdateCheck=true \
-    -Djava.security.egd=file:/dev/./urandom \
-    -Dfile.encoding=UTF8 \
-    -Ddisable.cassandra.server.startup=true \
-    org.wso2.carbon.bootstrap.Bootstrap $*
-    status=$?
-done

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/197bd12c/tools/puppet3/modules/cep/files/configs/repository/components/dropins/activemq_client_5.8.0_1.0.0.jar
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/components/dropins/activemq_client_5.8.0_1.0.0.jar b/tools/puppet3/modules/cep/files/configs/repository/components/dropins/activemq_client_5.8.0_1.0.0.jar
deleted file mode 100644
index bd2512c..0000000
Binary files a/tools/puppet3/modules/cep/files/configs/repository/components/dropins/activemq_client_5.8.0_1.0.0.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/197bd12c/tools/puppet3/modules/cep/files/configs/repository/components/dropins/andes_client_0.13.wso2v8_1.0.0.jar
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/components/dropins/andes_client_0.13.wso2v8_1.0.0.jar b/tools/puppet3/modules/cep/files/configs/repository/components/dropins/andes_client_0.13.wso2v8_1.0.0.jar
deleted file mode 100644
index 2ff90c3..0000000
Binary files a/tools/puppet3/modules/cep/files/configs/repository/components/dropins/andes_client_0.13.wso2v8_1.0.0.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/197bd12c/tools/puppet3/modules/cep/files/configs/repository/components/lib/org.apache.stratos.cep.extension-1.0.0-SNAPSHOT.jar
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/components/lib/org.apache.stratos.cep.extension-1.0.0-SNAPSHOT.jar b/tools/puppet3/modules/cep/files/configs/repository/components/lib/org.apache.stratos.cep.extension-1.0.0-SNAPSHOT.jar
deleted file mode 100755
index 0ef74d4..0000000
Binary files a/tools/puppet3/modules/cep/files/configs/repository/components/lib/org.apache.stratos.cep.extension-1.0.0-SNAPSHOT.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/197bd12c/tools/puppet3/modules/cep/files/configs/repository/conf/siddhi/siddhi.extension
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/conf/siddhi/siddhi.extension b/tools/puppet3/modules/cep/files/configs/repository/conf/siddhi/siddhi.extension
deleted file mode 100755
index 6bb9aca..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/conf/siddhi/siddhi.extension
+++ /dev/null
@@ -1,3 +0,0 @@
-org.apache.stratos.cep.extension.GradientFinderWindowProcessor
-org.apache.stratos.cep.extension.SecondDerivativeFinderWindowProcessor
-org.apache.stratos.cep.extension.FaultHandlingWindowProcessor

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/197bd12c/tools/puppet3/modules/cep/files/configs/repository/conf/stream-manager-config.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/conf/stream-manager-config.xml b/tools/puppet3/modules/cep/files/configs/repository/conf/stream-manager-config.xml
deleted file mode 100755
index 8089507..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/conf/stream-manager-config.xml
+++ /dev/null
@@ -1,177 +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 -->
-</streamManagerConfiguration>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventbuilders/HealthStatisticsEventBuilder.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventbuilders/HealthStatisticsEventBuilder.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventbuilders/HealthStatisticsEventBuilder.xml
deleted file mode 100644
index 763f7d8..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventbuilders/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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventbuilders/InstanceStatusStatisticsBuilder.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventbuilders/InstanceStatusStatisticsBuilder.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventbuilders/InstanceStatusStatisticsBuilder.xml
deleted file mode 100644
index ed133c9..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventbuilders/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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventbuilders/LoadBalancerStatisticsEventBuilder.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventbuilders/LoadBalancerStatisticsEventBuilder.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventbuilders/LoadBalancerStatisticsEventBuilder.xml
deleted file mode 100644
index a3bf644..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventbuilders/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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/AverageInFlightRequestsEventFormatter.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/AverageInFlightRequestsEventFormatter.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/AverageInFlightRequestsEventFormatter.xml
deleted file mode 100644
index bf18f7d..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/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>{"org.apache.stratos.messaging.event.health.stat.AverageRequestsInFlightEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/AverageLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/AverageLoadAverageEventFormatter.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/AverageLoadAverageEventFormatter.xml
deleted file mode 100644
index 7e4cbc6..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/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>{"org.apache.stratos.messaging.event.health.stat.AverageLoadAverageEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/AverageMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/AverageMemoryConsumptionEventFormatter.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/AverageMemoryConsumptionEventFormatter.xml
deleted file mode 100644
index 7a69ac4..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/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>{"org.apache.stratos.messaging.event.health.stat.AverageMemoryConsumptionEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/FaultMessageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/FaultMessageEventFormatter.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/FaultMessageEventFormatter.xml
deleted file mode 100644
index 639332d..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/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>{"org.apache.stratos.messaging.event.health.stat.MemberFaultEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{network_partition_id}}","memberId":"{{member_id}}","partitionId":"{{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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/GradientInFlightRequestsEventFormatter.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/GradientInFlightRequestsEventFormatter.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/GradientInFlightRequestsEventFormatter.xml
deleted file mode 100644
index 18b482e..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/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>{"org.apache.stratos.messaging.event.health.stat.GradientOfRequestsInFlightEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/GradientLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/GradientLoadAverageEventFormatter.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/GradientLoadAverageEventFormatter.xml
deleted file mode 100644
index d44d033..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/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>{"org.apache.stratos.messaging.event.health.stat.GradientOfLoadAverageEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/GradientMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/GradientMemoryConsumptionEventFormatter.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/GradientMemoryConsumptionEventFormatter.xml
deleted file mode 100644
index f91d85e..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/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>{"org.apache.stratos.messaging.event.health.stat.GradientOfMemoryConsumptionEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/MemberAverageLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/MemberAverageLoadAverageEventFormatter.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/MemberAverageLoadAverageEventFormatter.xml
deleted file mode 100644
index 18e3fe3..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/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>{"org.apache.stratos.messaging.event.health.stat.MemberAverageLoadAverageEvent":{"message":{"memberId":"{{member_id}}","clusterId":"{{cluster_id}}","networkPartitionId":"{{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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/MemberAverageMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/MemberAverageMemoryConsumptionEventFormatter.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/MemberAverageMemoryConsumptionEventFormatter.xml
deleted file mode 100644
index 7189b69..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/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>{"org.apache.stratos.messaging.event.health.stat.MemberAverageMemoryConsumptionEvent":{"message":{"memberId":"{{member_id}}","clusterId":"{{cluster_id}}","networkPartitionId":"{{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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/MemberGradientLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/MemberGradientLoadAverageEventFormatter.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/MemberGradientLoadAverageEventFormatter.xml
deleted file mode 100644
index aaeba57..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/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>{"org.apache.stratos.messaging.event.health.stat.MemberGradientOfLoadAverageEvent":{"message":{"memberId":"{{member_id}}","clusterId":"{{cluster_id}}","networkPartitionId":"{{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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/MemberGradientMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/MemberGradientMemoryConsumptionEventFormatter.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/MemberGradientMemoryConsumptionEventFormatter.xml
deleted file mode 100644
index 120d78f..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/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>{"org.apache.stratos.messaging.event.health.stat.MemberGradientOfMemoryConsumptionEvent":{"message":{"memberId":"{{member_id}}","clusterId":"{{cluster_id}}","networkPartitionId":"{{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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/MemberSecondDerivativeLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/MemberSecondDerivativeLoadAverageEventFormatter.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/MemberSecondDerivativeLoadAverageEventFormatter.xml
deleted file mode 100644
index 6b4ab66..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/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>{"org.apache.stratos.messaging.event.health.stat.MemberSecondDerivativeOfLoadAverageEvent":{"message":{"memberId":"{{member_id}}","clusterId":"{{cluster_id}}","networkPartitionId":"{{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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/MemberSecondDerivativeMemoryConsumptionEventFormatter.xml
deleted file mode 100644
index 9dc967a..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/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>{"org.apache.stratos.messaging.event.health.stat.MemberSecondDerivativeOfMemoryConsumptionEvent":{"message":{"memberId":"{{member_id}}","clusterId":"{{cluster_id}}","networkPartitionId":"{{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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/SecondDerivativeInFlightRequestsEventFormatter.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/SecondDerivativeInFlightRequestsEventFormatter.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/SecondDerivativeInFlightRequestsEventFormatter.xml
deleted file mode 100644
index 18bba84..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/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>{"org.apache.stratos.messaging.event.health.stat.SecondDerivativeOfRequestsInFlightEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/SecondDerivativeLoadAverageEventFormatter.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/SecondDerivativeLoadAverageEventFormatter.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/SecondDerivativeLoadAverageEventFormatter.xml
deleted file mode 100644
index 9312bd9..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/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>{"org.apache.stratos.messaging.event.health.stat.SecondDerivativeOfLoadAverageEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/SecondDerivativeMemoryConsumptionEventFormatter.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/SecondDerivativeMemoryConsumptionEventFormatter.xml
deleted file mode 100644
index 4c2f13e..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/eventformatters/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>{"org.apache.stratos.messaging.event.health.stat.SecondDerivativeOfMemoryConsumptionEvent":{"message":{"clusterId":"{{cluster_id}}","networkPartitionId":"{{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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/AverageHeathRequest.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/AverageHeathRequest.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/AverageHeathRequest.xml
deleted file mode 100644
index 56c9545..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/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 == 'ports_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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/AverageInFlightRequestsFinder.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/AverageInFlightRequestsFinder.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/AverageInFlightRequestsFinder.xml
deleted file mode 100644
index 5022bde..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/GradientOfHealthRequest.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/GradientOfHealthRequest.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/GradientOfHealthRequest.xml
deleted file mode 100644
index 75406f9..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/GradientOfRequestsInFlightFinder.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/GradientOfRequestsInFlightFinder.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/GradientOfRequestsInFlightFinder.xml
deleted file mode 100644
index 507fdbe..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/SecondDerivativeOfHealthRequest.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/SecondDerivativeOfHealthRequest.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/SecondDerivativeOfHealthRequest.xml
deleted file mode 100644
index fefa306..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/SecondDerivativeOfRequestsInFlightFinder.xml
deleted file mode 100644
index a576657..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/executionplans/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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/inputeventadaptors/DefaultWSO2EventInputAdaptor.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/inputeventadaptors/DefaultWSO2EventInputAdaptor.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/inputeventadaptors/DefaultWSO2EventInputAdaptor.xml
deleted file mode 100644
index 8cc5e89..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/inputeventadaptors/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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/outputeventadaptors/DefaultWSO2EventOutputAdaptor.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/outputeventadaptors/DefaultWSO2EventOutputAdaptor.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/outputeventadaptors/DefaultWSO2EventOutputAdaptor.xml
deleted file mode 100644
index 59ba20d..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/outputeventadaptors/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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/outputeventadaptors/JMSOutputAdaptor.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/outputeventadaptors/JMSOutputAdaptor.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/outputeventadaptors/JMSOutputAdaptor.xml
deleted file mode 100644
index b1e0a7f..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/outputeventadaptors/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/197bd12c/tools/puppet3/modules/cep/files/configs/repository/deployment/server/streamdefinitions/stream-manager-config.xml
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/streamdefinitions/stream-manager-config.xml b/tools/puppet3/modules/cep/files/configs/repository/deployment/server/streamdefinitions/stream-manager-config.xml
deleted file mode 100755
index 8010362..0000000
--- a/tools/puppet3/modules/cep/files/configs/repository/deployment/server/streamdefinitions/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="double"/>
-         </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/197bd12c/tools/puppet3/modules/cep/manifests/clean.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/manifests/clean.pp b/tools/puppet3/modules/cep/manifests/clean.pp
deleted file mode 100755
index fa5ee91..0000000
--- a/tools/puppet3/modules/cep/manifests/clean.pp
+++ /dev/null
@@ -1,45 +0,0 @@
-# ----------------------------------------------------------------------------
-#  Copyright 2005-2013 WSO2, Inc. http://www.wso2.org
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-# ----------------------------------------------------------------------------
-#
-# Cleans the previous deployment. If the maintenance mode is set to true, this will only kill the running service.
-
-define cep::clean ($mode, $target) {
-  if $mode == 'refresh' {
-    exec{
-      "Remove_lock_file_${name}":
-        path    => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-        onlyif  => "test -f ${target}/wso2carbon.lck",
-        command => "rm ${target}/wso2carbon.lck";
-
-      "Stop_process_${name}":
-        path    => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/java/bin/',
-        command => "kill -9 `cat ${target}/wso2carbon.pid` ; /bin/echo Killed",
-        require => Exec["Remove_lock_file_${name}"];
-    }
-  }
-  elsif $mode == 'new' {
-    exec { "Stop_process_and_remove_CARBON_HOME_${name}":
-        path    => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/java/bin/',
-        command => "kill -9 `cat ${target}/wso2carbon.pid` ; rm -rf ${target}";
-    }
-  }
-  elsif $mode == 'zero' {
-    exec { "Stop_process_remove_CARBON_HOME_and_pack_${name}":
-        path    => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/java/bin/',
-        command => "kill -9 `cat ${target}/wso2carbon.pid` ; rm -rf ${target} ; rm -f ${::local_package_dir}/wso2${cep::service_code}-${cep::version}.zip";
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/197bd12c/tools/puppet3/modules/cep/manifests/deploy.pp
----------------------------------------------------------------------
diff --git a/tools/puppet3/modules/cep/manifests/deploy.pp b/tools/puppet3/modules/cep/manifests/deploy.pp
deleted file mode 100755
index 90798b4..0000000
--- a/tools/puppet3/modules/cep/manifests/deploy.pp
+++ /dev/null
@@ -1,43 +0,0 @@
-# ----------------------------------------------------------------------------
-#  Copyright 2005-2013 WSO2, Inc. http://www.wso2.org
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-# ----------------------------------------------------------------------------
-#
-# Executes the deployment by pushing all necessary configurations and patches
-
-define cep::deploy ($service, $security, $target, $owner, $group) {
-  file { "/tmp/${cep::deployment_code}":
-    ensure       => present,
-    owner        => $owner,
-    group        => $group,
-    sourceselect => all,
-    ignore       => '.svn',
-    recurse      => true,
-    source       => [
-      "puppet:///modules/${service}/configs/",
-      "puppet:///modules/${service}/patches/"]
-  }
-
-  exec {
-    "Copy_${name}_modules_to_carbon_home":
-      path    => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/java/bin/',
-      command => "cp -r /tmp/${cep::deployment_code}/* ${target}/; chown -R ${owner}:${owner} ${target}/; chmod -R 755 ${target}/",
-      require => File["/tmp/${cep::deployment_code}"];
-
-    "Remove_${name}_temporory_modules_directory":
-      path    => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/java/bin/',
-      command => "rm -rf /tmp/${cep::deployment_code}",
-      require => Exec["Copy_${name}_modules_to_carbon_home"];
-  }
-}