eagle-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject [1/8] incubator-eagle git commit: [EAGLE-520] Fix and decouple co-processor from eagle aggreation query service
Date Wed, 07 Sep 2016 12:30:50 GMT
Repository: incubator-eagle
Updated Branches:
  refs/heads/develop 3324279e4 -> 21187b55c


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/21187b55/eagle-server/src/main/java/org/apache/eagle/server/ServerApplication.java
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/java/org/apache/eagle/server/ServerApplication.java b/eagle-server/src/main/java/org/apache/eagle/server/ServerApplication.java
index 6299e28..e495e77 100644
--- a/eagle-server/src/main/java/org/apache/eagle/server/ServerApplication.java
+++ b/eagle-server/src/main/java/org/apache/eagle/server/ServerApplication.java
@@ -16,6 +16,12 @@
  */
 package org.apache.eagle.server;
 
+import org.apache.eagle.alert.coordinator.CoordinatorListener;
+import org.apache.eagle.alert.resource.SimpleCORSFiler;
+import org.apache.eagle.log.base.taggedlog.EntityJsonModule;
+import org.apache.eagle.log.base.taggedlog.TaggedLogAPIEntity;
+import org.apache.eagle.server.module.GuideBundleLoader;
+
 import com.sun.jersey.api.core.PackagesResourceConfig;
 import io.dropwizard.Application;
 import io.dropwizard.assets.AssetsBundle;
@@ -23,18 +29,15 @@ import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
 import io.swagger.jaxrs.config.BeanConfig;
 import io.swagger.jaxrs.listing.ApiListingResource;
-import org.apache.eagle.alert.coordinator.CoordinatorListener;
-import org.apache.eagle.alert.resource.SimpleCORSFiler;
-import org.apache.eagle.server.module.GuideBundleLoader;
 
-import javax.servlet.DispatcherType;
 import java.util.EnumSet;
+import javax.servlet.DispatcherType;
 
 class ServerApplication extends Application<ServerConfig> {
     @Override
     public void initialize(Bootstrap<ServerConfig> bootstrap) {
         bootstrap.addBundle(GuideBundleLoader.load());
-        bootstrap.addBundle(new AssetsBundle("/assets","/","index.html","/"));
+        bootstrap.addBundle(new AssetsBundle("/assets", "/", "index.html", "/"));
     }
 
     @Override
@@ -47,6 +50,8 @@ class ServerApplication extends Application<ServerConfig> {
         environment.getApplicationContext().setContextPath(ServerConfig.getContextPath());
         environment.jersey().register(RESTExceptionMapper.class);
         environment.jersey().setUrlPattern(ServerConfig.getApiBasePath());
+        environment.getObjectMapper().setFilters(TaggedLogAPIEntity.getFilterProvider());
+        environment.getObjectMapper().registerModule(new EntityJsonModule());
 
         // Automatically scan all REST resources
         new PackagesResourceConfig(ServerConfig.getResourcePackage()).getClasses().forEach(environment.jersey()::register);
@@ -65,9 +70,9 @@ class ServerApplication extends Application<ServerConfig> {
 
         // Simple CORS filter
         environment.servlets().addFilter(SimpleCORSFiler.class.getName(), new SimpleCORSFiler())
-                .addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), true, "/*");
+            .addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), true, "/*");
 
         // context listener
         environment.servlets().addServletListeners(new CoordinatorListener());
     }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/21187b55/eagle-server/src/main/java/org/apache/eagle/server/ServerConfig.java
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/java/org/apache/eagle/server/ServerConfig.java b/eagle-server/src/main/java/org/apache/eagle/server/ServerConfig.java
index 3bbe335..58442d9 100644
--- a/eagle-server/src/main/java/org/apache/eagle/server/ServerConfig.java
+++ b/eagle-server/src/main/java/org/apache/eagle/server/ServerConfig.java
@@ -21,42 +21,43 @@ import com.typesafe.config.ConfigFactory;
 import io.dropwizard.Configuration;
 
 public class ServerConfig extends Configuration {
-    private final static String SERVER_NAME = "Apache Eagle";
-    private final static String SERVER_VERSION = "0.5.0-incubating";
-    private final static String API_BASE_PATH = "/rest/*";
-    private final static String CONTEXT_PATH="/";
-    private final static String RESOURCE_PACKAGE = "org.apache.eagle";
-    private final static String LICENSE = "Apache License (Version 2.0)";
-    private final static String LICENSE_URL = "http://www.apache.org/licenses/LICENSE-2.0";
-
-    public Config getConfig(){
+    private static final String SERVER_NAME = "Apache Eagle";
+    private static final String SERVER_VERSION = "0.5.0-incubating";
+    private static final String API_BASE_PATH = "/rest/*";
+    private static final String CONTEXT_PATH = "/";
+    private static final String RESOURCE_PACKAGE = "org.apache.eagle";
+    private static final String LICENSE = "Apache License (Version 2.0)";
+    private static final String LICENSE_URL = "http://www.apache.org/licenses/LICENSE-2.0";
+
+    public Config getConfig() {
         return ConfigFactory.load();
     }
 
-    static String getServerName(){
+    static String getServerName() {
         return SERVER_NAME;
     }
 
-    static String getServerVersion(){
+    static String getServerVersion() {
         return SERVER_VERSION;
     }
 
-    static String getApiBasePath(){
+    static String getApiBasePath() {
         return API_BASE_PATH;
     }
-    static String getResourcePackage(){
+
+    static String getResourcePackage() {
         return RESOURCE_PACKAGE;
     }
 
-    static String getContextPath(){
+    static String getContextPath() {
         return CONTEXT_PATH;
     }
 
-    public static String getLicense(){
+    public static String getLicense() {
         return LICENSE;
     }
 
-    static String getLicenseUrl(){
+    static String getLicenseUrl() {
         return LICENSE_URL;
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/21187b55/eagle-server/src/main/java/org/apache/eagle/server/ServerMain.java
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/java/org/apache/eagle/server/ServerMain.java b/eagle-server/src/main/java/org/apache/eagle/server/ServerMain.java
index 968a93c..a944265 100644
--- a/eagle-server/src/main/java/org/apache/eagle/server/ServerMain.java
+++ b/eagle-server/src/main/java/org/apache/eagle/server/ServerMain.java
@@ -19,8 +19,8 @@ package org.apache.eagle.server;
 public class ServerMain {
     public static void main(String[] args) {
         System.out.println(
-            "Welcome to Apache Eagle (Incubating)\n"+
-            "---------------"
+            "Welcome to Apache Eagle (Incubating)\n"
+                + "---------------"
         );
         System.out.println(
             "Starting Eagle Server ..."
@@ -28,7 +28,7 @@ public class ServerMain {
         try {
             new ServerApplication().run(args);
         } catch (Exception e) {
-            System.err.println("Got exception: "+e.getMessage());
+            System.err.println("Got exception: " + e.getMessage());
             e.printStackTrace();
             System.exit(1);
         }

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/21187b55/eagle-server/src/main/java/org/apache/eagle/server/module/GuideBundleLoader.java
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/java/org/apache/eagle/server/module/GuideBundleLoader.java
b/eagle-server/src/main/java/org/apache/eagle/server/module/GuideBundleLoader.java
index d4ecaf7..51f23b0 100644
--- a/eagle-server/src/main/java/org/apache/eagle/server/module/GuideBundleLoader.java
+++ b/eagle-server/src/main/java/org/apache/eagle/server/module/GuideBundleLoader.java
@@ -16,10 +16,6 @@
  */
 package org.apache.eagle.server.module;
 
-import com.google.inject.Module;
-import com.hubspot.dropwizard.guice.GuiceBundle;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 import org.apache.eagle.app.module.ApplicationExtensionLoader;
 import org.apache.eagle.app.service.ApplicationProviderService;
 import org.apache.eagle.app.service.impl.ApplicationProviderServiceImpl;
@@ -28,15 +24,20 @@ import org.apache.eagle.common.module.ModuleRegistry;
 import org.apache.eagle.metadata.persistence.MetadataStore;
 import org.apache.eagle.metadata.persistence.MetadataStoreModuleFactory;
 import org.apache.eagle.server.ServerConfig;
+
+import com.google.inject.Module;
+import com.hubspot.dropwizard.guice.GuiceBundle;
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
 public class GuideBundleLoader {
-    private final static Logger LOGGER = LoggerFactory.getLogger(GuideBundleLoader.class);
+    private static final  Logger LOGGER = LoggerFactory.getLogger(GuideBundleLoader.class);
 
-    public static GuiceBundle<ServerConfig> load(List<Module> modules){
+    public static GuiceBundle<ServerConfig> load(List<Module> modules) {
         /*
            We use tow injectors, one is Dropwizard injector, the other injector is to instantiate
ApplicationProvider and
            load sub modules from applications
@@ -56,27 +57,29 @@ public class GuideBundleLoader {
         List<Module> metadataExtensions = metadataStoreModule.getModules(registry);
         int extensionNum = 0;
         GuiceBundle.Builder<ServerConfig> builder = GuiceBundle.newBuilder();
-        if(metadataExtensions!=null){
+        if (metadataExtensions != null) {
             extensionNum = metadataExtensions.size();
             metadataExtensions.forEach(builder::addModule);
         }
-        LOGGER.warn("Loaded {} modules (scope: metadataStore)",extensionNum);
+        LOGGER.warn("Loaded {} modules (scope: metadataStore)", extensionNum);
 
         List<Module> globalExtensions = registry.getModules(GlobalScope.class);
         extensionNum = 0;
-        if(globalExtensions!=null){
+        if (globalExtensions != null) {
             extensionNum = globalExtensions.size();
             globalExtensions.forEach(builder::addModule);
         }
-        LOGGER.warn("Loaded {} modules (scope: global)",extensionNum);
+        LOGGER.warn("Loaded {} modules (scope: global)", extensionNum);
 
-        if(modules!=null) modules.forEach(builder::addModule);
+        if (modules != null) {
+            modules.forEach(builder::addModule);
+        }
         return builder.addModule(serveBaseModule)
-                .setConfigClass(ServerConfig.class)
-                .build();
+            .setConfigClass(ServerConfig.class)
+            .build();
     }
 
-    public static GuiceBundle<ServerConfig> load(){
+    public static GuiceBundle<ServerConfig> load() {
         return load(null);
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/21187b55/eagle-server/src/main/java/org/apache/eagle/server/module/ServerModule.java
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/java/org/apache/eagle/server/module/ServerModule.java b/eagle-server/src/main/java/org/apache/eagle/server/module/ServerModule.java
index 47e34b3..476096c 100644
--- a/eagle-server/src/main/java/org/apache/eagle/server/module/ServerModule.java
+++ b/eagle-server/src/main/java/org/apache/eagle/server/module/ServerModule.java
@@ -16,15 +16,16 @@
  */
 package org.apache.eagle.server.module;
 
-import com.google.inject.AbstractModule;
 import org.apache.eagle.app.module.ApplicationGuiceModule;
 import org.apache.eagle.app.service.ApplicationProviderService;
 import org.apache.eagle.common.module.CommonGuiceModule;
 import org.apache.eagle.metadata.persistence.MetadataStoreModuleFactory;
+import com.google.inject.AbstractModule;
 
 public class ServerModule extends AbstractModule {
     private ApplicationProviderService appProviderInst;
-    public ServerModule(ApplicationProviderService appProviderInst){
+
+    public ServerModule(ApplicationProviderService appProviderInst) {
         this.appProviderInst = appProviderInst;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/21187b55/eagle-server/src/main/resources/application.conf
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/resources/application.conf b/eagle-server/src/main/resources/application.conf
index 6db7707..2c076af 100644
--- a/eagle-server/src/main/resources/application.conf
+++ b/eagle-server/src/main/resources/application.conf
@@ -13,51 +13,81 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{
-	"coordinator" : {
-		"policiesPerBolt" : 5,
-		"boltParallelism" : 5,
-		"policyDefaultParallelism" : 5,
-		"boltLoadUpbound": 0.8,
-		"topologyLoadUpbound" : 0.8,
-		"numOfAlertBoltsPerTopology" : 5,
-		"zkConfig" : {
-			"zkQuorum" : "server.eagle.apache.org:2181",
-			"zkRoot" : "/alert",
-			"zkSessionTimeoutMs" : 10000,
-			"connectionTimeoutMs" : 10000,
-			"zkRetryTimes" : 3,
-			"zkRetryInterval" : 3000
-		},
-		"metadataService" : {
-			"host" : "localhost",
-			"port" : 9090,
-			"context" : "/rest"
-		},
-		"metadataDynamicCheck" : {
-			"initDelayMillis" : 1000,
-			"delayMillis" : 30000
-		}
-	},
-	"metadata":{
-		"store": "org.apache.eagle.metadata.service.memory.MemoryMetadataStore"
-		"jdbc":{
-      "username": "root"
-      "password": ""
-      "driverClassName":"com.mysql.jdbc.Driver"
-			"url":"jdbc:mysql://server.eagle.apache.org:3306/eagle"
-		}
-	},
-	"application":{
-		"sink":{
-			"type": "org.apache.eagle.app.sink.KafkaStreamSink"
-		},
-		"storm": {
-			"nimbusHost": "server.eagle.apache.org"
-			"nimbusThriftPort": 6627
-		},
-		"provider" : {
-//			"dir" : "/tmp/eagle"
-		}
-	}
+# ---------------------------------------------
+# Eagle REST Web Service Configuration
+# ---------------------------------------------
+service {
+  host = "localhost"
+  port = 9090
+  context = "/rest"
 }
+
+# ---------------------------------------------
+# Eagle Deep Storage Configuration
+# ---------------------------------------------
+storage {
+  storage-type = "hbase"
+  table-name-prefixed-with-environment = false
+  coprocessor-enabled = false
+  hbase-zookeeper-quorum = "localhost"
+  hbase-zookeeper-property-clientPort = 2181
+  zookeeper-znode-parent = "/hbase-unsecure"
+}
+
+
+# ---------------------------------------------
+# Eagle Metadata Store Configuration
+# ---------------------------------------------
+metadata {
+  store = org.apache.eagle.metadata.service.memory.MemoryMetadataStore
+  jdbc {
+    username = "root"
+    password = ""
+    driverClassName = com.mysql.jdbc.Driver
+    url = "jdbc:mysql://server.eagle.apache.org:3306/eagle"
+  }
+}
+
+# ---------------------------------------------
+# Eagle Application Configuration
+# ---------------------------------------------
+application {
+  sink {
+    type = org.apache.eagle.app.sink.KafkaStreamSink
+  }
+  storm {
+    nimbusHost = "server.eagle.apache.org"
+    nimbusThriftPort = 6627
+  }
+}
+
+# ---------------------------------------------
+# Eagle Alert Engine Configuration
+# ---------------------------------------------
+
+# Coordinator Configuration
+coordinator {
+  policiesPerBolt = 5
+  boltParallelism = 5
+  policyDefaultParallelism = 5
+  boltLoadUpbound = 0.8
+  topologyLoadUpbound = 0.8
+  numOfAlertBoltsPerTopology = 5
+  zkConfig {
+    zkQuorum = "server.eagle.apache.org:2181"
+    zkRoot = "/alert"
+    zkSessionTimeoutMs = 10000
+    connectionTimeoutMs = 10000
+    zkRetryTimes = 3
+    zkRetryInterval = 3000
+  }
+  metadataService {
+    host = "localhost",
+    port = 9090,
+    context = "/rest"
+  }
+  metadataDynamicCheck {
+    initDelayMillis = 1000
+    delayMillis = 30000
+  }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/21187b55/eagle-server/src/main/resources/configuration.yml
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/resources/configuration.yml b/eagle-server/src/main/resources/configuration.yml
index c671ade..6dc864d 100644
--- a/eagle-server/src/main/resources/configuration.yml
+++ b/eagle-server/src/main/resources/configuration.yml
@@ -12,10 +12,11 @@
 # 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.
+
 server:
   applicationConnectors:
     - type: http
       port: 9090
   adminConnectors:
     - type: http
-      port: 9091
+      port: 9091
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/21187b55/eagle-server/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/resources/log4j.properties b/eagle-server/src/main/resources/log4j.properties
index d59ded6..9c6875d 100644
--- a/eagle-server/src/main/resources/log4j.properties
+++ b/eagle-server/src/main/resources/log4j.properties
@@ -12,9 +12,7 @@
 # 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.
-
 log4j.rootLogger=INFO, stdout
-
 # standard output
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/21187b55/eagle-server/src/main/resources/providers-disabled.xml
----------------------------------------------------------------------
diff --git a/eagle-server/src/main/resources/providers-disabled.xml b/eagle-server/src/main/resources/providers-disabled.xml
deleted file mode 100644
index b434715..0000000
--- a/eagle-server/src/main/resources/providers-disabled.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<providers>
-    <provider>
-        <jarPath>target/apache-eagle-example-app.jar</jarPath>
-        <className>org.apache.eagle.app.example.ExampleApplicationProvider</className>
-    </provider>
-    <provider>
-        <jarPath>target/apache-eagle-example-app.jar</jarPath>
-        <className>org.apache.eagle.app.example.ExampleApplicationProvider2</className>
-    </provider>
-</providers>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/21187b55/eagle-server/src/test/java/org/apache/eagle/server/GuideBundleLoaderTest.java
----------------------------------------------------------------------
diff --git a/eagle-server/src/test/java/org/apache/eagle/server/GuideBundleLoaderTest.java
b/eagle-server/src/test/java/org/apache/eagle/server/GuideBundleLoaderTest.java
index 4316dfd..b9b6fcf 100644
--- a/eagle-server/src/test/java/org/apache/eagle/server/GuideBundleLoaderTest.java
+++ b/eagle-server/src/test/java/org/apache/eagle/server/GuideBundleLoaderTest.java
@@ -22,7 +22,7 @@ import org.junit.Test;
 
 public class GuideBundleLoaderTest {
     @Test
-    public void testLoad(){
+    public void testLoad() {
         GuiceBundle<ServerConfig> bundle = GuideBundleLoader.load();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/21187b55/eagle-server/src/test/java/org/apache/eagle/server/ServerApplicationTest.java
----------------------------------------------------------------------
diff --git a/eagle-server/src/test/java/org/apache/eagle/server/ServerApplicationTest.java
b/eagle-server/src/test/java/org/apache/eagle/server/ServerApplicationTest.java
index 823981f..6b299e5 100644
--- a/eagle-server/src/test/java/org/apache/eagle/server/ServerApplicationTest.java
+++ b/eagle-server/src/test/java/org/apache/eagle/server/ServerApplicationTest.java
@@ -21,6 +21,6 @@ import org.junit.Test;
 public class ServerApplicationTest {
     @Test
     public void testServerMain() throws Exception {
-        ServerMain.main(new String[]{"server", "src/test/resources/configuration.yml"});
+        ServerMain.main(new String[] {"server", "src/test/resources/configuration.yml"});
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/21187b55/eagle-webservice/src/main/resources/application-derby.conf
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/resources/application-derby.conf b/eagle-webservice/src/main/resources/application-derby.conf
index c922a7e..fa72ec0 100644
--- a/eagle-webservice/src/main/resources/application-derby.conf
+++ b/eagle-webservice/src/main/resources/application-derby.conf
@@ -13,8 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-eagle {
-	service {
+storage {
 		storage-type="jdbc"
 		storage-adapter="derby"
 		storage-username="eagle"
@@ -24,7 +23,6 @@ eagle {
 		storage-connection-props="encoding=UTF-8"
 		storage-driver-class="org.apache.derby.jdbc.EmbeddedDriver"
 		storage-connection-max=8
-	}
 }
 
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/21187b55/eagle-webservice/src/main/resources/application-hbase.conf
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/resources/application-hbase.conf b/eagle-webservice/src/main/resources/application-hbase.conf
index 680be0e..12ade6a 100644
--- a/eagle-webservice/src/main/resources/application-hbase.conf
+++ b/eagle-webservice/src/main/resources/application-hbase.conf
@@ -13,13 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-eagle{
-	service{
+storage {
 		storage-type="hbase"
 		hbase-zookeeper-quorum="localhost"
 		hbase-zookeeper-property-clientPort=2181
 		zookeeper-znode-parent="/hbase",
 		springActiveProfile="sandbox"
 		audit-enabled=true
-	}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/21187b55/eagle-webservice/src/main/resources/application-mysql.conf
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/resources/application-mysql.conf b/eagle-webservice/src/main/resources/application-mysql.conf
index 61a899f..b14a125 100644
--- a/eagle-webservice/src/main/resources/application-mysql.conf
+++ b/eagle-webservice/src/main/resources/application-mysql.conf
@@ -13,8 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-eagle {
-	service {
+storage {
 		storage-type="jdbc"
 		storage-adapter="mysql"
 		storage-username="eagle"
@@ -24,5 +23,4 @@ eagle {
 		storage-connection-props="encoding=UTF-8"
 		storage-driver-class="com.mysql.jdbc.Driver"
 		storage-connection-max=8
-	}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/21187b55/eagle-webservice/src/main/resources/application.conf
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/resources/application.conf b/eagle-webservice/src/main/resources/application.conf
index fabe83f..c1ca0e5 100644
--- a/eagle-webservice/src/main/resources/application.conf
+++ b/eagle-webservice/src/main/resources/application.conf
@@ -13,47 +13,46 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{
-	eagle {
-		service {
-			storage-type = "hbase"
-			hbase-zookeeper-quorum = "sandbox.hortonworks.com"
-			hbase-zookeeper-property-clientPort = 2181
-			zookeeper-znode-parent = "/hbase-unsecure",
-			springActiveProfile = "sandbox"
-			audit-enabled = true
-		}
-	}
-	"coordinator" : {
-		"policiesPerBolt" : 5,
-		"boltParallelism" : 5,
-		"policyDefaultParallelism" : 5,
-		"boltLoadUpbound": 0.8,
-		"topologyLoadUpbound" : 0.8,
-		"numOfAlertBoltsPerTopology" : 5,
-		"zkConfig" : {
-			"zkQuorum" : "sandbox.hortonworks.com:2181",
-			"zkRoot" : "/alert",
-			"zkSessionTimeoutMs" : 10000,
-			"connectionTimeoutMs" : 10000,
-			"zkRetryTimes" : 3,
-			"zkRetryInterval" : 3000
-		},
-		"metadataService" : {
-			"host" : "localhost",
-			"port" : 58080,
-			"context" : "/rest"
-		},
-		"metadataDynamicCheck" : {
-			"initDelayMillis" : 1000,
-			"delayMillis" : 30000
-		}
-	}
-	"datastore": {
-		"metadataDao": "org.apache.eagle.alert.metadata.impl.InMemMetadataDaoImpl",
-		"connection": "localhost:27017"
+storage {
+	storage-type = "hbase"
+	hbase-zookeeper-quorum = "sandbox.hortonworks.com"
+	hbase-zookeeper-property-clientPort = 2181
+	zookeeper-znode-parent = "/hbase-unsecure",
+	springActiveProfile = "sandbox"
+	audit-enabled = true
+}
+
+coordinator {
+	"policiesPerBolt" : 5,
+	"boltParallelism" : 5,
+	"policyDefaultParallelism" : 5,
+	"boltLoadUpbound": 0.8,
+	"topologyLoadUpbound" : 0.8,
+	"numOfAlertBoltsPerTopology" : 5,
+	"zkConfig" : {
+		"zkQuorum" : "sandbox.hortonworks.com:2181",
+		"zkRoot" : "/alert",
+		"zkSessionTimeoutMs" : 10000,
+		"connectionTimeoutMs" : 10000,
+		"zkRetryTimes" : 3,
+		"zkRetryInterval" : 3000
+	},
+	"metadataService" : {
+		"host" : "localhost",
+		"port" : 58080,
+		"context" : "/rest"
+	},
+	"metadataDynamicCheck" : {
+		"initDelayMillis" : 1000,
+		"delayMillis" : 30000
 	}
 }
 
+datastore {
+	"metadataDao": "org.apache.eagle.alert.metadata.impl.InMemMetadataDaoImpl",
+	"connection": "localhost:27017"
+}
+
+
 
 

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/21187b55/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2a5b88a..0b9eeac 100755
--- a/pom.xml
+++ b/pom.xml
@@ -250,7 +250,6 @@
 
         <!-- Query -->
         <tomcat.version>7.0.42</tomcat.version>
-        <protobuf-java.version>2.6.1</protobuf-java.version>
         <antlr4.version>4.5</antlr4.version>
         <groovy.version>2.3.4</groovy.version>
         <parsii.version>1.3</parsii.version>
@@ -261,7 +260,7 @@
         <mysql-connector-java.version>5.1.34</mysql-connector-java.version>
         <ddlutils.version>1.0</ddlutils.version>
         <torque.version>4.0</torque.version>
-        <!--<derby.version>10.1.3.1</derby.version>-->
+        <derby.version>10.1.3.1</derby.version>
         <derby.version>10.10.2.0</derby.version>
 
         <!-- REST Service-->
@@ -503,14 +502,14 @@
                 <scope>compile</scope>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-mapper-asl</artifactId>
-                <version>${codehaus-jackson.version}</version>
+                <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                <artifactId>jackson-jaxrs-json-provider</artifactId>
+                <version>${fasterxml-jackson.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-core-asl</artifactId>
-                <version>${codehaus-jackson.version}</version>
+                <groupId>com.fasterxml.jackson.jaxrs</groupId>
+                <artifactId>jackson-jaxrs-base</artifactId>
+                <version>${fasterxml-jackson.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.protobuf</groupId>
@@ -522,16 +521,16 @@
                 <artifactId>json</artifactId>
                 <version>${org.json.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-jaxrs</artifactId>
-                <version>${codehaus-jackson.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-xc</artifactId>
-                <version>${codehaus-jackson.version}</version>
-            </dependency>
+            <!--<dependency>-->
+                <!--<groupId>org.codehaus.jackson</groupId>-->
+                <!--<artifactId>jackson-jaxrs</artifactId>-->
+                <!--<version>${codehaus-jackson.version}</version>-->
+            <!--</dependency>-->
+            <!--<dependency>-->
+                <!--<groupId>org.codehaus.jackson</groupId>-->
+                <!--<artifactId>jackson-xc</artifactId>-->
+                <!--<version>${codehaus-jackson.version}</version>-->
+            <!--</dependency>-->
             <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>


Mime
View raw message