eagle-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yonzhang2...@apache.org
Subject [4/4] incubator-eagle git commit: EAGLE-331 ingestion+alert engine preview ingestion + alert engine preview
Date Thu, 09 Jun 2016 23:18:50 GMT
EAGLE-331 ingestion+alert engine preview
    ingestion + alert engine preview

    https://issues.apache.org/jira/browse/EAGLE-331
    Author: @yonzhang2012 <yonzhang2012@apache.org>
    Reviewer: @haoch <hao@apache.org>

    Closes: #229


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

Branch: refs/heads/develop
Commit: eef4930c3b9cac7d8c596af684ba098ec2b2229d
Parents: 9d16f21
Author: yonzhang <yonzhang2012@gmail.com>
Authored: Thu Jun 9 16:20:59 2016 -0700
Committer: yonzhang <yonzhang2012@gmail.com>
Committed: Thu Jun 9 16:20:59 2016 -0700

----------------------------------------------------------------------
 README.md                                       |  43 +++----
 .../sandbox-hbaseSecurityLog-application.conf   |   2 +-
 .../testcases/TestAlertEagleStorePlugin.java    |   2 +-
 .../testcases/TestAlertEmailPlugin.java         |   2 +-
 .../testcases/TestAlertKafkaPlugin.java         |   2 +-
 .../testcases/TestNotificationPluginLoader.java |   2 +-
 .../eagle/alert/cep/TestSiddhiEvaluator.java    |   2 +-
 .../dao/TestSiddhiStreamMetadataUtils.java      |   2 +-
 .../alert/executor/TestPolicyExecutor.java      |   2 +-
 .../alert/policy/TestDynamicPolicyLoader.java   |   3 +-
 .../policy/TestPolicyDistributionUpdater.java   |   4 +-
 .../eagle/alert/siddhi/TestSiddhiEngine.java    |   2 +-
 .../eagle/alert/state/TestAggregation.java      |   2 +-
 .../eagle-alert/alert-assembly/pom.xml          |   4 +-
 .../eagle/alert/coordinator/Coordinator.java    |   1 -
 .../src/main/resources/application.conf         |   6 +-
 .../alert/coordinator/CoordinatorTest.java      |   1 +
 .../coordinator/DynamicPolicyLoaderTest.java    |  26 -----
 .../mock/TestTopologyMgmtService.java           |   5 +
 .../eagle-alert/alert-engine/pom.xml            |   6 +
 .../src/main/resources/application.conf         |  20 ++--
 .../eagle/alert/engine/topology/TestBolt.java   |   6 +
 .../src/test/resources/publishments.json        |   2 +-
 .../dataproc/util/TestConfigOptionParser.java   |   2 +-
 .../TestExecutionEnvironmentJava.java           |   2 +-
 .../datastream/TestJavaReflectionUtils.java     |   2 +-
 .../datastream/TestSimpleAggregateExecutor.java |   2 +-
 .../eagle/datastream/TestStreamAggregate.java   |   2 +-
 .../eagle-embed/eagle-embed-hbase/pom.xml       |   5 +
 .../eagle/service/hbase/EmbeddedHbase.java      |   1 +
 .../query/parser/test/TestEagleQueryParser.java |   4 +-
 .../eagle/query/parser/test/TestValueType.java  |   2 +-
 .../client/TestEagleServiceClientImpl.java      |   2 +-
 .../eagle/service/client/TestJackson.java       |   3 +-
 .../service/jackson/TestJacksonMarshalling.java |   2 +-
 .../org/apache/eagle/common/TestByteUtil.java   |   7 +-
 .../eagle/common/TestCircularArrayList.java     |   3 +-
 .../common/TestCircularArrayListSortedSet.java  |   3 +-
 .../apache/eagle/common/TestDateTimeUtil.java   |   3 +-
 .../eagle/common/config/TestEagleConfig.java    |   2 +-
 .../eagle/common/metric/TestAlertContext.java   |   2 +-
 .../TestGenericServiceAPIResponseEntity.java    |   2 +-
 .../eagle/log/entity/TestDoubleSerDeser.java    |   2 +-
 .../TestGenericEntityIndexStreamReader.java     |   1 +
 .../log/entity/TestHBaseIntegerLogHelper.java   |   2 +-
 .../TestHBaseWriteEntitiesPerformance.java      |   4 +-
 .../eagle/log/entity/TestTestLogAPIEntity.java  |   1 +
 .../base/taggedlog/TestTaggedLogAPIEntity.java  |   2 +-
 .../filter/TestEntityQualifierHelper.java       |   2 +-
 .../entity/filter/TestExpressionComparator.java |   2 +-
 .../entity/filter/TestHBaseFilterBuilder.java   |   2 +-
 .../log/entity/meta/TestArraySerDeser.java      |   4 +-
 .../meta/TestEntityDefinitionManager.java       |   2 +-
 .../eagle/log/entity/meta/TestListSerDeser.java |   2 +-
 .../eagle/log/entity/meta/TestMapSerDeser.java  |   2 +-
 .../log/expression/TestExpressionParser.java    |  24 ++--
 .../query/aggregate/raw/TestGroupbyKey.java     |   3 +-
 .../query/aggregate/test/TestAggregator.java    |   2 +-
 .../query/aggregate/test/TestBucketQuery.java   |   2 +-
 .../query/aggregate/test/TestBucketQuery2.java  |   2 +-
 .../aggregate/test/TestFlatAggregator.java      |  99 ++++++++--------
 .../test/TestHierarchicalAggregator.java        |  65 +++++------
 .../test/TestPostFlatAggregateSort.java         |   2 +-
 .../test/TestTimeSeriesAggregator.java          |  91 +++++++--------
 .../service/generic/TestHBaseLogReader2.java    |   2 +
 .../service/generic/TestListQueryResource.java  |   5 +-
 .../java/org/apache/eagle/storage/TestUri.java  |   2 +-
 .../eagle/storage/hbase/TestHBaseStatement.java |   5 +-
 .../TestAggregateResultCallback.java            |  24 ++--
 .../coprocessor/TestGroupAggregateClient.java   |   9 +-
 .../TestGroupAggregateTimeSeriesClient.java     |   3 +-
 .../hbase/spi/TestHBaseStorageLoader.java       |   2 +-
 .../storage/jdbc/TestGenericMetricStorage.java  |   2 +-
 .../eagle/storage/jdbc/TestJdbcStorage.java     |   2 +-
 .../java/org/apache/eagle/TestGCLogParser.java  |   2 +-
 .../metric/HadoopJmxMetricDeserializerTest.java |   3 -
 .../hadoop/metric/TestHadoopMetricSiddhiQL.java |   2 +-
 .../topo/NewKafkaSourcedSpoutProvider.java      | 117 +++++++++++++++++++
 .../eagle/security/topo/TopologySubmitter.java  |  85 ++++++++++++++
 .../eagle/security/util/ExternalDataJoiner.java |   8 +-
 .../crawler/audit/TestHDFSAuditLogParser.java   |   2 +-
 .../crawler/audit/TestMAPRFSAuditLogParser.java |   3 +-
 .../audit/TestMetaDataAccessConfigRepo.java     |   4 +-
 .../eagle-security-hbase-auditlog/README.md     |  25 ++++
 .../eagle-security-hbase-auditlog/pom.xml       |  43 +++++++
 .../security/hbase/HBaseAuditLogParserBolt.java |  72 ++++++++++++
 .../hbase/HbaseAuditLogKafkaDeserializer.java   |  62 ++++++++++
 .../hbase/HbaseAuditLogMonitoringMain.java      |  65 +++++++++++
 .../security/hbase/HbaseAuditLogObject.java     |  28 +++++
 .../security/hbase/HbaseAuditLogParser.java     | 107 +++++++++++++++++
 .../HbaseResourceSensitivityDataJoinBolt.java   | 101 ++++++++++++++++
 .../HbaseResourceSensitivityPollingJob.java     |  63 ++++++++++
 .../src/main/resources/application.conf         |  46 ++++++++
 .../src/main/resources/application.conf.bak     |  66 +++++++++++
 .../src/main/resources/log4j.properties         |  21 ++++
 .../security/hbase/TestHbaseAuditLogParser.java |  44 +++++++
 .../hbase/TestHbaseAuditLogProcessTopology.java |  44 +++++++
 .../src/test/resources/application.conf         |  71 +++++++++++
 .../src/test/resources/log4j.properties         |  35 ++++++
 .../src/test/resources/securityAuditLog         |  25 ++++
 .../eagle-security-hbase-securitylog/pom.xml    |  43 -------
 .../hbase/HbaseAuditLogMonitoringTopology.java  |  42 -------
 .../hbase/HbaseAuditLogProcessorMain.java       |  33 ------
 .../parse/HbaseAuditLogKafkaDeserializer.java   |  62 ----------
 .../hbase/parse/HbaseAuditLogObject.java        |  28 -----
 .../hbase/parse/HbaseAuditLogParser.java        | 110 -----------------
 ...baseResourceSensitivityDataJoinExecutor.java |  94 ---------------
 .../HbaseResourceSensitivityPollingJob.java     |  63 ----------
 .../src/main/resources/application.conf         |  66 -----------
 .../src/main/resources/log4j.properties         |  21 ----
 .../security/hbase/TestHbaseAuditLogParser.java |  46 --------
 .../hbase/TestHbaseAuditLogProcessTopology.java |  44 -------
 .../src/test/resources/application.conf         |  71 -----------
 .../src/test/resources/log4j.properties         |  35 ------
 .../src/test/resources/securityAuditLog         |  25 ----
 .../FileSensitivityDataJoinExecutor.java        |   2 +-
 .../auditlog/IPZoneDataJoinExecutor.java        |   2 +-
 .../security/auditlog/TestSiddhiPattern.java    |   3 -
 .../auditlog/TestUserCommandReassembler.java    |   2 +-
 .../security/dataproc/TestOuterDataJoiner.java  |   2 +-
 .../eagle-security-hdfs-authlog/README.md       |  29 +++++
 .../eagle-security-hdfs-authlog/pom.xml         |  39 +++++++
 .../securitylog/HDFSSecurityLogObject.java      |  27 +++++
 .../securitylog/HDFSSecurityLogParser.java      |  82 +++++++++++++
 .../securitylog/HdfsAuthLogMonitoringMain.java  |  64 ++++++++++
 .../securitylog/SecurityLogParserBolt.java      |  78 +++++++++++++
 .../src/main/resources/application.conf         |  43 +++++++
 .../src/main/resources/log4j.properties         |  23 ++++
 .../src/main/resources/security_log.sample      |  30 +++++
 .../security/TestHDFSSecuritylogParser.java     |  69 +++++++++++
 .../eagle-security-hdfs-securitylog/pom.xml     |  39 -------
 .../HDFSSecurityLogKafkaDeserializer.java       |  63 ----------
 .../HDFSSecurityLogProcessorMain.java           |  31 -----
 .../parse/HDFSSecurityLogObject.java            |  27 -----
 .../parse/HDFSSecurityLogParser.java            |  82 -------------
 .../src/main/resources/application.conf         |  65 -----------
 .../security/TestHDFSSecuritylogParser.java     |  69 -----------
 .../hdfs/test/HDFSResourceAccessConfigTest.java |   2 +-
 eagle-security/eagle-security-hive/pom.xml      |   1 -
 ...HiveResourceSensitivityDataJoinExecutor.java |   2 +-
 ...ozieResourceSensitivityDataJoinExecutor.java |   2 +-
 .../dao/TestOozieMetadataAccessConfig.java      |   2 +-
 .../common/TestUserProfileUtils.java            |   2 +-
 .../userprofile/TestUserActivityAggregator.java |   3 +-
 .../TestUserProfileAnomalyEigenEvaluator.java   |   4 +-
 .../model/UserProfileEigenModelerTest.java      |   2 +-
 .../model/UserProfileKDEModelerTest.java        |   3 +-
 eagle-security/pom.xml                          |   4 +-
 .../src/main/resources/application.conf         |   4 +-
 .../src/main/resources/log4j.properties         |   2 +-
 150 files changed, 1910 insertions(+), 1493 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 9881fc9..ac00485 100755
--- a/README.md
+++ b/README.md
@@ -21,45 +21,38 @@ limitations under the License.
 
 >  Secure Hadoop Data in Real Time
 
-Apache Eagle is an open source monitoring solution to instantly identify access to sensitive data, recognize attacks, malicious activities in Hadoop and take actions in real time.
+Apache Eagle is an open source analytics solution for identifying security and performance issues instantly on big data platforms e.g. Hadoop, Spark, NoSQL etc. It analyzes data activities, yarn applications, jmx metrics, and daemon logs etc., provides state-of-the-art alert engine to identify security breach, performance issues and shows insights.
 
 For more details, please visit [https://eagle.incubator.apache.org](https://eagle.incubator.apache.org)
 
 ## Documentation
 You can find the latest Eagle documentation on [https://eagle.incubator.apache.org](https://eagle.incubator.apache.org/docs). This [README](README.md) file only contains basic setup instructions.
 
-## Getting Started
-The fastest way to get started with Eagle is to run with [docker](https://github.com/docker/docker) by one of following options:
-
-* Pull latest eagle docker image from [docker hub](https://hub.docker.com/r/apacheeagle/sandbox/) directly:
-
-        docker pull apacheeagle/sandbox
+## Build Eagle (Supports JDK-1.8)
+Eagle is built using [Apache Maven](https://maven.apache.org/). NPM should be installed (On MAC OS try "brew install node"). To build Eagle, run:
+    mvn -DskipTests clean package
 
-  Then run eagle docker image:
-  
-      docker run -p 9099:9099 -p 8080:8080 -p 8744:8744 -p 2181:2181 -p 2888:2888 -p 6667:6667 -p 60020:60020 \
-        -p 60030:60030 -p 60010:60010 -d --dns 127.0.0.1 --entrypoint /usr/local/serf/bin/start-serf-agent.sh \
-        -e KEYCHAIN= --env EAGLE_SERVER_HOST=sandbox.eagle.incubator.apache.org --name sandbox \
-        -h sandbox.eagle.incubator.apache.org --privileged=true apacheeagle/sandbox:latest \
-        --tag ambari-server=true
-      docker run -it --rm -e EXPECTED_HOST_COUNT=1 -e BLUEPRINT=hdp-singlenode-eagle --link sandbox:ambariserver\
-        --entrypoint /bin/sh apacheeagle/sandbox:latest -c /tmp/install-cluster.sh
+Note : As of version 0.5, Eagle is tested on JDK-1.8.
 
-* Build eagle docker image from source code with [eagle-docker](eagle-external/eagle-docker) tool.
+After successfully building, you will find eagle binary tarball under _eagle-assembly/target/_
 
-         git clone https://github.com/apache/incubator-eagle.git
-         cd incubator-eagle && ./eagle-docker boot
+## Eagle Quick Start in IDE (Intellij)
+### prepare
+Please have HDP sandbox ready, where you can have zookeeper, hadoop, hbase, hive ready  
 
-As another alternative option, you could [install eagle package in sandbox](https://eagle.incubator.apache.org/docs/deployment-in-sandbox.html) manualy as well.
+### Run Eagle Web Service
+Go to project eagle-webservice, run it as web application.
+ 
+### Run Eagle Alert Engine
+Find out org.apache.eagle.alert.engine.UnitTopologyMain, run it. 
 
-## Building Eagle (Supports JDK-1.7.x)
-Eagle is built using [Apache Maven](https://maven.apache.org/). NPM should be installed (On MAC OS try "brew install node"). To build Eagle, run:
+Note: the config is eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/resources/application.conf
 
-    mvn -DskipTests clean package
 
-Note : Currently eagle is tested on JDK-1.7.X . Eagle does not support JDK 1.8.
+### Run Eagle Ingestion Applications
+For example, find out org.apache.eagle.security.securitylog.HdfsAuthLogMonitoringMain, run it.
 
-After successfully building, you will find eagle binary tarball under _eagle-assembly/target/_
+Note: the config is eagle-security/eagle-security-hdfs-authlog/src/main/resources/application.conf
 
 ## Get Help
 The fastest way to get response from eagle community is to send email to the mail list [dev@eagle.incubator.apache.org](mailto:dev@eagle.incubator.apache.org),

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-assembly/src/main/conf/sandbox-hbaseSecurityLog-application.conf
----------------------------------------------------------------------
diff --git a/eagle-assembly/src/main/conf/sandbox-hbaseSecurityLog-application.conf b/eagle-assembly/src/main/conf/sandbox-hbaseSecurityLog-application.conf
index 875bb0b..17f1c1b 100644
--- a/eagle-assembly/src/main/conf/sandbox-hbaseSecurityLog-application.conf
+++ b/eagle-assembly/src/main/conf/sandbox-hbaseSecurityLog-application.conf
@@ -30,7 +30,7 @@
     "zkConnectionTimeoutMS" : 15000,
     "brokerZkPath" : "/brokers",
     "fetchSize" : 1048586,
-    "deserializerClass" : "org.apache.eagle.security.hbase.parse.HbaseAuditLogKafkaDeserializer",
+    "deserializerClass" : "org.apache.eagle.security.hbase.HbaseAuditLogKafkaDeserializer",
     "transactionZKServers" : "127.0.0.1",
     "transactionZKPort" : 2181,
     "transactionZKRoot" : "/consumers",

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert-notification-plugin/src/test/java/org/apache/eagle/notifications/testcases/TestAlertEagleStorePlugin.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert-notification-plugin/src/test/java/org/apache/eagle/notifications/testcases/TestAlertEagleStorePlugin.java b/eagle-core/eagle-alert-parent/eagle-alert-notification-plugin/src/test/java/org/apache/eagle/notifications/testcases/TestAlertEagleStorePlugin.java
index 4a88964..e1c2ead 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert-notification-plugin/src/test/java/org/apache/eagle/notifications/testcases/TestAlertEagleStorePlugin.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert-notification-plugin/src/test/java/org/apache/eagle/notifications/testcases/TestAlertEagleStorePlugin.java
@@ -18,11 +18,11 @@ package org.apache.eagle.notifications.testcases;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
-import junit.framework.Assert;
 import org.apache.eagle.alert.entity.AlertAPIEntity;
 import org.apache.eagle.alert.entity.AlertDefinitionAPIEntity;
 import org.apache.eagle.common.metric.AlertContext;
 import org.apache.eagle.notification.plugin.AlertEagleStorePlugin;
+import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert-notification-plugin/src/test/java/org/apache/eagle/notifications/testcases/TestAlertEmailPlugin.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert-notification-plugin/src/test/java/org/apache/eagle/notifications/testcases/TestAlertEmailPlugin.java b/eagle-core/eagle-alert-parent/eagle-alert-notification-plugin/src/test/java/org/apache/eagle/notifications/testcases/TestAlertEmailPlugin.java
index 9abed72..7a52369 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert-notification-plugin/src/test/java/org/apache/eagle/notifications/testcases/TestAlertEmailPlugin.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert-notification-plugin/src/test/java/org/apache/eagle/notifications/testcases/TestAlertEmailPlugin.java
@@ -18,12 +18,12 @@ package org.apache.eagle.notifications.testcases;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
-import junit.framework.Assert;
 import org.apache.eagle.alert.entity.AlertAPIEntity;
 import org.apache.eagle.alert.entity.AlertDefinitionAPIEntity;
 import org.apache.eagle.common.metric.AlertContext;
 import org.apache.eagle.notification.plugin.AlertEmailPlugin;
 import org.apache.eagle.policy.common.Constants;
+import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert-notification-plugin/src/test/java/org/apache/eagle/notifications/testcases/TestAlertKafkaPlugin.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert-notification-plugin/src/test/java/org/apache/eagle/notifications/testcases/TestAlertKafkaPlugin.java b/eagle-core/eagle-alert-parent/eagle-alert-notification-plugin/src/test/java/org/apache/eagle/notifications/testcases/TestAlertKafkaPlugin.java
index 814956e..414211a 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert-notification-plugin/src/test/java/org/apache/eagle/notifications/testcases/TestAlertKafkaPlugin.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert-notification-plugin/src/test/java/org/apache/eagle/notifications/testcases/TestAlertKafkaPlugin.java
@@ -19,12 +19,12 @@ package org.apache.eagle.notifications.testcases;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
-import junit.framework.Assert;
 import org.apache.eagle.alert.entity.AlertAPIEntity;
 import org.apache.eagle.alert.entity.AlertDefinitionAPIEntity;
 import org.apache.eagle.common.metric.AlertContext;
 import org.apache.eagle.notification.plugin.AlertKafkaPlugin;
 import org.apache.eagle.policy.common.Constants;
+import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert-notification-plugin/src/test/java/org/apache/eagle/notifications/testcases/TestNotificationPluginLoader.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert-notification-plugin/src/test/java/org/apache/eagle/notifications/testcases/TestNotificationPluginLoader.java b/eagle-core/eagle-alert-parent/eagle-alert-notification-plugin/src/test/java/org/apache/eagle/notifications/testcases/TestNotificationPluginLoader.java
index 624343b..e128770 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert-notification-plugin/src/test/java/org/apache/eagle/notifications/testcases/TestNotificationPluginLoader.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert-notification-plugin/src/test/java/org/apache/eagle/notifications/testcases/TestNotificationPluginLoader.java
@@ -18,9 +18,9 @@ package org.apache.eagle.notifications.testcases;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
-import junit.framework.Assert;
 import org.apache.eagle.notification.base.NotificationConstants;
 import org.apache.eagle.notification.plugin.NotificationPluginLoader;
+import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/cep/TestSiddhiEvaluator.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/cep/TestSiddhiEvaluator.java b/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/cep/TestSiddhiEvaluator.java
index 602e117..036708f 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/cep/TestSiddhiEvaluator.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/cep/TestSiddhiEvaluator.java
@@ -18,7 +18,6 @@ package org.apache.eagle.alert.cep;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
-import junit.framework.Assert;
 import org.apache.eagle.alert.entity.AbstractPolicyDefinitionEntity;
 import org.apache.eagle.alert.entity.AlertAPIEntity;
 import org.apache.eagle.alert.entity.AlertDefinitionAPIEntity;
@@ -34,6 +33,7 @@ import org.apache.eagle.policy.siddhi.SiddhiPolicyDefinition;
 import org.apache.eagle.policy.siddhi.SiddhiPolicyEvaluator;
 import org.apache.eagle.policy.siddhi.StreamMetadataManager;
 import org.apache.eagle.service.client.EagleServiceConnector;
+import org.junit.Assert;
 import org.junit.Test;
 import scala.Tuple2;
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/dao/TestSiddhiStreamMetadataUtils.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/dao/TestSiddhiStreamMetadataUtils.java b/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/dao/TestSiddhiStreamMetadataUtils.java
index a2b8a2d..d703214 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/dao/TestSiddhiStreamMetadataUtils.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/dao/TestSiddhiStreamMetadataUtils.java
@@ -18,11 +18,11 @@ package org.apache.eagle.alert.dao;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
-import junit.framework.Assert;
 import org.apache.eagle.alert.entity.AlertStreamSchemaEntity;
 import org.apache.eagle.policy.dao.AlertStreamSchemaDAO;
 import org.apache.eagle.policy.siddhi.SiddhiStreamMetadataUtils;
 import org.apache.eagle.policy.siddhi.StreamMetadataManager;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/executor/TestPolicyExecutor.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/executor/TestPolicyExecutor.java b/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/executor/TestPolicyExecutor.java
index 90353be..bb94908 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/executor/TestPolicyExecutor.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/executor/TestPolicyExecutor.java
@@ -32,7 +32,7 @@ import org.junit.Test;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 /**
  * @since Dec 18, 2015

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/policy/TestDynamicPolicyLoader.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/policy/TestDynamicPolicyLoader.java b/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/policy/TestDynamicPolicyLoader.java
index 0504784..dd36cac 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/policy/TestDynamicPolicyLoader.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/policy/TestDynamicPolicyLoader.java
@@ -25,6 +25,7 @@ import org.apache.eagle.policy.DynamicPolicyLoader;
 import org.apache.eagle.policy.PolicyLifecycleMethods;
 import org.apache.eagle.policy.dao.PolicyDefinitionDAO;
 import org.apache.eagle.alert.entity.AlertDefinitionAPIEntity;
+import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,8 +33,6 @@ import org.slf4j.LoggerFactory;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 
-import junit.framework.Assert;
-
 public class TestDynamicPolicyLoader {
 	private final static Logger LOG = LoggerFactory.getLogger(TestDynamicPolicyLoader.class);
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/policy/TestPolicyDistributionUpdater.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/policy/TestPolicyDistributionUpdater.java b/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/policy/TestPolicyDistributionUpdater.java
index 1fb97fd..5fd374e 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/policy/TestPolicyDistributionUpdater.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/policy/TestPolicyDistributionUpdater.java
@@ -21,7 +21,8 @@ package org.apache.eagle.alert.policy;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
-import junit.framework.Assert;
+import org.apache.eagle.policy.siddhi.StreamMetadataManager;
+import org.junit.Assert;
 import org.apache.eagle.alert.entity.AbstractPolicyDefinitionEntity;
 import org.apache.eagle.alert.entity.AlertDefinitionAPIEntity;
 import org.apache.eagle.alert.entity.AlertStreamSchemaEntity;
@@ -46,6 +47,7 @@ public class TestPolicyDistributionUpdater {
 
     @Test
     public void testPolicyDistributionReporter() throws Exception{
+        StreamMetadataManager.getInstance().reset();
         PolicyDefinitionDAO alertDao = new PolicyDefinitionEntityDAOImpl(new EagleServiceConnector(null, 1),
                 Constants.ALERT_DEFINITION_SERVICE_ENDPOINT_NAME) {
             @Override

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/siddhi/TestSiddhiEngine.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/siddhi/TestSiddhiEngine.java b/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/siddhi/TestSiddhiEngine.java
index acead47..924ba5c 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/siddhi/TestSiddhiEngine.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/siddhi/TestSiddhiEngine.java
@@ -19,7 +19,7 @@ package org.apache.eagle.alert.siddhi;
 import java.lang.reflect.Field;
 
 import org.apache.eagle.alert.executor.AlertExecutor;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/state/TestAggregation.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/state/TestAggregation.java b/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/state/TestAggregation.java
index adcd728..71f9691 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/state/TestAggregation.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert-process/src/test/java/org/apache/eagle/alert/state/TestAggregation.java
@@ -21,6 +21,7 @@ package org.apache.eagle.alert.state;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.junit.Assert;
 import org.junit.Test;
 import org.wso2.siddhi.core.ExecutionPlanRuntime;
 import org.wso2.siddhi.core.SiddhiManager;
@@ -28,7 +29,6 @@ import org.wso2.siddhi.core.event.Event;
 import org.wso2.siddhi.core.query.output.callback.QueryCallback;
 import org.wso2.siddhi.core.stream.input.InputHandler;
 
-import junit.framework.Assert;
 import org.wso2.siddhi.core.util.EventPrinter;
 
 public class TestAggregation {

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert/alert-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-assembly/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert/alert-assembly/pom.xml
index 5069a2a..725d22e 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-assembly/pom.xml
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-assembly/pom.xml
@@ -36,13 +36,13 @@
             <groupId>org.apache.eagle</groupId>
             <artifactId>alert-coordinator</artifactId>
             <version>${project.version}</version>
-            <type>war</type>
+            <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.eagle</groupId>
             <artifactId>alert-metadata-service</artifactId>
             <version>${project.version}</version>
-            <type>war</type>
+            <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.eagle</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/main/java/org/apache/eagle/alert/coordinator/Coordinator.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/main/java/org/apache/eagle/alert/coordinator/Coordinator.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/main/java/org/apache/eagle/alert/coordinator/Coordinator.java
index ccb4624..ca8c965 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/main/java/org/apache/eagle/alert/coordinator/Coordinator.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/main/java/org/apache/eagle/alert/coordinator/Coordinator.java
@@ -49,7 +49,6 @@ import com.typesafe.config.ConfigFactory;
 public class Coordinator {
     private static final String COORDINATOR = "coordinator";
     /**
-     * {@link ZKMetadataChangeNotifyService}
      *  /alert/{topologyName}/spout
      *                  /router
      *                  /alert

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/main/resources/application.conf
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/main/resources/application.conf b/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/main/resources/application.conf
index a825ac9..c03b624 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/main/resources/application.conf
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/main/resources/application.conf
@@ -22,7 +22,7 @@
 		"topologyLoadUpbound" : 0.8,
 		"numOfAlertBoltsPerTopology" : 5,
 		"zkConfig" : {
-			"zkQuorum" : "localhost:2181",
+			"zkQuorum" : "sandbox.hortonworks.com:2181",
 			"zkRoot" : "/alert",
 			"zkSessionTimeoutMs" : 10000,
 			"connectionTimeoutMs" : 10000,
@@ -31,8 +31,8 @@
 		},
 		"metadataService" : {
 			"host" : "localhost",
-			"port" : 8080,
-			"context" : "/api"
+			"port" : 38080,
+			"context" : "/rest"
 		},
 		"metadataDynamicCheck" : {
 			"initDelayMillis" : 1000,

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/test/java/org/apache/alert/coordinator/CoordinatorTest.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/test/java/org/apache/alert/coordinator/CoordinatorTest.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/test/java/org/apache/alert/coordinator/CoordinatorTest.java
index 78b72b3..259fe6c 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/test/java/org/apache/alert/coordinator/CoordinatorTest.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/test/java/org/apache/alert/coordinator/CoordinatorTest.java
@@ -75,6 +75,7 @@ public class CoordinatorTest {
     }
 
     @SuppressWarnings({ "resource", "unused" })
+    @Ignore
     @Test
     public void test_01() throws Exception {
         before();

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/test/java/org/apache/alert/coordinator/DynamicPolicyLoaderTest.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/test/java/org/apache/alert/coordinator/DynamicPolicyLoaderTest.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/test/java/org/apache/alert/coordinator/DynamicPolicyLoaderTest.java
deleted file mode 100644
index 155a9e5..0000000
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/test/java/org/apache/alert/coordinator/DynamicPolicyLoaderTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *
- *  * Licensed to the Apache Software Foundation (ASF) under one or more
- *  * contributor license agreements.  See the NOTICE file distributed with
- *  * this work for additional information regarding copyright ownership.
- *  * The ASF licenses this file to You under the Apache License, Version 2.0
- *  * (the "License"); you may not use this file except in compliance with
- *  * the License.  You may obtain a copy of the License at
- *  *
- *  *    http://www.apache.org/licenses/LICENSE-2.0
- *  *
- *  * Unless required by applicable law or agreed to in writing, software
- *  * distributed under the License is distributed on an "AS IS" BASIS,
- *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  * See the License for the specific language governing permissions and
- *  * limitations under the License.
- *
- */
-
-package org.apache.alert.coordinator;
-
-/**
- * Since 4/28/16.
- */
-public class DynamicPolicyLoaderTest {
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/test/java/org/apache/alert/coordinator/mock/TestTopologyMgmtService.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/test/java/org/apache/alert/coordinator/mock/TestTopologyMgmtService.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/test/java/org/apache/alert/coordinator/mock/TestTopologyMgmtService.java
index 1a690d6..8d04a6e 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/test/java/org/apache/alert/coordinator/mock/TestTopologyMgmtService.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-coordinator/src/test/java/org/apache/alert/coordinator/mock/TestTopologyMgmtService.java
@@ -24,6 +24,7 @@ import org.apache.eagle.alert.coordinator.TopologyMgmtService;
 import org.apache.eagle.alert.coordinator.model.AlertBoltUsage;
 import org.apache.eagle.alert.coordinator.model.GroupBoltUsage;
 import org.apache.eagle.alert.coordinator.model.TopologyUsage;
+import org.junit.Test;
 
 public class TestTopologyMgmtService extends TopologyMgmtService {
 
@@ -31,6 +32,10 @@ public class TestTopologyMgmtService extends TopologyMgmtService {
     
     private int i = 0;
 
+    @Test
+    public void test(){
+
+    }
     @Override
     public TopologyMeta creatTopology() {
         TopologyMeta tm = new TopologyMeta();

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/pom.xml b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/pom.xml
index 84f4496..a8079d6 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/pom.xml
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/pom.xml
@@ -24,6 +24,12 @@
 	<packaging>jar</packaging>
 
 	<dependencies>
+		<!-- need investigate why scala here can't be 2.11 -->
+		<dependency>
+			<groupId>org.scala-lang</groupId>
+			<artifactId>scala-library</artifactId>
+			<version>2.10.4</version>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.eagle</groupId>
 			<artifactId>alert-common</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/resources/application.conf
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/resources/application.conf b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/resources/application.conf
index b9308ef..bfb5f54 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/resources/application.conf
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/main/resources/application.conf
@@ -24,7 +24,7 @@
     "localMode" : "true"
   },
   "spout" : {
-    "kafkaBrokerZkQuorum": "localhost:2181",
+    "kafkaBrokerZkQuorum": "sandbox.hortonworks.com:2181",
     "kafkaBrokerZkBasePath": "/brokers",
     "stormKafkaUseSameZkQuorumWithKafkaBroker": true,
     "stormKafkaTransactionZkQuorum": "",
@@ -34,7 +34,7 @@
     "stormKafkaFetchSizeBytes": 1048586,
   },
   "zkConfig" : {
-    "zkQuorum" : "localhost:2181",
+    "zkQuorum" : "sandbox.hortonworks.com:2181",
     "zkRoot" : "/alert",
     "zkSessionTimeoutMs" : 10000,
     "connectionTimeoutMs" : 10000,
@@ -46,21 +46,21 @@
     "delayMillis" : 10000
   },
   "metadataService": {
-    "context" : "/api",
+    "context" : "/rest",
     "host" : "localhost",
-    "port" : 8080
+    "port" : 58080
   },
   "coordinatorService": {
     "host": "localhost",
-    "port": 9090,
-    "context" : "/api"
+    "port": 58080,
+    "context" : "/rest"
   }
   "metric":{
     "sink": {
-      "kafka": {
-        "topic": "alert_metric"
-        "bootstrap.servers": "localhost:6667"
-      }
+//      "kafka": {
+//        "topic": "alert_metric"
+//        "bootstrap.servers": "localhost:6667"
+//      }
       "stdout": {}
       //      "elasticsearch": {
       //        "hosts": ["localhost:9200"]

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestBolt.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestBolt.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestBolt.java
index 493d30e..846c118 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestBolt.java
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/java/org/apache/eagle/alert/engine/topology/TestBolt.java
@@ -22,6 +22,7 @@ package org.apache.eagle.alert.engine.topology;
 
 import java.util.Map;
 
+import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,6 +40,11 @@ public class TestBolt extends BaseRichBolt {
     private static final Logger LOG = LoggerFactory.getLogger(TestBolt.class);
     private OutputCollector collector;
     private long count;
+
+    @Test
+    public void test(){
+
+    }
     @Override
     public void prepare(Map stormConf, TopologyContext context, OutputCollector collector) {
         this.collector = collector;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/publishments.json
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/publishments.json b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/publishments.json
index b3840a5..7b9c593 100644
--- a/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/publishments.json
+++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-engine/src/test/resources/publishments.json
@@ -1,7 +1,7 @@
 [
 {
 	"name":"test-stream-output",
-	"type":"org.apache.eagle.alert.engine.publisher.impl.AlertKafkaPublisher",
+	"type":"org.apache.eagle.alert.engine.publisher.impl.AlertEmailPublisher",
 	"policyIds": [
 		"perfmon_cpu_host_check", "perfmon_cpu_pool_check"
 	],

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/dataproc/util/TestConfigOptionParser.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/dataproc/util/TestConfigOptionParser.java b/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/dataproc/util/TestConfigOptionParser.java
index efcb0e7..d8efa97 100644
--- a/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/dataproc/util/TestConfigOptionParser.java
+++ b/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/dataproc/util/TestConfigOptionParser.java
@@ -16,8 +16,8 @@
  */
 package org.apache.eagle.dataproc.util;
 
-import junit.framework.Assert;
 import org.apache.commons.cli.ParseException;
+import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/datastream/TestExecutionEnvironmentJava.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/datastream/TestExecutionEnvironmentJava.java b/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/datastream/TestExecutionEnvironmentJava.java
index c5f9045..9e96e2c 100644
--- a/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/datastream/TestExecutionEnvironmentJava.java
+++ b/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/datastream/TestExecutionEnvironmentJava.java
@@ -18,8 +18,8 @@ package org.apache.eagle.datastream;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
-import junit.framework.Assert;
 import org.apache.eagle.datastream.storm.StormExecutionEnvironment;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/datastream/TestJavaReflectionUtils.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/datastream/TestJavaReflectionUtils.java b/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/datastream/TestJavaReflectionUtils.java
index 6d2d36f..f5c69a6 100644
--- a/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/datastream/TestJavaReflectionUtils.java
+++ b/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/datastream/TestJavaReflectionUtils.java
@@ -17,7 +17,7 @@
  */
 package org.apache.eagle.datastream;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.eagle.datastream.utils.Reflections;
 import org.junit.Test;
 import scala.reflect.api.TypeTags;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/datastream/TestSimpleAggregateExecutor.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/datastream/TestSimpleAggregateExecutor.java b/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/datastream/TestSimpleAggregateExecutor.java
index 0d0638d..bef530a 100644
--- a/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/datastream/TestSimpleAggregateExecutor.java
+++ b/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/datastream/TestSimpleAggregateExecutor.java
@@ -18,7 +18,7 @@ package org.apache.eagle.datastream;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.eagle.dataproc.impl.aggregate.SimpleAggregateExecutor;
 import org.apache.eagle.dataproc.impl.aggregate.entity.AggregateEntity;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/datastream/TestStreamAggregate.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/datastream/TestStreamAggregate.java b/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/datastream/TestStreamAggregate.java
index ed5d705..1f22a97 100644
--- a/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/datastream/TestStreamAggregate.java
+++ b/eagle-core/eagle-data-process/eagle-stream-process-api/src/test/java/org/apache/eagle/datastream/TestStreamAggregate.java
@@ -22,12 +22,12 @@ import backtype.storm.topology.OutputFieldsDeclarer;
 import backtype.storm.topology.base.BaseRichSpout;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
-import junit.framework.Assert;
 import org.apache.eagle.datastream.core.*;
 import org.apache.eagle.datastream.storm.StormExecutionEnvironment;
 import org.apache.eagle.partition.PartitionStrategy;
 import org.apache.eagle.alert.entity.AlertAPIEntity;
 import org.jgrapht.experimental.dag.DirectedAcyclicGraph;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import scala.collection.Seq;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-embed/eagle-embed-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-embed/eagle-embed-hbase/pom.xml b/eagle-core/eagle-embed/eagle-embed-hbase/pom.xml
index 031959b..1e5dd9b 100644
--- a/eagle-core/eagle-embed/eagle-embed-hbase/pom.xml
+++ b/eagle-core/eagle-embed/eagle-embed-hbase/pom.xml
@@ -30,6 +30,11 @@
 
     <dependencies>
         <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-servlet</artifactId>
+            <version>1.19.1</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-server</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-embed/eagle-embed-hbase/src/main/java/org/apache/eagle/service/hbase/EmbeddedHbase.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-embed/eagle-embed-hbase/src/main/java/org/apache/eagle/service/hbase/EmbeddedHbase.java b/eagle-core/eagle-embed/eagle-embed-hbase/src/main/java/org/apache/eagle/service/hbase/EmbeddedHbase.java
index 7bfb409..7aafded 100644
--- a/eagle-core/eagle-embed/eagle-embed-hbase/src/main/java/org/apache/eagle/service/hbase/EmbeddedHbase.java
+++ b/eagle-core/eagle-embed/eagle-embed-hbase/src/main/java/org/apache/eagle/service/hbase/EmbeddedHbase.java
@@ -67,6 +67,7 @@ public class EmbeddedHbase {
 	        conf.setInt("test.hbase.zookeeper.property.clientPort", port);
 	        conf.set("zookeeper.znode.parent", znode);
 	        conf.setInt("hbase.zookeeper.property.maxClientCnxns", 200);
+			conf.set("hbase.master.ipc.address", "localhost");
 	        conf.setInt("hbase.master.info.port", -1);//avoid port clobbering
 	        // start mini hbase cluster
 	        hBaseCluster = util.startMiniCluster();

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-antlr/src/test/java/org/apache/eagle/query/parser/test/TestEagleQueryParser.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-antlr/src/test/java/org/apache/eagle/query/parser/test/TestEagleQueryParser.java b/eagle-core/eagle-query/eagle-antlr/src/test/java/org/apache/eagle/query/parser/test/TestEagleQueryParser.java
index 5f52f39..2f5b47b 100755
--- a/eagle-core/eagle-query/eagle-antlr/src/test/java/org/apache/eagle/query/parser/test/TestEagleQueryParser.java
+++ b/eagle-core/eagle-query/eagle-antlr/src/test/java/org/apache/eagle/query/parser/test/TestEagleQueryParser.java
@@ -16,8 +16,8 @@
  */
 package org.apache.eagle.query.parser.test;
 
-import junit.framework.Assert;
 import org.apache.eagle.query.parser.*;
+import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -346,7 +346,7 @@ public class TestEagleQueryParser {
 		Assert.assertTrue(or.getANDExprList().size()==1);
 		Assert.assertEquals(1, or.getANDExprList().get(0).getAtomicExprList().size());
 		Assert.assertEquals("@field1", or.getANDExprList().get(0).getAtomicExprList().get(0).getKey());
-		Assert.assertEquals(-1.234, Double.parseDouble(or.getANDExprList().get(0).getAtomicExprList().get(0).getValue()));
+		Assert.assertEquals(-1.234, Double.parseDouble(or.getANDExprList().get(0).getAtomicExprList().get(0).getValue()), 0.0001);
 		Assert.assertEquals(">=", or.getANDExprList().get(0).getAtomicExprList().get(0).getOp().toString());
 		Assert.assertEquals(TokenType.NUMBER, or.getANDExprList().get(0).getAtomicExprList().get(0).getValueType());
 	}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-antlr/src/test/java/org/apache/eagle/query/parser/test/TestValueType.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-antlr/src/test/java/org/apache/eagle/query/parser/test/TestValueType.java b/eagle-core/eagle-query/eagle-antlr/src/test/java/org/apache/eagle/query/parser/test/TestValueType.java
index 3a168e9..9627b78 100755
--- a/eagle-core/eagle-query/eagle-antlr/src/test/java/org/apache/eagle/query/parser/test/TestValueType.java
+++ b/eagle-core/eagle-query/eagle-antlr/src/test/java/org/apache/eagle/query/parser/test/TestValueType.java
@@ -18,7 +18,7 @@ package org.apache.eagle.query.parser.test;
 
 import org.apache.eagle.query.parser.TokenConstant;
 import org.apache.eagle.query.parser.TokenType;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TestValueType {

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/TestEagleServiceClientImpl.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/TestEagleServiceClientImpl.java b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/TestEagleServiceClientImpl.java
index 0625145..9051ca7 100644
--- a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/TestEagleServiceClientImpl.java
+++ b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/TestEagleServiceClientImpl.java
@@ -21,7 +21,7 @@ import org.apache.eagle.log.entity.GenericServiceAPIResponseEntity;
 import org.apache.eagle.log.entity.test.TestTimeSeriesAPIEntity;
 import org.apache.eagle.service.client.impl.EagleServiceClientImpl;
 import org.apache.eagle.service.client.impl.ConcurrentSender;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/TestJackson.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/TestJackson.java b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/TestJackson.java
index 73d28be..bc0ca57 100644
--- a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/TestJackson.java
+++ b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/client/TestJackson.java
@@ -20,11 +20,10 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.Assert;
-
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.codehaus.jackson.map.ObjectMapper;
+import org.junit.Assert;
 import org.junit.Test;
 
 // http://wiki.fasterxml.com/JacksonPolymorphicDeserialization

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/jackson/TestJacksonMarshalling.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/jackson/TestJacksonMarshalling.java b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/jackson/TestJacksonMarshalling.java
index 808ee9a..b5689c7 100644
--- a/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/jackson/TestJacksonMarshalling.java
+++ b/eagle-core/eagle-query/eagle-client-base/src/test/java/org/apache/eagle/service/jackson/TestJacksonMarshalling.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.map.ObjectMapper;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/TestByteUtil.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/TestByteUtil.java b/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/TestByteUtil.java
index 1cf6b8c..a08c3d1 100644
--- a/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/TestByteUtil.java
+++ b/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/TestByteUtil.java
@@ -16,8 +16,7 @@
  */
 package org.apache.eagle.common;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TestByteUtil {
@@ -45,7 +44,7 @@ public class TestByteUtil {
 		byte[] bytes = ByteUtil.doubleToBytes(origValue);
 		checkNonZeros(bytes);
 		double value = ByteUtil.bytesToDouble(bytes);
-		Assert.assertEquals(origValue, value);
+		Assert.assertEquals(origValue, value, 0.0001);
 		bytes = new byte[16];
 		checkZeros(bytes);
 		ByteUtil.doubleToBytes(origValue, bytes, 4);
@@ -53,7 +52,7 @@ public class TestByteUtil {
 		checkZeros(bytes, 12, 16);
 		checkNonZeros(bytes, 4, 12);
 		value = ByteUtil.bytesToDouble(bytes, 4);
-		Assert.assertEquals(origValue, value);
+		Assert.assertEquals(origValue, value, 0.0001);
 	}
 	
 	@Test

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/TestCircularArrayList.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/TestCircularArrayList.java b/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/TestCircularArrayList.java
index 942111d..3642635 100644
--- a/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/TestCircularArrayList.java
+++ b/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/TestCircularArrayList.java
@@ -16,8 +16,7 @@
  */
 package org.apache.eagle.common;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TestCircularArrayList {

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/TestCircularArrayListSortedSet.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/TestCircularArrayListSortedSet.java b/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/TestCircularArrayListSortedSet.java
index 9422313..e4fbb18 100644
--- a/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/TestCircularArrayListSortedSet.java
+++ b/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/TestCircularArrayListSortedSet.java
@@ -16,8 +16,7 @@
  */
 package org.apache.eagle.common;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TestCircularArrayListSortedSet {

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/TestDateTimeUtil.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/TestDateTimeUtil.java b/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/TestDateTimeUtil.java
index 8b7c1cd..062d44a 100755
--- a/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/TestDateTimeUtil.java
+++ b/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/TestDateTimeUtil.java
@@ -19,8 +19,7 @@ package org.apache.eagle.common;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TestDateTimeUtil {

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/config/TestEagleConfig.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/config/TestEagleConfig.java b/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/config/TestEagleConfig.java
index 6894b7d..892db0c 100644
--- a/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/config/TestEagleConfig.java
+++ b/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/config/TestEagleConfig.java
@@ -16,7 +16,7 @@
  */
 package org.apache.eagle.common.config;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/metric/TestAlertContext.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/metric/TestAlertContext.java b/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/metric/TestAlertContext.java
index fb0c3d1..894961b 100644
--- a/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/metric/TestAlertContext.java
+++ b/eagle-core/eagle-query/eagle-common/src/test/java/org/apache/eagle/common/metric/TestAlertContext.java
@@ -16,7 +16,7 @@
  */
 package org.apache.eagle.common.metric;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/TestGenericServiceAPIResponseEntity.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/TestGenericServiceAPIResponseEntity.java b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/TestGenericServiceAPIResponseEntity.java
index a6b7cba..6ef9365 100644
--- a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/TestGenericServiceAPIResponseEntity.java
+++ b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/TestGenericServiceAPIResponseEntity.java
@@ -17,7 +17,7 @@
 package org.apache.eagle.log;
 
 import org.apache.eagle.log.entity.GenericServiceAPIResponseEntity;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 import org.junit.Before;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestDoubleSerDeser.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestDoubleSerDeser.java b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestDoubleSerDeser.java
index 3a10cf2..2432e47 100644
--- a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestDoubleSerDeser.java
+++ b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestDoubleSerDeser.java
@@ -18,7 +18,7 @@ package org.apache.eagle.log.entity;
 
 import org.apache.eagle.log.entity.meta.DoubleSerDeser;
 import org.apache.eagle.common.ByteUtil;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.hadoop.hbase.filter.BinaryComparator;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestGenericEntityIndexStreamReader.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestGenericEntityIndexStreamReader.java b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestGenericEntityIndexStreamReader.java
index 84236c0..22ae25a 100755
--- a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestGenericEntityIndexStreamReader.java
+++ b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestGenericEntityIndexStreamReader.java
@@ -26,6 +26,7 @@ import org.apache.eagle.log.entity.test.TestLogAPIEntity;
 import org.apache.eagle.query.parser.EagleQueryParser;
 import org.apache.eagle.service.hbase.TestHBaseBase;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestHBaseIntegerLogHelper.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestHBaseIntegerLogHelper.java b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestHBaseIntegerLogHelper.java
index b50a14a..a755668 100755
--- a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestHBaseIntegerLogHelper.java
+++ b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestHBaseIntegerLogHelper.java
@@ -21,7 +21,7 @@ import org.apache.eagle.log.entity.meta.EntityDefinition;
 import org.apache.eagle.log.entity.meta.EntityDefinitionManager;
 import org.apache.eagle.log.entity.test.TestTimeSeriesAPIEntity;
 import org.apache.eagle.common.ByteUtil;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestHBaseWriteEntitiesPerformance.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestHBaseWriteEntitiesPerformance.java b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestHBaseWriteEntitiesPerformance.java
index d7e3705..5ef3d12 100755
--- a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestHBaseWriteEntitiesPerformance.java
+++ b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestHBaseWriteEntitiesPerformance.java
@@ -20,11 +20,10 @@ import org.apache.eagle.log.entity.meta.EntityDefinition;
 import org.apache.eagle.log.entity.meta.EntityDefinitionManager;
 import org.apache.eagle.log.entity.test.TestLogAPIEntity;
 import org.apache.eagle.service.hbase.TestHBaseBase;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.commons.lang.time.StopWatch;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,7 +34,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
-@Ignore
 public class TestHBaseWriteEntitiesPerformance extends TestHBaseBase {
 	private EntityDefinition ed;
 	private final static Logger LOG = LoggerFactory.getLogger(TestHBaseWriteEntitiesPerformance.class);

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestTestLogAPIEntity.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestTestLogAPIEntity.java b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestTestLogAPIEntity.java
index 1839a99..7ed98df 100755
--- a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestTestLogAPIEntity.java
+++ b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/TestTestLogAPIEntity.java
@@ -26,6 +26,7 @@ import org.apache.eagle.log.entity.old.GenericDeleter;
 import org.apache.eagle.log.entity.test.TestLogAPIEntity;
 import org.apache.eagle.service.hbase.TestHBaseBase;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.lang.reflect.InvocationTargetException;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/base/taggedlog/TestTaggedLogAPIEntity.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/base/taggedlog/TestTaggedLogAPIEntity.java b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/base/taggedlog/TestTaggedLogAPIEntity.java
index db7ce41..3b14bff 100755
--- a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/base/taggedlog/TestTaggedLogAPIEntity.java
+++ b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/base/taggedlog/TestTaggedLogAPIEntity.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
 
 import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity;
 import org.apache.eagle.log.entity.meta.Column;
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.annotate.JsonSerialize;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/filter/TestEntityQualifierHelper.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/filter/TestEntityQualifierHelper.java b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/filter/TestEntityQualifierHelper.java
index 090fbc8..e22c699 100755
--- a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/filter/TestEntityQualifierHelper.java
+++ b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/filter/TestEntityQualifierHelper.java
@@ -20,8 +20,8 @@ import org.apache.eagle.log.entity.EntityQualifierUtils;
 import org.apache.eagle.log.entity.meta.EntityDefinition;
 import org.apache.eagle.log.entity.meta.EntityDefinitionManager;
 import org.apache.eagle.log.entity.test.TestLogAPIEntity;
-import junit.framework.Assert;
 import org.apache.hadoop.hbase.util.Bytes;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/filter/TestExpressionComparator.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/filter/TestExpressionComparator.java b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/filter/TestExpressionComparator.java
index bdeed52..37adb55 100755
--- a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/filter/TestExpressionComparator.java
+++ b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/filter/TestExpressionComparator.java
@@ -19,7 +19,7 @@ package org.apache.eagle.log.entity.filter;
 import org.apache.eagle.log.entity.meta.EntityDefinition;
 import org.apache.eagle.query.parser.ComparisonOperator;
 import org.apache.eagle.query.parser.TokenType;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/filter/TestHBaseFilterBuilder.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/filter/TestHBaseFilterBuilder.java b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/filter/TestHBaseFilterBuilder.java
index 968be28..30e4523 100755
--- a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/filter/TestHBaseFilterBuilder.java
+++ b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/filter/TestHBaseFilterBuilder.java
@@ -22,10 +22,10 @@ import org.apache.eagle.log.entity.test.TestLogAPIEntity;
 import org.apache.eagle.query.parser.EagleQueryParseException;
 import org.apache.eagle.query.parser.EagleQueryParser;
 import org.apache.eagle.query.parser.ORExpression;
-import junit.framework.Assert;
 import org.apache.hadoop.hbase.filter.Filter;
 import org.apache.hadoop.hbase.filter.FilterList;
 import org.apache.hadoop.hbase.filter.RowFilter;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/meta/TestArraySerDeser.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/meta/TestArraySerDeser.java b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/meta/TestArraySerDeser.java
index 4807b07..98db12f 100755
--- a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/meta/TestArraySerDeser.java
+++ b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/meta/TestArraySerDeser.java
@@ -16,7 +16,7 @@
  */
 package org.apache.eagle.log.entity.meta;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 
@@ -44,7 +44,7 @@ public class TestArraySerDeser {
 		double[] targets = serDeser.deserialize(bytes);
 		Assert.assertEquals(doubles.length, targets.length);
 		for(int i=0; i<doubles.length; i++){
-			Assert.assertEquals(doubles[i], targets[i]);
+			Assert.assertEquals(doubles[i], targets[i], 0.0001);
 		}
 	}
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/meta/TestEntityDefinitionManager.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/meta/TestEntityDefinitionManager.java b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/meta/TestEntityDefinitionManager.java
index ccbca71..3b5669d 100755
--- a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/meta/TestEntityDefinitionManager.java
+++ b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/meta/TestEntityDefinitionManager.java
@@ -18,7 +18,7 @@ package org.apache.eagle.log.entity.meta;
 
 import org.apache.eagle.log.entity.GenericMetricEntity;
 import org.apache.eagle.log.entity.test.TestLogAPIEntity;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TestEntityDefinitionManager {

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/meta/TestListSerDeser.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/meta/TestListSerDeser.java b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/meta/TestListSerDeser.java
index 6908815..fb0018c 100644
--- a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/meta/TestListSerDeser.java
+++ b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/meta/TestListSerDeser.java
@@ -19,7 +19,7 @@ package org.apache.eagle.log.entity.meta;
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/meta/TestMapSerDeser.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/meta/TestMapSerDeser.java b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/meta/TestMapSerDeser.java
index 29a704d..96051f4 100644
--- a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/meta/TestMapSerDeser.java
+++ b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/entity/meta/TestMapSerDeser.java
@@ -19,7 +19,7 @@ package org.apache.eagle.log.entity.meta;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/expression/TestExpressionParser.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/expression/TestExpressionParser.java b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/expression/TestExpressionParser.java
index 0206b68..ea548b8 100755
--- a/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/expression/TestExpressionParser.java
+++ b/eagle-core/eagle-query/eagle-entity-base/src/test/java/org/apache/eagle/log/expression/TestExpressionParser.java
@@ -19,7 +19,7 @@ package org.apache.eagle.log.expression;
  * 
  */
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.List;
@@ -35,7 +35,7 @@ public class TestExpressionParser {
 		ExpressionParser parser = new ExpressionParser(exprStr);
 		Double value = parser.setVariable("mapProgress", 100.0)
 							 .eval();
-		Assert.assertEquals(value, 100.0);
+		Assert.assertEquals(value, 100.0, 0.001);
 		List<String> dependentFields = parser.getDependentFields();
 		Assert.assertEquals(dependentFields.size(), 1);
 		Assert.assertEquals(dependentFields.get(0), "mapProgress");
@@ -63,7 +63,7 @@ public class TestExpressionParser {
 							 .setVariable("endTime", 1415590100000.0)
 							 .setVariable("startTime", 1415590000000.0)
 							 .eval();
-		Assert.assertEquals(value, 0.0002);
+		Assert.assertEquals(value, 0.0002, 0.001);
 	}
 	
 	@Test
@@ -76,7 +76,7 @@ public class TestExpressionParser {
 							 .setVariable("d", 225.0)
 							 .setVariable("e", -125.0)
 							 .eval();
-		Assert.assertEquals(value, 2.0);
+		Assert.assertEquals(value, 2.0, 0.001);
 	}
 	
 	@Test
@@ -88,7 +88,7 @@ public class TestExpressionParser {
 							 .setVariable("c", -300.0)
 							 .setVariable("d", -300.0)
 							 .eval();
-		Assert.assertEquals(value, 600.0);
+		Assert.assertEquals(value, 600.0, 0.001);
 	}
 
 	@Test
@@ -100,7 +100,7 @@ public class TestExpressionParser {
 							 .setVariable("c", -300.0)
 							 .setVariable("d", -300.0)
 							 .eval();
-		Assert.assertEquals(value, 600.0);
+		Assert.assertEquals(value, 600.0, 0.001);
 	}
 
 	@Test
@@ -112,14 +112,14 @@ public class TestExpressionParser {
 				.setVariable("c", -300.0)
 				.setVariable("d", -300.0)
 				.eval();
-		Assert.assertEquals(value, 300.0);
+		Assert.assertEquals(value, 300.0, 0.001);
 
 		value = parser.setVariable("a", 200.0)
 				.setVariable("b", 200.0)
 				.setVariable("c", -300.0)
 				.setVariable("d", -300.0)
 				.eval();
-		Assert.assertEquals(value, 200.0);
+		Assert.assertEquals(value, 200.0, 0.001);
 	}
 
 	@Test
@@ -131,14 +131,14 @@ public class TestExpressionParser {
 				.setVariable("c", -300.0)
 				.setVariable("d", -300.0)
 				.eval();
-		Assert.assertEquals(value, 1.0);
+		Assert.assertEquals(value, 1.0, 0.001);
 
 		value = parser.setVariable("a", 100.0)
 				.setVariable("b", 200.0)
 				.setVariable("c", -300.0)
 				.setVariable("d", -300.0)
 				.eval();
-		Assert.assertEquals(value, 0.0);
+		Assert.assertEquals(value, 0.0, 0.001);
 
 		exprStr = "a < b";
 		parser = new ExpressionParser(exprStr);
@@ -217,14 +217,14 @@ public class TestExpressionParser {
 				.setVariable("c", -300.0)
 				.setVariable("d", -300.0)
 				.eval();
-		Assert.assertEquals(value, 1.0);
+		Assert.assertEquals(value, 1.0, 0.001);
 
 		value = parser.setVariable("a", 100.0)
 				.setVariable("b", 200.0)
 				.setVariable("c", -300.0)
 				.setVariable("d", -300.0)
 				.eval();
-		Assert.assertEquals(value, 0.0);
+		Assert.assertEquals(value, 0.0, 0.001);
 	}
 
 	@Test

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/raw/TestGroupbyKey.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/raw/TestGroupbyKey.java b/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/raw/TestGroupbyKey.java
index b07229b..2683220 100755
--- a/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/raw/TestGroupbyKey.java
+++ b/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/raw/TestGroupbyKey.java
@@ -16,8 +16,7 @@
  */
 package org.apache.eagle.query.aggregate.raw;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TestGroupbyKey {

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestAggregator.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestAggregator.java b/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestAggregator.java
index 135e6d0..7b1932a 100644
--- a/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestAggregator.java
+++ b/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestAggregator.java
@@ -21,7 +21,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.eagle.query.aggregate.*;
 import org.codehaus.jackson.JsonFactory;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestBucketQuery.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestBucketQuery.java b/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestBucketQuery.java
index e879bdf..e2e83ec 100755
--- a/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestBucketQuery.java
+++ b/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestBucketQuery.java
@@ -18,7 +18,7 @@ package org.apache.eagle.query.aggregate.test;
 
 import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity;
 import org.apache.eagle.query.aggregate.BucketQuery;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/eef4930c/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestBucketQuery2.java
----------------------------------------------------------------------
diff --git a/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestBucketQuery2.java b/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestBucketQuery2.java
index b416319..a35ab72 100644
--- a/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestBucketQuery2.java
+++ b/eagle-core/eagle-query/eagle-query-base/src/test/java/org/apache/eagle/query/aggregate/test/TestBucketQuery2.java
@@ -18,9 +18,9 @@ package org.apache.eagle.query.aggregate.test;
 
 import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity;
 import org.apache.eagle.query.aggregate.BucketQuery;
-import junit.framework.Assert;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.map.ObjectMapper;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.ArrayList;


Mime
View raw message