Repository: incubator-griffin
Updated Branches:
  refs/heads/master 359bfe23c -> 47ae17748


http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/47ae1774/measure/src/main/scala/org/apache/griffin/measure/util/MessageUtil.java
----------------------------------------------------------------------
diff --git 
a/measure/src/main/scala/org/apache/griffin/measure/util/MessageUtil.java 
b/measure/src/main/scala/org/apache/griffin/measure/util/MessageUtil.java
index 6fba5ff..4f15b62 100644
--- a/measure/src/main/scala/org/apache/griffin/measure/util/MessageUtil.java
+++ b/measure/src/main/scala/org/apache/griffin/measure/util/MessageUtil.java
@@ -16,163 +16,163 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 */
-package org.apache.griffin.measure.util;
-
-import java.io.IOException;
-
-import org.apache.commons.lang.StringUtils;
-import java.util.ArrayList;
-import java.io.*;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.*;
-import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-import org.apache.griffin.measure.config.params.env.SMSParam;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Created by xiaoqiu.duan on 2017/9/11.
- */
-public class MessageUtil {
-
-
-    public static String sendSMSCode(String teamPhone, String content, 
SMSParam smsParam){
-        String url=smsParam.host();
-        String SYS_ID=smsParam.id();
-        String KEY=smsParam.key();
-        String sendContext="["+smsParam.uuid()+"]: "+content ;
-        System.out.println(" sendContext:  "+sendContext);
-        Long timestamp=new Date().getTime()+20610;
-        System.out.println(" timestamp:  "+timestamp);
-        String[]  tels=teamPhone.split(",") ;
-        String uuid = UUID.randomUUID().toString().replaceAll("-", "");
-        Map<String,Object> param=new HashMap<String, Object>();
-        param.put("apportionment","JR_DATA_ALARM");
-        param.put("event",0);
-        param.put("eventTime",0);
-        param.put("isMasked",false);
-        param.put("originator","ETC");
-        param.put("reqId",uuid);
-        param.put("schemaKey","");
-        param.put("sysId",SYS_ID);
-        param.put("template",sendContext);
-        param.put("templateId","");
-        param.put("timestamp",timestamp);
-        param.put("token",Md5Util.md5(SYS_ID+timestamp+KEY));
-        param.put("typeCode","JR_DATA_ALARM");
-        System.out.println("params:  "+param);
-        List<Map<String, Object>> bodys = new ArrayList<Map<String, Object>>();
-          for (int i=0;i<tels.length;i++) {
-            Map<String, Object> body = new HashMap<String, Object>();
-            body.put("phoneNo", tels[i]);
-            body.put("params", "");
-            body.put("userId", 0);
-            bodys.add(body);
-        }
-        System.out.println("bodys:  "+bodys);
-        JSONObject jsonParam = new JSONObject();
-        try {
-            jsonParam.put("params",param);
-            jsonParam.put("bodys",bodys);
-            System.out.println("jsonParam:  "+jsonParam);
-            System.out.println("jsonParam:  "+jsonParam.toString());
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        URL u=null;
-        int smsnum=0;
-        HttpURLConnection connection=null;
-        try{
-           String result= postRequestUrl(url, jsonParam.toString(), "utf-8");
-            return "send success";
-        }catch(Exception e){
-            e.printStackTrace();
-            return null;
-        }
-
-    }
-
-
-    public static String postRequestUrl(String url, String param,String 
encode) {
-        OutputStreamWriter out = null;
-        BufferedReader reader = null;
-        String response="";
-        try {
-            URL httpUrl = null;
-            httpUrl = new URL(url);
-            HttpURLConnection conn = (HttpURLConnection) 
httpUrl.openConnection();
-            conn.setRequestMethod("POST");
-            conn.setRequestProperty("Content-Type", 
"application/json");//x-www-form-urlencoded
-            conn.setRequestProperty("connection", "keep-alive");
-            conn.setUseCaches(false);
-            conn.setInstanceFollowRedirects(true);
-            conn.setDoOutput(true);
-            conn.setDoInput(true);
-            conn.connect();
-            //POST
-            out = new OutputStreamWriter(
-                    conn.getOutputStream());
-            out.write(param);
-
-            out.flush();
-
-            System.out.println("send POST "+conn.getResponseCode());
-            reader = new BufferedReader(new InputStreamReader(
-                    conn.getInputStream()));
-
-            String lines;
-            while ((lines = reader.readLine()) != null) {
-                lines = new String(lines.getBytes(), "utf-8");
-                response+=lines;
-                System.out.println("lines:  "+lines);
-            }
-            reader.close();
-            conn.disconnect();
-
-            //log.info(response.toString());
-        } catch (Exception e) {
-            System.out.println("send POST error!"+e);
-            e.printStackTrace();
-        }
-        finally{
-            try{
-                if(out!=null){
-                    out.close();
-                }
-                if(reader!=null){
-                    reader.close();
-                }
-            }
-            catch(IOException ex){
-                ex.printStackTrace();
-            }
-        }
-
-        return response;
-    }
-
-
-
-    private static String readBufferedContent(BufferedReader bufferedReader) {
-        if (bufferedReader == null)
-            return null;
-        StringBuffer result = new StringBuffer();
-        String line = null;
-        try {
-            while (StringUtils.isNotBlank((line = bufferedReader.readLine()))) 
{
-                result.append(line+"\r\n");
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-            return null;
-        }
-        return result.toString();
-    }
-
-}
+//package org.apache.griffin.measure.util;
+//
+//import java.io.IOException;
+//
+//import org.apache.commons.lang.StringUtils;
+//import java.util.ArrayList;
+//import java.io.*;
+//import java.io.BufferedReader;
+//import java.io.InputStreamReader;
+//import java.net.*;
+//import java.util.*;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+//
+//import org.apache.griffin.measure.config.params.env.SMSParam;
+//import org.json.JSONException;
+//import org.json.JSONObject;
+//
+///**
+// * Created by xiaoqiu.duan on 2017/9/11.
+// */
+//public class MessageUtil {
+//
+//
+//    public static String sendSMSCode(String teamPhone, String content, 
SMSParam smsParam){
+//        String url=smsParam.host();
+//        String SYS_ID=smsParam.id();
+//        String KEY=smsParam.key();
+//        String sendContext="["+smsParam.uuid()+"]: "+content ;
+//        System.out.println(" sendContext:  "+sendContext);
+//        Long timestamp=new Date().getTime()+20610;
+//        System.out.println(" timestamp:  "+timestamp);
+//        String[]  tels=teamPhone.split(",") ;
+//        String uuid = UUID.randomUUID().toString().replaceAll("-", "");
+//        Map<String,Object> param=new HashMap<String, Object>();
+//        param.put("apportionment","JR_DATA_ALARM");
+//        param.put("event",0);
+//        param.put("eventTime",0);
+//        param.put("isMasked",false);
+//        param.put("originator","ETC");
+//        param.put("reqId",uuid);
+//        param.put("schemaKey","");
+//        param.put("sysId",SYS_ID);
+//        param.put("template",sendContext);
+//        param.put("templateId","");
+//        param.put("timestamp",timestamp);
+//        param.put("token",Md5Util.md5(SYS_ID+timestamp+KEY));
+//        param.put("typeCode","JR_DATA_ALARM");
+//        System.out.println("params:  "+param);
+//        List<Map<String, Object>> bodys = new ArrayList<Map<String, 
Object>>();
+//          for (int i=0;i<tels.length;i++) {
+//            Map<String, Object> body = new HashMap<String, Object>();
+//            body.put("phoneNo", tels[i]);
+//            body.put("params", "");
+//            body.put("userId", 0);
+//            bodys.add(body);
+//        }
+//        System.out.println("bodys:  "+bodys);
+//        JSONObject jsonParam = new JSONObject();
+//        try {
+//            jsonParam.put("params",param);
+//            jsonParam.put("bodys",bodys);
+//            System.out.println("jsonParam:  "+jsonParam);
+//            System.out.println("jsonParam:  "+jsonParam.toString());
+//        } catch (JSONException e) {
+//            e.printStackTrace();
+//        }
+//        URL u=null;
+//        int smsnum=0;
+//        HttpURLConnection connection=null;
+//        try{
+//           String result= postRequestUrl(url, jsonParam.toString(), "utf-8");
+//            return "send success";
+//        }catch(Exception e){
+//            e.printStackTrace();
+//            return null;
+//        }
+//
+//    }
+//
+//
+//    public static String postRequestUrl(String url, String param,String 
encode) {
+//        OutputStreamWriter out = null;
+//        BufferedReader reader = null;
+//        String response="";
+//        try {
+//            URL httpUrl = null;
+//            httpUrl = new URL(url);
+//            HttpURLConnection conn = (HttpURLConnection) 
httpUrl.openConnection();
+//            conn.setRequestMethod("POST");
+//            conn.setRequestProperty("Content-Type", 
"application/json");//x-www-form-urlencoded
+//            conn.setRequestProperty("connection", "keep-alive");
+//            conn.setUseCaches(false);
+//            conn.setInstanceFollowRedirects(true);
+//            conn.setDoOutput(true);
+//            conn.setDoInput(true);
+//            conn.connect();
+//            //POST
+//            out = new OutputStreamWriter(
+//                    conn.getOutputStream());
+//            out.write(param);
+//
+//            out.flush();
+//
+//            System.out.println("send POST "+conn.getResponseCode());
+//            reader = new BufferedReader(new InputStreamReader(
+//                    conn.getInputStream()));
+//
+//            String lines;
+//            while ((lines = reader.readLine()) != null) {
+//                lines = new String(lines.getBytes(), "utf-8");
+//                response+=lines;
+//                System.out.println("lines:  "+lines);
+//            }
+//            reader.close();
+//            conn.disconnect();
+//
+//            //log.info(response.toString());
+//        } catch (Exception e) {
+//            System.out.println("send POST error!"+e);
+//            e.printStackTrace();
+//        }
+//        finally{
+//            try{
+//                if(out!=null){
+//                    out.close();
+//                }
+//                if(reader!=null){
+//                    reader.close();
+//                }
+//            }
+//            catch(IOException ex){
+//                ex.printStackTrace();
+//            }
+//        }
+//
+//        return response;
+//    }
+//
+//
+//
+//    private static String readBufferedContent(BufferedReader bufferedReader) 
{
+//        if (bufferedReader == null)
+//            return null;
+//        StringBuffer result = new StringBuffer();
+//        String line = null;
+//        try {
+//            while (StringUtils.isNotBlank((line = 
bufferedReader.readLine()))) {
+//                result.append(line+"\r\n");
+//            }
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//            return null;
+//        }
+//        return result.toString();
+//    }
+//
+//}

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/47ae1774/measure/src/test/resources/_accuracy-streaming-griffindsl.json
----------------------------------------------------------------------
diff --git a/measure/src/test/resources/_accuracy-streaming-griffindsl.json 
b/measure/src/test/resources/_accuracy-streaming-griffindsl.json
index a0e2e7d..240d768 100644
--- a/measure/src/test/resources/_accuracy-streaming-griffindsl.json
+++ b/measure/src/test/resources/_accuracy-streaming-griffindsl.json
@@ -13,7 +13,7 @@
           "version": "0.8",
           "config": {
             "kafka.config": {
-              "bootstrap.servers": "10.149.247.156:9092",
+              "bootstrap.servers": "10.147.177.107:9092",
               "group.id": "group1",
               "auto.offset.reset": "smallest",
               "auto.commit.enable": "false"
@@ -46,6 +46,7 @@
         "ready.time.interval": "10s",
         "ready.time.delay": "0",
         "time.range": ["-2m", "0"],
+        "init.clear": true,
         "updatable": true
       }
     }, {
@@ -56,7 +57,7 @@
           "version": "0.8",
           "config": {
             "kafka.config": {
-              "bootstrap.servers": "10.149.247.156:9092",
+              "bootstrap.servers": "10.147.177.107:9092",
               "group.id": "group1",
               "auto.offset.reset": "smallest",
               "auto.commit.enable": "false"
@@ -88,7 +89,8 @@
         "info.path": "target",
         "ready.time.interval": "10s",
         "ready.time.delay": "0",
-        "time.range": ["-2m", "0"]
+        "time.range": ["-2m", "0"],
+        "init.clear": true
       }
     }
   ],

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/47ae1774/measure/src/test/resources/_completeness-streaming-griffindsl.json
----------------------------------------------------------------------
diff --git a/measure/src/test/resources/_completeness-streaming-griffindsl.json 
b/measure/src/test/resources/_completeness-streaming-griffindsl.json
index df1b889..ba8bdce 100644
--- a/measure/src/test/resources/_completeness-streaming-griffindsl.json
+++ b/measure/src/test/resources/_completeness-streaming-griffindsl.json
@@ -39,11 +39,12 @@
         }
       ],
       "cache": {
-        "file.path": "hdfs://localhost/griffin/streaming/dump/old",
-        "info.path": "old",
+        "file.path": "hdfs://localhost/griffin/streaming/dump/source",
+        "info.path": "source",
         "ready.time.interval": "10s",
         "ready.time.delay": "0",
-        "time.range": ["0", "0"]
+        "time.range": ["0", "0"],
+        "init.clear": true
       }
     }
   ],

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/47ae1774/measure/src/test/resources/_profiling-batch-griffindsl-hive.json
----------------------------------------------------------------------
diff --git a/measure/src/test/resources/_profiling-batch-griffindsl-hive.json 
b/measure/src/test/resources/_profiling-batch-griffindsl-hive.json
new file mode 100644
index 0000000..03b0405
--- /dev/null
+++ b/measure/src/test/resources/_profiling-batch-griffindsl-hive.json
@@ -0,0 +1,48 @@
+{
+  "name": "prof_batch",
+
+  "process.type": "batch",
+
+  "timestamp": 123456,
+
+  "data.sources": [
+    {
+      "name": "source",
+      "connectors": [
+        {
+          "type": "hive",
+          "version": "1.2",
+          "config": {
+            "database": "default",
+            "table.name": "s1"
+          }
+        }
+      ]
+    }
+  ],
+
+  "evaluate.rule": {
+    "rules": [
+      {
+        "dsl.type": "griffin-dsl",
+        "dq.type": "profiling",
+        "name": "prof",
+        "rule": "name, count(*) as cnt from source group by name",
+        "metric": {
+          "name": "name_group",
+          "collect.type": "array"
+        }
+      },
+      {
+        "dsl.type": "griffin-dsl",
+        "dq.type": "profiling",
+        "name": "grp",
+        "rule": "age, count(*) as cnt from source group by age order by cnt",
+        "metric": {
+          "name": "age_group",
+          "collect.type": "array"
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/47ae1774/measure/src/test/resources/_profiling-streaming-griffindsl.json
----------------------------------------------------------------------
diff --git a/measure/src/test/resources/_profiling-streaming-griffindsl.json 
b/measure/src/test/resources/_profiling-streaming-griffindsl.json
index e662897..b6feb5a 100644
--- a/measure/src/test/resources/_profiling-streaming-griffindsl.json
+++ b/measure/src/test/resources/_profiling-streaming-griffindsl.json
@@ -12,12 +12,12 @@
           "version": "0.8",
           "config": {
             "kafka.config": {
-              "bootstrap.servers": "10.149.247.156:9092",
+              "bootstrap.servers": "10.147.177.107:9092",
               "group.id": "group1",
               "auto.offset.reset": "smallest",
               "auto.commit.enable": "false"
             },
-            "topics": "sss",
+            "topics": "test",
             "key.type": "java.lang.String",
             "value.type": "java.lang.String"
           },
@@ -43,7 +43,8 @@
         "info.path": "source",
         "ready.time.interval": "10s",
         "ready.time.delay": "0",
-        "time.range": ["0", "0"]
+        "time.range": ["0", "0"],
+        "init.clear": true
       }
     }
   ],

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/47ae1774/measure/src/test/resources/env-streaming.json
----------------------------------------------------------------------
diff --git a/measure/src/test/resources/env-streaming.json 
b/measure/src/test/resources/env-streaming.json
index a01348f..08dd7ee 100644
--- a/measure/src/test/resources/env-streaming.json
+++ b/measure/src/test/resources/env-streaming.json
@@ -4,6 +4,7 @@
     "checkpoint.dir": "hdfs://localhost/test/griffin/cp",
     "batch.interval": "2s",
     "process.interval": "10s",
+    "init.clear": true,
     "config": {
       "spark.master": "local[*]",
       "spark.task.maxFailures": 5,

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/47ae1774/service/pom.xml
----------------------------------------------------------------------
diff --git a/service/pom.xml b/service/pom.xml
index e2d96ae..33677af 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -36,7 +36,7 @@ under the License.
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <hadoop.version>2.7.1</hadoop.version>
-        <hive.version>1.2.1</hive.version>
+        <hive.version>2.2.0</hive.version>
         <scala.version>2.10</scala.version>
         <spring.boot.version>1.5.1.RELEASE</spring.boot.version>
         <confluent.version>3.2.0</confluent.version>
@@ -73,6 +73,12 @@ under the License.
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -93,11 +99,6 @@ under the License.
             <artifactId>spring-aspects</artifactId>
         </dependency>
         <!--eclipse link-->
-        <!--<dependency>-->
-        <!--<groupId>javax.persistence</groupId>-->
-        <!--<artifactId>javax.persistence-api</artifactId>-->
-        <!--<version>2.2</version>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.jpa</artifactId>
@@ -132,8 +133,8 @@ under the License.
             <!--<scope>provided</scope>-->
             <exclusions>
                 <exclusion>
-                    <artifactId>servlet-api</artifactId>
                     <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -141,6 +142,24 @@ under the License.
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-metastore</artifactId>
             <version>${hive.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty.aggregate</groupId>
+                    <artifactId>jetty-all</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty.orbit</groupId>
+                    <artifactId>javax.servlet</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>de.ruedigermoeller</groupId>
+                    <artifactId>fst</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- to access confluent schema registry -->
@@ -246,7 +265,7 @@ under the License.
                 </executions>
                 <configuration>
                     <fork>true</fork>
-                    <layout>ZIP</layout>
+                    <layout>JAR</layout>
                     
<mainClass>org.apache.griffin.core.GriffinWebApplication</mainClass>
                 </configuration>
             </plugin>

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/47ae1774/service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
----------------------------------------------------------------------
diff --git 
a/service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java 
b/service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
index 8a4bfe2..e66c7f3 100644
--- a/service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
+++ b/service/src/main/java/org/apache/griffin/core/job/SparkSubmitJob.java
@@ -193,8 +193,11 @@ public class SparkSubmitJob implements Job {
 
     private void setPropConf() {
         Map<String, String> conf = new HashMap<>();
-        conf.put("spark.yarn.dist.files", 
livyConfProps.getProperty("spark.yarn.dist.files"));
-        livyConf.setConf(conf);
+        String v = livyConfProps.getProperty("spark.yarn.dist.files");
+        if (!StringUtils.isEmpty(v)) {
+            conf.put("spark.yarn.dist.files", v);
+            livyConf.setConf(conf);
+        }
     }
 
     private void saveJobInstance(JobDetail jd) throws SchedulerException, 
IOException {

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/47ae1774/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreProxy.java
----------------------------------------------------------------------
diff --git 
a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreProxy.java
 
b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreProxy.java
index f632f14..63fbc00 100644
--- 
a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreProxy.java
+++ 
b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreProxy.java
@@ -29,6 +29,10 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PreDestroy;
+import java.io.File;
+import java.net.URI;
+import java.net.URL;
+import java.security.CodeSource;
 
 @Component
 public class HiveMetaStoreProxy {
@@ -61,7 +65,7 @@ public class HiveMetaStoreProxy {
         hiveConf.setVar(HiveConf.ConfVars.HMSHANDLERINTERVAL, interval);
         try {
             client = new HiveMetaStoreClient(hiveConf);
-        } catch (MetaException e) {
+        } catch (Exception e) {
             LOGGER.error("Failed to connect hive metastore. {}", 
e.getMessage());
             client = null;
         }

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/47ae1774/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreServiceImpl.java
----------------------------------------------------------------------
diff --git 
a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreServiceImpl.java
 
b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreServiceImpl.java
index 8e265e0..b1c9d1a 100644
--- 
a/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreServiceImpl.java
+++ 
b/service/src/main/java/org/apache/griffin/core/metastore/hive/HiveMetaStoreServiceImpl.java
@@ -49,7 +49,7 @@ public class HiveMetaStoreServiceImpl implements 
HiveMetaStoreService {
     private static final Logger LOGGER = 
LoggerFactory.getLogger(HiveMetaStoreService.class);
 
     @Autowired
-    private HiveMetaStoreClient client;
+    private HiveMetaStoreClient client = null;
 
     @Value("${hive.metastore.dbname}")
     private String defaultDbName;
@@ -71,7 +71,7 @@ public class HiveMetaStoreServiceImpl implements 
HiveMetaStoreService {
                 return new ArrayList<>();
             }
             results = client.getAllDatabases();
-        } catch (MetaException e) {
+        } catch (Exception e) {
             reconnect();
             LOGGER.error("Can not get databases : {}", e.getMessage());
         }
@@ -185,7 +185,7 @@ public class HiveMetaStoreServiceImpl implements 
HiveMetaStoreService {
             singleThreadExecutor.execute(() -> {
                 try {
                     client.reconnect();
-                } catch (MetaException e) {
+                } catch (Exception e) {
                     LOGGER.error("reconnect to hive failed.");
                 }
             });

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/47ae1774/service/src/main/resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/service/src/main/resources/META-INF/LICENSE 
b/service/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index 03a3df7..0000000
--- a/service/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,414 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-
----------------------------------------------------
-
-The Apache Griffin Service module contains subcomponents in the source code
-release with separate copyright notices and license terms. Your use of
-the source code for the these subcomponents is subject to the terms and
-conditions of their respective licenses.
-
-----------------------------------------------
-Public Domain
-----------------------------------------------
-The following components are provided in Public Domain. See project link for 
details.
-
-     (Public Domain) AOP alliance (aopalliance:aopalliance:1.0 - 
http://aopalliance.sourceforge.net)
-     (Public Domain) XZ for Java (org.tukaani:xz:1.0 - 
http://tukaani.org/xz/java.html)
-
-----------------------------------------------
-JSON license
-----------------------------------------------
-The following components are provided under a JSON license. See project link 
for details.
-The text of each license is also included at licenses/JSON.
-
-     (The JSON License) JSON in Java (org.json:json:20140107 - 
https://github.com/douglascrockford/JSON-java)
-
-----------------------------------------------
-The PostgreSQL License
-----------------------------------------------
-The following components are provided under a PostgreSQL license. See project 
link for details.
-The text of each license is also included at licenses/PostgreSQL.
-
-     (The PostgreSQL License) PostgreSQL JDBC Driver - JDBC 4.1 
(org.postgresql:postgresql:9.4.1212.jre7 - 
https://github.com/pgjdbc/pgjdbc-parent-poms/pgjdbc-core-parent/pgjdbc-core-prevjre/postgresql)
-
-----------------------------------------------
-EPL license
-----------------------------------------------
-The following components are provided under a EPL license. See project link 
for details.
-The text of each license is also included at licenses/EPL.
-
-     (Eclipse Distribution License v. 1.0) (Eclipse Public License v1.0) Javax 
Persistence (org.eclipse.persistence:javax.persistence:2.1.0 - 
http://www.eclipse.org/eclipselink)
-     (Eclipse Distribution License v. 1.0) (Eclipse Public License v1.0) 
EclipseLink ANTLR (org.eclipse.persistence:org.eclipse.persistence.antlr:2.6.0 
- http://www.eclipse.org/eclipselink)
-     (Eclipse Distribution License v. 1.0) (Eclipse Public License v1.0) 
EclipseLink ASM (org.eclipse.persistence:org.eclipse.persistence.asm:2.6.0 - 
http://www.eclipse.org/eclipselink)
-     (Eclipse Distribution License v. 1.0) (Eclipse Public License v1.0) 
EclipseLink Core (org.eclipse.persistence:org.eclipse.persistence.core:2.6.0 - 
http://www.eclipse.org/eclipselink)
-     (Eclipse Distribution License v. 1.0) (Eclipse Public License v1.0) 
EclipseLink JPA (org.eclipse.persistence:org.eclipse.persistence.jpa:2.6.0 - 
http://www.eclipse.org/eclipselink)
-     (Eclipse Distribution License v. 1.0) (Eclipse Public License v1.0) 
EclipseLink Hermes JPQL Parser 
(org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:2.6.0 - 
http://www.eclipse.org/eclipselink)
-     (Eclipse Public License - v 1.0) (GNU Lesser General Public License) 
Logback Classic Module (ch.qos.logback:logback-classic:1.1.9 - 
http://logback.qos.ch/logback-classic)
-     (Eclipse Public License - v 1.0) (GNU Lesser General Public License) 
Logback Core Module (ch.qos.logback:logback-core:1.1.9 - 
http://logback.qos.ch/logback-core)
-     (MPL 2.0 or EPL 1.0) H2 Database Engine (com.h2database:h2:1.4.193 - 
http://www.h2database.com)
-     (Eclipse Public License - v 1.0) AspectJ weaver 
(org.aspectj:aspectjweaver:1.8.9 - http://www.aspectj.org)
-     (GNU LESSER GENERAL PUBLIC LICENSE)(Eclipse Public License) c3p0:JDBC 
DataSources/Resource Pools (c3p0:c3p0:0.9.1.1 - http://c3p0.sourceforge.net)
-
-----------------------------------------------
-CDDL licenses
-----------------------------------------------
-The following components are provided under a CDDL license. See project link 
for details.
-The text of each license is also included at licenses/CDDL-1.0 and 
licenses/CDDL-1.1.
-
-     (CDDL license) jsp-api (javax.servlet.jsp:jsp-api:2.1 - no url defined)
-     (CDDL-1.0 license) Java Transaction API (javax.transaction:jta:1.1 - 
http://java.sun.com/products/jta)
-     (CDDL 1.1) (GPL2 w/ CPE) jersey-client (com.sun.jersey:jersey-client:1.9 
- https://jersey.java.net/jersey-client/)
-     (CDDL 1.1) (GPL2 w/ CPE) jersey-core (com.sun.jersey:jersey-core:1.9 - 
https://jersey.java.net/jersey-core/)
-     (CDDL 1.1) (GPL2 w/ CPE) jersey-json (com.sun.jersey:jersey-json:1.9 - 
https://jersey.java.net/jersey-json/)
-     (CDDL 1.1) (GPL2 w/ CPE) jersey-server (com.sun.jersey:jersey-server:1.9 
- https://jersey.java.net/jersey-server/)
-     (CDDL 1.1) (GPL2 w/ CPE) jersey-guice 
(com.sun.jersey.contribs:jersey-guice:1.9 - 
https://jersey.java.net/jersey-contribs/jersey-guice/)
-     (CDDL 1.1) (GPL2 w/ CPE) JAXB RI (com.sun.xml.bind:jaxb-impl:2.2.3-1 - 
http://jaxb.java.net/)
-     (Common Development and Distribution License (CDDL) v1.0) JavaBeans 
Activation Framework (JAF) (javax.activation:activation:1.1 - 
http://java.sun.com/products/javabeans/jaf/index.jsp)
-     (CDDL + GPLv2 with classpath exception) javax.transaction API 
(javax.transaction:javax.transaction-api:1.2 - http://jta-spec.java.net)
-     (CDDL 1.1) (GPL2 w/ CPE) JAXB API bundle for GlassFish V3 
(javax.xml.bind:jaxb-api:2.2.2 - https://jaxb.dev.java.net/)
-     (COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0) (GNU 
General Public Library) Streaming API for XML (javax.xml.stream:stax-api:1.0-2 
- no url defined)
-
-----------------------------------------------
-BSD-style licenses
-----------------------------------------------
-The following components are provided under a BSD-style license. See project 
link for details.
-The text of each license is also included at licenses/BSD-3-Clause and 
licenses/BSD-2-Clause.
-
-     (BSD license) ASM Core (asm:asm:3.1 - http://asm.objectweb.org/asm/)
-     (BSD license) dom4j (dom4j:dom4j:1.6.1 - http://dom4j.org)
-     (BSD license) Antlr 3.4 Runtime (org.antlr:antlr-runtime:3.4 - 
http://www.antlr.org)
-     (BSD License) AntLR Parser Generator (antlr:antlr:2.7.7 - 
http://www.antlr.org/)
-     (New BSD License) Kryo (com.esotericsoftware.kryo:kryo:2.22 - 
http://code.google.com/p/kryo/)
-     (New BSD license) Protocol Buffer Java API 
(com.google.protobuf:protobuf-java:2.5.0 - http://code.google.com/p/protobuf)
-     (BSD) ParaNamer Core (com.thoughtworks.paranamer:paranamer:2.3 - 
http://paranamer.codehaus.org/paranamer)
-     (BSD licence) ANTLR StringTemplate (org.antlr:stringtemplate:3.2.1 - 
http://www.stringtemplate.org)
-     (The BSD 3-Clause License) leveldbjni-all 
(org.fusesource.leveldbjni:leveldbjni-all:1.8 - 
http://leveldbjni.fusesource.org/leveldbjni-all)
-     (BSD-like) Scala Library (org.scala-lang:scala-library:2.10.4 - 
http://www.scala-lang.org/)
-     (The BSD License) xmlenc Library (xmlenc:xmlenc:0.52 - 
http://xmlenc.sourceforge.net)
-
-----------------------------------------------
-MIT licenses
-----------------------------------------------
-The following components are provided under a MIT license. See project link 
for details.
-The text of each license is also included at licenses/MIT.
-
-     (MIT License) JCL 1.1.1 implemented over SLF4J 
(org.slf4j:jcl-over-slf4j:1.7.22 - http://www.slf4j.org)
-     (MIT License) JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:1.7.22 - 
http://www.slf4j.org)
-     (MIT License) SLF4J API Module (org.slf4j:slf4j-api:1.7.22 - 
http://www.slf4j.org)
-     (MIT License) SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.22 - 
http://www.slf4j.org)
-
-----------------------------------------------
-Apache License 2.0
-----------------------------------------------
-The following components are provided under a Apache License 2.0. See project 
link for details.
-
-     (The Apache Software License, Version 2.0) livy-api 
(com.cloudera.livy:livy-api:0.3.0 - http://livy.io/livy-api/)
-     (The Apache Software License, Version 2.0) livy-client-common 
(com.cloudera.livy:livy-client-common:0.3.0 - 
http://livy.io/livy-client-common/)
-     (The Apache Software License, Version 2.0) livy-core_2.10 
(com.cloudera.livy:livy-core_2.10:0.3.0 - 
http://livy.io/multi-scala-project-root/livy-core-parent/livy-core_2.10/)
-     (The Apache Software License, Version 2.0) ClassMate 
(com.fasterxml:classmate:1.3.3 - http://github.com/cowtowncoder/java-classmate)
-     (The Apache Software License, Version 2.0) Jackson-annotations 
(com.fasterxml.jackson.core:jackson-annotations:2.8.0 - 
http://github.com/FasterXML/jackson)
-     (The Apache Software License, Version 2.0) Jackson-core 
(com.fasterxml.jackson.core:jackson-core:2.8.6 - 
https://github.com/FasterXML/jackson-core)
-     (The Apache Software License, Version 2.0) jackson-databind 
(com.fasterxml.jackson.core:jackson-databind:2.6.3 - 
http://github.com/FasterXML/jackson)
-     (The Apache Software License, Version 2.0) FindBugs-jsr305 
(com.google.code.findbugs:jsr305:3.0.0 - http://findbugs.sourceforge.net/)
-     (Apache 2.0) Gson (com.google.code.gson:gson:2.8.0 - 
https://github.com/google/gson/gson)
-     (The Apache Software License, Version 2.0) Guava: Google Core Libraries 
for Java (com.google.guava:guava:14.0.1 - 
http://code.google.com/p/guava-libraries/guava)
-     (The Apache Software License, Version 2.0) Google Guice - Core Library 
(com.google.inject:guice:3.0 - http://code.google.com/p/google-guice/guice/)
-     (The Apache Software License, Version 2.0) Google Guice - Extensions - 
Servlet (com.google.inject.extensions:guice-servlet:3.0 - 
http://code.google.com/p/google-guice/extensions-parent/guice-servlet/)
-     (Apache v2) BoneCP :: Core Library (com.jolbox:bonecp:0.8.0.RELEASE - 
http://jolbox.com/bonecp)
-     (The Apache Software License, Version 2.0) Apache Parquet Hadoop Bundle 
(Incubating) (com.twitter:parquet-hadoop-bundle:1.6.0 - 
https://parquet.incubator.apache.org)
-     (Apache License, Version 2.0) Apache Commons BeanUtils 
(commons-beanutils:commons-beanutils:1.9.3 - 
https://commons.apache.org/proper/commons-beanutils/)
-     (The Apache Software License, Version 2.0) Commons BeanUtils Core 
(commons-beanutils:commons-beanutils-core:1.8.0 - 
http://commons.apache.org/beanutils/)
-     (The Apache Software License, Version 2.0) Commons CLI 
(commons-cli:commons-cli:1.2 - http://commons.apache.org/cli/)
-     (Apache License, Version 2.0) Apache Commons Codec 
(commons-codec:commons-codec:1.10 - 
http://commons.apache.org/proper/commons-codec/)
-     (Apache License, Version 2.0) Apache Commons Collections 
(commons-collections:commons-collections:3.2.2 - 
http://commons.apache.org/collections/)
-     (The Apache Software License, Version 2.0) Commons Configuration 
(commons-configuration:commons-configuration:1.6 - 
http://commons.apache.org/${pom.artifactId.substring(8)}/)
-     (The Apache Software License, Version 2.0) Commons DBCP 
(commons-dbcp:commons-dbcp:1.4 - http://commons.apache.org/dbcp/)
-     (The Apache Software License, Version 2.0) Commons Digester 
(commons-digester:commons-digester:2.1 - http://commons.apache.org/digester/)
-     (Apache License) HttpClient (commons-httpclient:commons-httpclient:3.1 - 
http://jakarta.apache.org/httpcomponents/httpclient-3.x/)
-     (The Apache Software License, Version 2.0) Commons IO 
(commons-io:commons-io:2.4 - http://commons.apache.org/io/)
-     (The Apache Software License, Version 2.0) Commons Lang 
(commons-lang:commons-lang:2.6 - http://commons.apache.org/lang/)
-     (The Apache Software License, Version 2.0) Commons Logging 
(commons-logging:commons-logging:1.1.3 - 
http://commons.apache.org/proper/commons-logging/)
-     (The Apache Software License, Version 2.0) Commons Net 
(commons-net:commons-net:3.1 - http://commons.apache.org/net/)
-     (The Apache Software License, Version 2.0) Commons Pool 
(commons-pool:commons-pool:1.6 - http://commons.apache.org/pool/)
-     (Apache License 2.0) kafka-schema-registry-client 
(io.confluent:kafka-schema-registry-client:3.2.0 - 
http://confluent.io/kafka-schema-registry-client)
-     (Apache License, Version 2.0) The Netty Project 
(io.netty:netty:3.7.0.Final - http://netty.io/)
-     (Apache License, Version 2.0) Netty/All-in-One 
(io.netty:netty-all:4.0.23.Final - http://netty.io/netty-all/)
-     (The Apache Software License, Version 2.0) javax.inject 
(javax.inject:javax.inject:1 - http://code.google.com/p/atinject/)
-     (Apache 2) JDO API (javax.jdo:jdo-api:3.0.1 - http://db.apache.org/jdo)
-     (The Apache Software License, Version 2.0) Bean Validation API 
(javax.validation:validation-api:1.1.0.Final - http://beanvalidation.org)
-     (Apache 2) Joda-Time (joda-time:joda-time:2.9.7 - 
http://www.joda.org/joda-time/)
-     (The Apache Software License, Version 2.0) Apache Extras™ for Apache 
log4j™. (log4j:apache-log4j-extras:1.2.17 - 
http://logging.apache.org/log4j/extras)
-     (The Apache Software License, Version 2.0) Apache Log4j 
(log4j:log4j:1.2.16 - http://logging.apache.org/log4j/1.2/)
-     (Apache 2) opencsv (net.sf.opencsv:opencsv:2.3 - http://opencsv.sf.net)
-     (The Apache Software License, Version 2.0) Apache Ant Core 
(org.apache.ant:ant:1.9.1 - http://ant.apache.org/)
-     (The Apache Software License, Version 2.0) Apache Ant Launcher 
(org.apache.ant:ant-launcher:1.9.1 - http://ant.apache.org/)
-     (The Apache Software License, Version 2.0) Apache Avro 
(org.apache.avro:avro:1.7.7 - http://avro.apache.org)
-     (The Apache Software License, Version 2.0) Commons Compress 
(org.apache.commons:commons-compress:1.4.1 - 
http://commons.apache.org/compress/)
-     (The Apache Software License, Version 2.0) Commons Math 
(org.apache.commons:commons-math3:3.1.1 - http://commons.apache.org/math/)
-     (The Apache Software License, Version 2.0) Curator Client 
(org.apache.curator:curator-client:2.7.1 - 
http://curator.apache.org/curator-client)
-     (The Apache Software License, Version 2.0) Curator Framework 
(org.apache.curator:curator-framework:2.7.1 - 
http://curator.apache.org/curator-framework)
-     (The Apache Software License, Version 2.0) Curator Recipes 
(org.apache.curator:curator-recipes:2.7.1 - 
http://curator.apache.org/curator-recipes)
-     (Apache 2) Apache Derby Database Engine and Embedded JDBC Driver 
(org.apache.derby:derby:10.13.1.1 - http://db.apache.org/derby/)
-     (Apache 2) Apache Derby Client JDBC Driver 
(org.apache.derby:derbyclient:10.14.1.0 - http://db.apache.org/derby/)
-     (The Apache Software License, Version 2.0) Apache Directory API ASN.1 API 
(org.apache.directory.api:api-asn1-api:1.0.0-M20 - 
http://directory.apache.org/api-parent/api-asn1-parent/api-asn1-api/)
-     (The Apache Software License, Version 2.0) Apache Directory LDAP API 
Utilities (org.apache.directory.api:api-util:1.0.0-M20 - 
http://directory.apache.org/api-parent/api-util/)
-     (The Apache Software License, Version 2.0) ApacheDS I18n 
(org.apache.directory.server:apacheds-i18n:2.0.0-M15 - 
http://directory.apache.org/apacheds/1.5/apacheds-i18n)
-     (The Apache Software License, Version 2.0) ApacheDS Protocol Kerberos 
Codec (org.apache.directory.server:apacheds-kerberos-codec:2.0.0-M15 - 
http://directory.apache.org/apacheds/1.5/apacheds-kerberos-codec)
-     (Apache License, Version 2.0) Apache Hadoop Annotations 
(org.apache.hadoop:hadoop-annotations:2.7.1 - no url defined)
-     (Apache License, Version 2.0) Apache Hadoop Auth 
(org.apache.hadoop:hadoop-auth:2.7.1 - no url defined)
-     (Apache License, Version 2.0) Apache Hadoop Client 
(org.apache.hadoop:hadoop-client:2.7.1 - no url defined)
-     (Apache License, Version 2.0) Apache Hadoop Common 
(org.apache.hadoop:hadoop-common:2.7.1 - no url defined)
-     (Apache License, Version 2.0) Apache Hadoop HDFS 
(org.apache.hadoop:hadoop-hdfs:2.7.1 - no url defined)
-     (Apache License, Version 2.0) hadoop-mapreduce-client-app 
(org.apache.hadoop:hadoop-mapreduce-client-app:2.7.1 - no url defined)
-     (Apache License, Version 2.0) hadoop-mapreduce-client-common 
(org.apache.hadoop:hadoop-mapreduce-client-common:2.7.1 - no url defined)
-     (Apache License, Version 2.0) hadoop-mapreduce-client-core 
(org.apache.hadoop:hadoop-mapreduce-client-core:2.7.1 - no url defined)
-     (Apache License, Version 2.0) hadoop-mapreduce-client-jobclient 
(org.apache.hadoop:hadoop-mapreduce-client-jobclient:2.7.1 - no url defined)
-     (Apache License, Version 2.0) hadoop-mapreduce-client-shuffle 
(org.apache.hadoop:hadoop-mapreduce-client-shuffle:2.7.1 - no url defined)
-     (Apache License, Version 2.0) hadoop-yarn-api 
(org.apache.hadoop:hadoop-yarn-api:2.7.1 - no url defined)
-     (Apache License, Version 2.0) hadoop-yarn-client 
(org.apache.hadoop:hadoop-yarn-client:2.7.1 - no url defined)
-     (Apache License, Version 2.0) hadoop-yarn-common 
(org.apache.hadoop:hadoop-yarn-common:2.7.1 - no url defined)
-     (The Apache Software License, Version 2.0) 
hadoop-yarn-server-applicationhistoryservice 
(org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice:2.6.0 - no url 
defined)
-     (Apache License, Version 2.0) hadoop-yarn-server-common 
(org.apache.hadoop:hadoop-yarn-server-common:2.7.1 - no url defined)
-     (The Apache Software License, Version 2.0) 
hadoop-yarn-server-resourcemanager 
(org.apache.hadoop:hadoop-yarn-server-resourcemanager:2.6.0 - no url defined)
-     (The Apache Software License, Version 2.0) hadoop-yarn-server-web-proxy 
(org.apache.hadoop:hadoop-yarn-server-web-proxy:2.6.0 - no url defined)
-     (The Apache Software License, Version 2.0) Hive Common 
(org.apache.hive:hive-common:1.2.1 - http://hive.apache.org/hive-common)
-     (The Apache Software License, Version 2.0) Hive Metastore 
(org.apache.hive:hive-metastore:1.2.1 - http://hive.apache.org/hive-metastore)
-     (The Apache Software License, Version 2.0) Hive Serde 
(org.apache.hive:hive-serde:1.2.1 - http://hive.apache.org/hive-serde)
-     (The Apache Software License, Version 2.0) Hive Shims 
(org.apache.hive:hive-shims:1.2.1 - http://hive.apache.org/hive-shims)
-     (The Apache Software License, Version 2.0) Hive Shims 0.20S 
(org.apache.hive.shims:hive-shims-0.20S:1.2.1 - 
http://hive.apache.org/hive-shims-0.20S)
-     (The Apache Software License, Version 2.0) Hive Shims 0.23 
(org.apache.hive.shims:hive-shims-0.23:1.2.1 - 
http://hive.apache.org/hive-shims-0.23)
-     (The Apache Software License, Version 2.0) Hive Shims Common 
(org.apache.hive.shims:hive-shims-common:1.2.1 - 
http://hive.apache.org/hive-shims-common)
-     (The Apache Software License, Version 2.0) Hive Shims Scheduler 
(org.apache.hive.shims:hive-shims-scheduler:1.2.1 - 
http://hive.apache.org/hive-shims-scheduler)
-     (The Apache Software License, Version 2.0) htrace-core 
(org.apache.htrace:htrace-core:3.1.0-incubating - 
http://incubator.apache.org/projects/htrace.html)
-     (Apache License, Version 2.0) Apache HttpAsyncClient 
(org.apache.httpcomponents:httpasyncclient:4.1.2 - 
http://hc.apache.org/httpcomponents-asyncclient)
-     (Apache License, Version 2.0) Apache HttpClient 
(org.apache.httpcomponents:httpclient:4.5.2 - 
http://hc.apache.org/httpcomponents-client)
-     (Apache License, Version 2.0) Apache HttpCore 
(org.apache.httpcomponents:httpcore:4.4.6 - 
http://hc.apache.org/httpcomponents-core-ga)
-     (Apache License, Version 2.0) Apache HttpCore NIO 
(org.apache.httpcomponents:httpcore-nio:4.4.5 - 
http://hc.apache.org/httpcomponents-core-ga)
-     (The Apache Software License, Version 2.0) Apache Thrift 
(org.apache.thrift:libfb303:0.9.2 - http://thrift.apache.org)
-     (The Apache Software License, Version 2.0) Apache Thrift 
(org.apache.thrift:libthrift:0.9.2 - http://thrift.apache.org)
-     (Apache License, Version 2.0) tomcat-jdbc 
(org.apache.tomcat:tomcat-jdbc:8.5.11 - http://tomcat.apache.org/)
-     (Apache License, Version 2.0) tomcat-juli 
(org.apache.tomcat:tomcat-juli:8.5.11 - http://tomcat.apache.org/)
-     (Apache License, Version 2.0) tomcat-embed-core 
(org.apache.tomcat.embed:tomcat-embed-core:8.5.11 - http://tomcat.apache.org/)
-     (Apache License, Version 2.0) tomcat-embed-el 
(org.apache.tomcat.embed:tomcat-embed-el:8.5.11 - http://tomcat.apache.org/)
-     (Apache License, Version 2.0) tomcat-embed-websocket 
(org.apache.tomcat.embed:tomcat-embed-websocket:8.5.11 - 
http://tomcat.apache.org/)
-     (The Apache Software License, Version 2.0) Jackson 
(org.codehaus.jackson:jackson-core-asl:1.9.13 - http://jackson.codehaus.org)
-     (The Apache Software License, Version 2.0) Data Mapper for Jackson 
(org.codehaus.jackson:jackson-mapper-asl:1.9.13 - http://jackson.codehaus.org)
-     (The Apache Software License, Version 2.0) DataNucleus JDO API plugin 
(org.datanucleus:datanucleus-api-jdo:3.2.6 - http://www.datanucleus.org)
-     (The Apache Software License, Version 2.0) DataNucleus Core 
(org.datanucleus:datanucleus-core:3.2.10 - http://www.datanucleus.org)
-     (The Apache Software License, Version 2.0) DataNucleus RDBMS 
(org.datanucleus:datanucleus-rdbms:3.2.9 - http://www.datanucleus.org)
-     (The Apache Software License, Version 2.0) rest 
(org.elasticsearch.client:elasticsearch-rest-client:6.0.1 - 
https://github.com/elastic/elasticsearch)
-     (Apache License, Version 2.0) Hibernate Validator Engine 
(org.hibernate:hibernate-validator:5.3.4.Final - 
http://hibernate.org/validator/hibernate-validator)
-     (Apache License 2.0) (LGPL 2.1) (MPL 1.1) Javassist 
(org.javassist:javassist:3.21.0-GA - http://www.javassist.org/)
-     (Apache License, Version 2.0) Java Annotation Indexer 
(org.jboss:jandex:2.0.0.Final - http://www.jboss.org/jandex)
-     (Apache License, version 2.0) JBoss Logging 3 
(org.jboss.logging:jboss-logging:3.3.0.Final - http://www.jboss.org)
-     (Apache Software License - Version 2.0) (Eclipse Public License - Version 
1.0) Jetty Server (org.mortbay.jetty:jetty:6.1.26 - 
http://www.eclipse.org/jetty/jetty-parent/project/modules/jetty)
-     (Apache Software License - Version 2.0) (Eclipse Public License - Version 
1.0) Jetty Utilities (org.mortbay.jetty:jetty-util:6.1.26 - 
http://www.eclipse.org/jetty/jetty-parent/project/jetty-util)
-     (The Apache Software License, Version 2.0) quartz 
(org.quartz-scheduler:quartz:2.2.2 - http://www.quartz-scheduler.org/quartz)
-     (The Apache Software License, Version 2.0) quartz-jobs 
(org.quartz-scheduler:quartz-jobs:2.2.2 - 
http://www.quartz-scheduler.org/quartz-jobs)
-     (Apache Software Licenses) Log4j Implemented Over SLF4J 
(org.slf4j:log4j-over-slf4j:1.7.22 - http://www.slf4j.org)
-     (The Apache Software License, Version 2.0) Spring AOP 
(org.springframework:spring-aop:4.3.6.RELEASE - 
https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring Aspects 
(org.springframework:spring-aspects:4.3.6.RELEASE - 
https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring Beans 
(org.springframework:spring-beans:4.3.6.RELEASE - 
https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring Context 
(org.springframework:spring-context:4.3.6.RELEASE - 
https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring Context Support 
(org.springframework:spring-context-support:4.3.6.RELEASE - 
https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring Core 
(org.springframework:spring-core:4.3.6.RELEASE - 
https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring Expression Language 
(SpEL) (org.springframework:spring-expression:4.3.6.RELEASE - 
https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring JDBC 
(org.springframework:spring-jdbc:4.3.6.RELEASE - 
https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring Object/Relational 
Mapping (org.springframework:spring-orm:4.3.6.RELEASE - 
https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring Transaction 
(org.springframework:spring-tx:4.3.6.RELEASE - 
https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring Web 
(org.springframework:spring-web:4.3.6.RELEASE - 
https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring Web MVC 
(org.springframework:spring-webmvc:4.3.6.RELEASE - 
https://github.com/spring-projects/spring-framework)
-     (Apache License, Version 2.0) Spring Boot 
(org.springframework.boot:spring-boot:1.5.1.RELEASE - 
http://projects.spring.io/spring-boot/)
-     (Apache License, Version 2.0) Spring Boot AutoConfigure 
(org.springframework.boot:spring-boot-autoconfigure:1.5.1.RELEASE - 
http://projects.spring.io/spring-boot/)
-     (Apache License, Version 2.0) Spring Boot Starter 
(org.springframework.boot:spring-boot-starter:1.5.1.RELEASE - 
http://projects.spring.io/spring-boot/)
-     (Apache License, Version 2.0) Spring Boot AOP Starter 
(org.springframework.boot:spring-boot-starter-aop:1.5.1.RELEASE - 
http://projects.spring.io/spring-boot/)
-     (Apache License, Version 2.0) Spring Boot Data JPA Starter 
(org.springframework.boot:spring-boot-starter-data-jpa:1.5.1.RELEASE - 
http://projects.spring.io/spring-boot/)
-     (Apache License, Version 2.0) Spring Boot JDBC Starter 
(org.springframework.boot:spring-boot-starter-jdbc:1.5.1.RELEASE - 
http://projects.spring.io/spring-boot/)
-     (Apache License, Version 2.0) Spring Boot Logging Starter 
(org.springframework.boot:spring-boot-starter-logging:1.5.1.RELEASE - 
http://projects.spring.io/spring-boot/)
-     (Apache License, Version 2.0) Spring Boot Tomcat Starter 
(org.springframework.boot:spring-boot-starter-tomcat:1.5.1.RELEASE - 
http://projects.spring.io/spring-boot/)
-     (Apache License, Version 2.0) Spring Boot Web Starter 
(org.springframework.boot:spring-boot-starter-web:1.5.1.RELEASE - 
http://projects.spring.io/spring-boot/)
-     (Apache License, Version 2.0) Spring Data Core 
(org.springframework.data:spring-data-commons:1.13.0.RELEASE - 
http://www.spring.io/spring-data/spring-data-commons)
-     (Apache License, Version 2.0) Spring Data JPA 
(org.springframework.data:spring-data-jpa:1.11.0.RELEASE - 
http://projects.spring.io/spring-data-jpa)
-     (Apache 2.0) Spring Retry 
(org.springframework.retry:spring-retry:1.2.0.RELEASE - 
http://www.springsource.org)
-     (The Apache Software License, Version 2.0) Snappy for Java 
(org.xerial.snappy:snappy-java:1.0.5 - http://github.com/xerial/snappy-java/)
-     (Apache License, Version 2.0) SnakeYAML (org.yaml:snakeyaml:1.17 - 
http://www.snakeyaml.org)
-     (The Apache Software License, Version 2.0) Xerces2 Java Parser 
(xerces:xercesImpl:2.9.1 - http://xerces.apache.org/xerces2-j)
-     (The Apache Software License, Version 2.0) (The SAX License) (The W3C 
License) XML Commons External Components XML APIs (xml-apis:xml-apis:1.4.01 - 
http://xml.apache.org/commons/components/external/)
-     (Apache 2.0) zookeeper (org.apache.zookeeper:zookeeper:3.4.6 - no url 
defined)
-     (Apache 2.0) Jettison (org.codehaus.jettison:jettison:1.1 - no url 
defined)
-     (GNU Lesser General Public License (LGPL), Version 2.1) (The Apache 
Software License, Version 2.0) JAX-RS provider for JSON content type 
(org.codehaus.jackson:jackson-jaxrs:1.9.13 - http://jackson.codehaus.org)
-     (GNU Lesser General Public License (LGPL), Version 2.1) (The Apache 
Software License, Version 2.0) Xml Compatibility extensions for Jackson 
(org.codehaus.jackson:jackson-xc:1.9.13 - http://jackson.codehaus.org)

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/47ae1774/service/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/service/src/main/resources/META-INF/NOTICE 
b/service/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 35c1b27..0000000
--- a/service/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,15 +0,0 @@
-Apache Griffin
-Copyright 2017-2018 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-================================================================
-Notice for Jackson
-
-See licenses/NOTICE-Jackson
-
-================================================================
-Notice for Tomcat
-
-See licenses/NOTICE-Tomcat
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/47ae1774/service/src/main/resources/hive-site.xml
----------------------------------------------------------------------
diff --git a/service/src/main/resources/hive-site.xml 
b/service/src/main/resources/hive-site.xml
new file mode 100644
index 0000000..1b0d65d
--- /dev/null
+++ b/service/src/main/resources/hive-site.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?><!--
+   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.
+--><configuration>
+    <!-- WARNING!!! This file is auto generated for documentation purposes 
ONLY! -->
+    <!-- WARNING!!! Any changes you make to this file will be ignored by Hive. 
  -->
+    <!-- WARNING!!! You must make your changes in hive-site.xml instead.       
  -->
+    <!-- Hive Execution Parameters -->
+    </configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/47ae1774/service/src/main/resources/hivemetastore-site.xml
----------------------------------------------------------------------
diff --git a/service/src/main/resources/hivemetastore-site.xml 
b/service/src/main/resources/hivemetastore-site.xml
new file mode 100644
index 0000000..a992e83
--- /dev/null
+++ b/service/src/main/resources/hivemetastore-site.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?><!--
+   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.
+--><configuration>
+    <!-- WARNING!!! This file is auto generated for documentation purposes 
ONLY! -->
+    <!-- WARNING!!! Any changes you make to this file will be ignored by Hive. 
  -->
+    <!-- WARNING!!! You must make your changes in hive-site.xml instead.       
  -->
+    <!-- Hive Execution Parameters -->
+</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/47ae1774/service/src/main/resources/hiveserver2-site.xml
----------------------------------------------------------------------
diff --git a/service/src/main/resources/hiveserver2-site.xml 
b/service/src/main/resources/hiveserver2-site.xml
new file mode 100644
index 0000000..a992e83
--- /dev/null
+++ b/service/src/main/resources/hiveserver2-site.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?><!--
+   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.
+--><configuration>
+    <!-- WARNING!!! This file is auto generated for documentation purposes 
ONLY! -->
+    <!-- WARNING!!! Any changes you make to this file will be ignored by Hive. 
  -->
+    <!-- WARNING!!! You must make your changes in hive-site.xml instead.       
  -->
+    <!-- Hive Execution Parameters -->
+</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/47ae1774/service/src/main/resources/sparkJob.properties
----------------------------------------------------------------------
diff --git a/service/src/main/resources/sparkJob.properties 
b/service/src/main/resources/sparkJob.properties
index 6323914..e52b59b 100644
--- a/service/src/main/resources/sparkJob.properties
+++ b/service/src/main/resources/sparkJob.properties
@@ -32,18 +32,14 @@ sparkJob.executorCores=1
 sparkJob.driverMemory=1g
 sparkJob.executorMemory=1g
 
-# shouldn't config in server, but in
-sparkJob.jars = hdfs:///livy/datanucleus-api-jdo-3.2.6.jar;\
-  hdfs:///livy/datanucleus-core-3.2.10.jar;\
-  hdfs:///livy/datanucleus-rdbms-3.2.9.jar
+# other dependent jars
+sparkJob.jars =
 
+# hive-site.xml location
 spark.yarn.dist.files = hdfs:///home/spark_conf/hive-site.xml
 
 # livy
-# livy.uri=http://10.9.246.187:8998/batches
 livy.uri=http://localhost:8998/batches
 
 # spark-admin
-# spark.uri=http://10.149.247.156:28088
-# spark.uri=http://10.9.246.187:8088
 spark.uri=http://localhost:8088
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/47ae1774/ui/LICENSE
----------------------------------------------------------------------
diff --git a/ui/LICENSE b/ui/LICENSE
deleted file mode 100644
index 2bf4bc2..0000000
--- a/ui/LICENSE
+++ /dev/null
@@ -1,310 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-
----------------------------------------------------
-
-The Apache Griffin UI module contains subcomponents in the source code
-release with separate copyright notices and license terms. Your use of
-the source code for the these subcomponents is subject to the terms and
-conditions of their respective licenses.
-
-This project includes the software: angular
-  Available at: https://angular.io
-  Version used: 4.4.4
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) 2014-2016 Google, Inc.
-
-This project includes the software: echarts
-  Available at: http://echarts.baidu.com
-  Version used: 3.7.0
-  Used under the following license: The BSD 3-Clause (New BSD) License 
(http://opensource.org/licenses/BSD-3-Clause)
-  Copyright (c) 2013, Baidu Inc.
-
-This project includes the software: Font Awesome (code)
-  Available at: http://fontawesome.io
-  Inclusive of: font-awesome/{css,scss,less}/*
-  Version used: 4.7.0
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) Dave Gandy (2016)
-
-This project includes the software: Font Awesome (fonts)
-  Available at: http://fontawesome.io
-  Inclusive of: font-awesome/fonts/*
-  Version used: 4.7.0
-  Used under the following license: SIL OFL 1.1 (http://scripts.sil.org/OFL)
-  See details in licenses/SIL-OFL-1.1
-  Copyright (c) Dave Gandy (2016)
-
-This project includes the software: requirejs
-  Available at: http://requirejs.org
-  Version used: 2.2.0
-  Used under the following license: The BSD 3-Clause (New BSD) License 
(http://opensource.org/licenses/BSD-3-Clause)
-  Copyright (c) 2010-2015, The Dojo Foundation
-
-This project includes the software: jQuery JavaScript Library
-  Available at: http://jquery.com
-  Developed by: The jQuery Foundation (http://jquery.org/)
-  Inclusive of: jquery.js
-  Version used: 3.2.1
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright 2018 The jQuery Foundation
-
-This project includes the software: angular2-multiselect-dropdown
-  Available at: http://cuppalabs.github.io/components/multiselectDropdown
-  Version used: 1.3.4
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) 2009-2017, Cuppa Labs. All rights reserved and copyrighted to 
Pradeep Kumar Terli.
-
-This project includes the software: angular2-toaster
-  Available at: https://github.com/Stabzs/Angular2-Toaster
-  Version used: 4.0.1
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) 2016-2017 Stabzs.
-
-This project includes the software: Twitter Bootstrap
-  Available at: https://getbootstrap.com
-  Version used: 3.3.7
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) 2011-2014 Twitter, Inc
-
-This project includes the software: Glyphicons 
Halflings(glyphicons-halflings-regular.*)
-  Available at: http://glyphicons.com
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-  Copyright (c) 2010 - 2016 Jan Kovarik
-
-This project includes the software: nouislider
-  Available at: https://refreshless.com/nouislider
-  Version used: 11.0.3
-  Used under the following license: WTFPL
-  See details in licenses/WTFPL
-
-This project includes the software: ng2-nouislider
-  Available at: http://tb.github.io/ng2-nouislider
-  Version used: 1.7.6
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-
-This project includes the software: angular-tree-component
-  Available at: https://angular2-tree.readme.io/docs
-  Version used: 4.1.0
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-
-This project includes the software: angular2-datatable
-  Available at: https://github.com/mariuszfoltak/angular2-datatable
-  Version used: 0.6.0
-  Used under the following license: Apache License, version 2.0 
(http://www.apache.org/licenses/LICENSE-2.0)
-  Copyright (c) Twitter, Inc. (2012)
-
-This project includes the software: rxjs
-  Available at: http://reactivex.io/rxjs
-  Version used: 5.4.2
-  Used under the following license: Apache License, version 2.0 
(http://www.apache.org/licenses/LICENSE-2.0)
-  Copyright (c) Twitter, Inc. (2012)
-
-This project includes the software: webpack
-  Available at: https://webpack.js.org
-  Version used: 3.5.4
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-
-This project includes the software: css-loader
-  Available at:  https://github.com/webpack-contrib/css-loader
-  Version used: 0.28.7
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-
-This project includes the software: lodash
-  Available at:  https://github.com/lodash/lodash
-  Version used: 4.17.4
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-
-This project includes the software: mobx-angular
-  Available at:  https://github.com/mobxjs/mobx-angular
-  Version used: 1.5.0
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-
-This project includes the software: mobx
-  Available at:  https://mobx.js.org/
-  Version used: 3.1.11
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-
-This project includes the software: style-loader
-  Available at:  https://github.com/webpack-contrib/style-loader
-  Version used: 0.13.2
-  Used under the following license: The MIT License 
(http://opensource.org/licenses/MIT)
-
-This project includes the software: tslib
-  Available at:  http://www.tslib.org/
-  Version used: 0.13.2
-  Used under the following license: Apache License, version 2.0 
(http://www.apache.org/licenses/LICENSE-2.0)
-  Copyright (c) Twitter, Inc. (2012)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/47ae1774/ui/NOTICE
----------------------------------------------------------------------
diff --git a/ui/NOTICE b/ui/NOTICE
deleted file mode 100644
index e511be3..0000000
--- a/ui/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Griffin
-Copyright 2017-2018 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/47ae1774/ui/angular/src/app/service/service.service.ts
----------------------------------------------------------------------
diff --git a/ui/angular/src/app/service/service.service.ts 
b/ui/angular/src/app/service/service.service.ts
index 96c69dc..dcbcfaf 100644
--- a/ui/angular/src/app/service/service.service.ts
+++ b/ui/angular/src/app/service/service.service.ts
@@ -109,4 +109,4 @@ export class ServiceService {
         this.BACKEND_SERVER + this.API_ROOT_PATH + "/notifications"
     }
   };
-}
\ No newline at end of file
+}


Reply via email to