metron-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmiklav...@apache.org
Subject [4/5] metron git commit: METRON-1614: Create job status abstraction (mmiklavc via mmiklavc) closes apache/metron#1108
Date Wed, 18 Jul 2018 21:48:44 GMT
http://git-wip-us.apache.org/repos/asf/metron/blob/dbbf6243/metron-platform/metron-api/src/main/java/org/apache/metron/pcapservice/RestTestingUtil.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-api/src/main/java/org/apache/metron/pcapservice/RestTestingUtil.java b/metron-platform/metron-api/src/main/java/org/apache/metron/pcapservice/RestTestingUtil.java
deleted file mode 100644
index ef31a2a..0000000
--- a/metron-platform/metron-api/src/main/java/org/apache/metron/pcapservice/RestTestingUtil.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.metron.pcapservice;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.client.RestTemplate;
-
-/**
- * The Class RestTestingUtil.
- */
-public class RestTestingUtil {
-  
-  /** The host name. */
-  public static String hostName = null;
-
-  /**
-   * Gets the pcaps by keys.
-   * 
-   * @param keys
-   *          the keys
-   * @return the pcaps by keys
-   */
-  @SuppressWarnings("unchecked")
-  private static void getPcapsByKeys(String keys) {
-    System.out
-        .println("**********************getPcapsByKeys ******************************************************************************************");
-    // 1.
-    String url = "http://" + hostName
-        + "/cisco-rest/pcapGetter/getPcapsByKeys?keys={keys}"
-        + "&includeReverseTraffic={includeReverseTraffic}"
-        + "&startTime={startTime}" + "&endTime={endTime}"
-        + "&maxResponseSize={maxResponseSize}";
-    // default values
-    String startTime = "-1";
-    String endTime = "-1";
-    String maxResponseSize = "6";
-    String includeReverseTraffic = "false";
-
-    @SuppressWarnings("rawtypes")
-    Map map = new HashMap();
-    map.put("keys", keys);
-    map.put("includeReverseTraffic", includeReverseTraffic);
-    map.put("startTime", startTime);
-    map.put("endTime", endTime);
-    map.put("maxResponseSize", maxResponseSize);
-
-    RestTemplate template = new RestTemplate();
-
-    // set headers and entity to send
-    HttpHeaders headers = new HttpHeaders();
-    headers.set("Accept", MediaType.APPLICATION_OCTET_STREAM_VALUE);
-    HttpEntity<Object> requestEntity = new HttpEntity<Object>(headers);
-
-    // 1.
-    ResponseEntity<byte[]> response1 = template.exchange(url, HttpMethod.GET,
-        requestEntity, byte[].class, map);
-    System.out
-        .println("----------------------------------------------------------------------------------------------------");
-    System.out
-        .format(
-            "getPcapsByKeys : request= <keys=%s; includeReverseTraffic=%s; startTime=%s; endTime=%s; maxResponseSize=%s> \n response= %s \n",
-            keys, includeReverseTraffic, startTime, endTime, maxResponseSize,
-            response1);
-    System.out
-        .println("----------------------------------------------------------------------------------------------------");
-    System.out.println();
-
-    // 2. with reverse traffic
-    includeReverseTraffic = "true";
-    map.put("includeReverseTraffic", includeReverseTraffic);
-    ResponseEntity<byte[]> response2 = template.exchange(url, HttpMethod.GET,
-        requestEntity, byte[].class, map);
-    System.out
-        .println("----------------------------------------------------------------------------------------------------");
-    System.out
-        .format(
-            "getPcapsByKeys : request= <keys=%s; includeReverseTraffic=%s; startTime=%s; endTime=%s; maxResponseSize=%s> \n response= %s \n",
-            keys, includeReverseTraffic, startTime, endTime, maxResponseSize,
-            response2);
-    System.out
-        .println("----------------------------------------------------------------------------------------------------");
-    System.out.println();
-
-    // 3.with time range
-    startTime = System.getProperty("startTime", "-1");
-    endTime = System.getProperty("endTime", "-1");
-    map.put("startTime", startTime);
-    map.put("endTime", endTime);
-    ResponseEntity<byte[]> response3 = template.exchange(url, HttpMethod.GET,
-        requestEntity, byte[].class, map);
-    System.out
-        .println("----------------------------------------------------------------------------------------------------");
-    System.out
-        .format(
-            "getPcapsByKeys : request= <keys=%s; includeReverseTraffic=%s; startTime=%s; endTime=%s; maxResponseSize=%s> \n response= %s \n",
-            keys, includeReverseTraffic, startTime, endTime, maxResponseSize,
-            response3);
-    System.out
-        .println("----------------------------------------------------------------------------------------------------");
-    System.out.println();
-
-    // 4.with maxResponseSize
-    maxResponseSize = System.getProperty("maxResponseSize", "6");
-    map.put("maxResponseSize", maxResponseSize);
-    ResponseEntity<byte[]> response4 = template.exchange(url, HttpMethod.GET,
-        requestEntity, byte[].class, map);
-    System.out
-        .println("----------------------------------------------------------------------------------------------------");
-    System.out
-        .format(
-            "getPcapsByKeys : request= <keys=%s; includeReverseTraffic=%s; startTime=%s; endTime=%s; maxResponseSize=%s> \n response= %s \n",
-            keys, includeReverseTraffic, startTime, endTime, maxResponseSize,
-            response4);
-    System.out
-        .println("----------------------------------------------------------------------------------------------------");
-    System.out.println();
-
-  }
-
-  /**
-   * Gets the pcaps by keys range.
-   * 
-   * @param startKey
-   *          the start key
-   * @param endKey
-   *          the end key
-   * @return the pcaps by keys range
-   */
-  @SuppressWarnings("unchecked")
-  private static void getPcapsByKeysRange(String startKey, String endKey) {
-    System.out
-        .println("**********************getPcapsByKeysRange ******************************************************************************************");
-    // 1.
-    String url = "http://" + hostName
-        + "/cisco-rest/pcapGetter/getPcapsByKeyRange?startKey={startKey}"
-        + "&endKey={endKey}" + "&startTime={startTime}" + "&endTime={endTime}"
-        + "&maxResponseSize={maxResponseSize}";
-    // default values
-    String startTime = "-1";
-    String endTime = "-1";
-    String maxResponseSize = "6";
-    @SuppressWarnings("rawtypes")
-    Map map = new HashMap();
-    map.put("startKey", startKey);
-    map.put("endKey", "endKey");
-    map.put("startTime", startTime);
-    map.put("endTime", endTime);
-    map.put("maxResponseSize", maxResponseSize);
-
-    RestTemplate template = new RestTemplate();
-
-    // set headers and entity to send
-    HttpHeaders headers = new HttpHeaders();
-    headers.set("Accept", MediaType.APPLICATION_OCTET_STREAM_VALUE);
-    HttpEntity<Object> requestEntity = new HttpEntity<Object>(headers);
-
-    // 1.
-    ResponseEntity<byte[]> response1 = template.exchange(url, HttpMethod.GET,
-        requestEntity, byte[].class, map);
-    System.out
-        .println("----------------------------------------------------------------------------------------------------");
-    System.out
-        .format(
-            "getPcapsByKeysRange : request= <startKey=%s; endKey=%s; startTime=%s; endTime=%s; maxResponseSize=%s> \n response= %s \n",
-            startKey, endKey, startTime, endTime, maxResponseSize, response1);
-    System.out
-        .println("----------------------------------------------------------------------------------------------------");
-    System.out.println();
-
-    // 2. with time range
-    startTime = System.getProperty("startTime", "-1");
-    endTime = System.getProperty("endTime", "-1");
-    map.put("startTime", startTime);
-    map.put("endTime", endTime);
-    ResponseEntity<byte[]> response2 = template.exchange(url, HttpMethod.GET,
-        requestEntity, byte[].class, map);
-    System.out
-        .println("----------------------------------------------------------------------------------------------------");
-    System.out
-        .format(
-            "getPcapsByKeysRange : request= <startKey=%s; endKey=%s; startTime=%s; endTime=%s; maxResponseSize=%s> \n response= %s \n",
-            startKey, endKey, startTime, endTime, maxResponseSize, response2);
-    System.out
-        .println("----------------------------------------------------------------------------------------------------");
-    System.out.println();
-
-    // 3. with maxResponseSize
-    maxResponseSize = System.getProperty("maxResponseSize", "6");
-    map.put("maxResponseSize", maxResponseSize);
-    ResponseEntity<byte[]> response3 = template.exchange(url, HttpMethod.GET,
-        requestEntity, byte[].class, map);
-    System.out
-        .println("----------------------------------------------------------------------------------------------------");
-    System.out
-        .format(
-            "getPcapsByKeysRange : request= <startKey=%s; endKey=%s; startTime=%s; endTime=%s; maxResponseSize=%s> \n response= %s \n",
-            startKey, endKey, startTime, endTime, maxResponseSize, response3);
-    System.out
-        .println("----------------------------------------------------------------------------------------------------");
-    System.out.println();
-
-  }
-
-  private static void getPcapsByIdentifiers(String srcIp, String dstIp, String protocol, String srcPort, String dstPort) {
-    System.out
-            .println("**********************getPcapsByKeysRange ******************************************************************************************");
-    // 1.
-    String url = "http://" + hostName
-            + "/pcapGetter/getPcapsByIdentifiers?srcIp={srcIp}"
-            + "&dstIp={dstIp}" + "&protocol={protocol}" + "&srcPort={srcPort}"
-            + "&dstPort={dstPort}";
-    // default values
-    String startTime = "-1";
-    String endTime = "-1";
-    String maxResponseSize = "6";
-    @SuppressWarnings("rawtypes")
-    Map map = new HashMap();
-    map.put("srcIp", srcIp);
-    map.put("dstIp", dstIp);
-    map.put("protocol", protocol);
-    map.put("srcPort", srcPort);
-    map.put("dstPort", dstPort);
-
-    RestTemplate template = new RestTemplate();
-
-    // set headers and entity to send
-    HttpHeaders headers = new HttpHeaders();
-    headers.set("Accept", MediaType.APPLICATION_OCTET_STREAM_VALUE);
-    HttpEntity<Object> requestEntity = new HttpEntity<Object>(headers);
-
-    // 1.
-    ResponseEntity<byte[]> response1 = template.exchange(url, HttpMethod.GET,
-            requestEntity, byte[].class, map);
-    System.out
-            .println("----------------------------------------------------------------------------------------------------");
-    System.out
-            .format(
-                    "getPcapsByIdentifiers : request= <srcIp=%s; dstIp=%s; protocol=%s; endTime=%s; srcPort=%s; dstPort=%s> \n response= %s \n",
-                    srcIp, dstIp, protocol, endTime, srcPort, dstPort, response1);
-    System.out
-            .println("----------------------------------------------------------------------------------------------------");
-    System.out.println();
-
-    // 2. with time range
-    startTime = System.getProperty("startTime", "-1");
-    endTime = System.getProperty("endTime", "-1");
-    map.put("startTime", startTime);
-    map.put("endTime", endTime);
-    ResponseEntity<byte[]> response2 = template.exchange(url, HttpMethod.GET,
-            requestEntity, byte[].class, map);
-    System.out
-            .println("----------------------------------------------------------------------------------------------------");
-    System.out
-            .format(
-                    "getPcapsByIdentifiers : request= <srcIp=%s; dstIp=%s; protocol=%s; endTime=%s; srcPort=%s; dstPort=%s> \n response= %s \n",
-                    srcIp, dstIp, protocol, endTime, srcPort, dstPort, response2);
-    System.out
-            .println("----------------------------------------------------------------------------------------------------");
-    System.out.println();
-
-    // 3. with maxResponseSize
-    maxResponseSize = System.getProperty("maxResponseSize", "6");
-    map.put("maxResponseSize", maxResponseSize);
-    ResponseEntity<byte[]> response3 = template.exchange(url, HttpMethod.GET,
-            requestEntity, byte[].class, map);
-    System.out
-            .println("----------------------------------------------------------------------------------------------------");
-    System.out
-            .format(
-                    "getPcapsByIdentifiers : request= <srcIp=%s; dstIp=%s; protocol=%s; endTime=%s; srcPort=%s; dstPort=%s> \n response= %s \n",
-                    srcIp, dstIp, protocol, endTime, srcPort, dstPort, response3);
-    System.out
-            .println("----------------------------------------------------------------------------------------------------");
-    System.out.println();
-
-  }
-
-  /**
-   * The main method.
-   * 
-   * @param args
-   *          the arguments
-   */
-  public static void main(String[] args) {
-
-    /*
-     * Run this program with system properties
-     * 
-     * -DhostName=mon.hw.com:8090
-     * -Dkeys=18800006-1800000b-06-0019-b39d,18800006-
-     * 1800000b-06-0050-5af6-64840-40785
-     * -DstartKey=18000002-18800002-06-0436-0019-2440-34545
-     * -DendKey=18000002-18800002-06-b773-0019-2840-34585
-     */
-
-    hostName = System.getProperty("hostName");
-
-    String keys = System.getProperty("keys");
-
-    String statyKey = System.getProperty("startKey");
-    String endKey = System.getProperty("endKey");
-
-    getPcapsByKeys(keys);
-    getPcapsByKeysRange(statyKey, endKey);
-
-  }
-}

http://git-wip-us.apache.org/repos/asf/metron/blob/dbbf6243/metron-platform/metron-api/src/main/java/org/apache/metron/pcapservice/rest/JettyServiceRunner.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-api/src/main/java/org/apache/metron/pcapservice/rest/JettyServiceRunner.java b/metron-platform/metron-api/src/main/java/org/apache/metron/pcapservice/rest/JettyServiceRunner.java
deleted file mode 100644
index 2a930b8..0000000
--- a/metron-platform/metron-api/src/main/java/org/apache/metron/pcapservice/rest/JettyServiceRunner.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.metron.pcapservice.rest;
-
-import org.apache.metron.pcapservice.PcapReceiverImplRestEasy;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.ws.rs.core.Application;
-
-
-public class JettyServiceRunner extends Application  {
-	
-
-	private static Set services = new HashSet(); 
-		
-	public  JettyServiceRunner() {     
-		// initialize restful services   
-		services.add(new PcapReceiverImplRestEasy());
-	}
-	@Override
-	public  Set getSingletons() {
-		return services;
-	}  
-	public  static Set getServices() {  
-		return services;
-	} 
-}

http://git-wip-us.apache.org/repos/asf/metron/blob/dbbf6243/metron-platform/metron-api/src/main/java/org/apache/metron/pcapservice/rest/PcapService.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-api/src/main/java/org/apache/metron/pcapservice/rest/PcapService.java b/metron-platform/metron-api/src/main/java/org/apache/metron/pcapservice/rest/PcapService.java
deleted file mode 100644
index d183d5d..0000000
--- a/metron-platform/metron-api/src/main/java/org/apache/metron/pcapservice/rest/PcapService.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.metron.pcapservice.rest;
-
-import java.io.IOException;
-import java.lang.invoke.MethodHandles;
-import org.apache.metron.api.helper.service.PcapServiceCli;
-import org.apache.metron.pcapservice.ConfigurationUtil;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-public class PcapService {
-  private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
-  public static void main(String[] args) throws IOException {
-    PcapServiceCli cli = new PcapServiceCli(args);
-    cli.parse();
-    ConfigurationUtil.setPcapOutputPath(cli.getPcapHdfsPath());
-    LOG.info("Pcap location set to {}", cli.getPcapHdfsPath());
-    ConfigurationUtil.setTempQueryOutputPath(cli.getQueryHdfsPath());
-    LOG.info("Query temp location set to {}", cli.getQueryHdfsPath());
-    Server server = new Server(cli.getPort());
-    ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
-    context.setContextPath("/");
-    ServletHolder h = new ServletHolder(new HttpServletDispatcher());
-    h.setInitParameter("javax.ws.rs.Application", "org.apache.metron.pcapservice.rest.JettyServiceRunner");
-    context.addServlet(h, "/*");
-    server.setHandler(context);
-    try {
-      server.start();
-      server.join();
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/metron/blob/dbbf6243/metron-platform/metron-api/src/main/resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/metron-platform/metron-api/src/main/resources/META-INF/LICENSE b/metron-platform/metron-api/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index 0541bd4..0000000
--- a/metron-platform/metron-api/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,605 +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.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-------------------------------------------------------------------------------------
-
-------------------------------------------------------------------------------------
-  BSD
-------------------------------------------------------------------------------------
-This product bundles asm 3.1, which is available under a "BSD Software License" license.  For details, see http://asm.ow2.org/
-This product bundles protobuf-java 2.5.0, which is available under a "BSD Software License" license.  For details, see http://code.google.com/p/protobuf
-This product bundles jsch 0.1.42, which is available under a "BSD Software License" license.  For details, see http://www.jcraft.com/jsch/
-This product bundles paranamer 2.3, which is available under a "BSD Software License" license.  For details, see https://github.com/paul-hammant/paranamer
-This product bundles leveldbjni-all 1.8, which is available under a "BSD Software License" license.  For details, see https://github.com/fusesource/leveldbjni
-This product bundles xmlenc 0.52, which is available under a "BSD Software License" license.  For details, see http://xmlenc.sourceforge.net
-
-This product contains a modified version of 'JZlib', a re-implementation of
-zlib in pure Java, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jzlib.txt (BSD Style License)
-  * HOMEPAGE:
-    * http://www.jcraft.com/jzlib/
-
-
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-------------------------------------------------------------------------------------
-  CDDLv1.1
-------------------------------------------------------------------------------------
-
-This product bundles jersey-guice 1.9, which is available under a "Common Development and Distribution License v1.1" license.  For details, see https://jersey.java.net/
-This product bundles jersey-client 1.9, which is available under a "Common Development and Distribution License v1.1" license.  For details, see https://jersey.java.net/
-This product bundles jersey-core 1.9, which is available under a "Common Development and Distribution License v1.1" license.  For details, see https://jersey.java.net/
-This product bundles jersey-json 1.9, which is available under a "Common Development and Distribution License v1.1" license.  For details, see https://jersey.java.net/
-This product bundles jersey-server 1.9, which is available under a "Common Development and Distribution License v1.1" license.  For details, see https://jersey.java.net/
-This product bundles jaxb-impl 2.2.5-2, which is available under a "Common Development and Distribution License" license.  For details, see http://jaxb.java.net/
-This product bundles activation 1.1, which is available under a "Common Development and Distribution License v1.0" license.  For details, see http://java.sun.com/products/javabeans/jaf/index.jsp
-This product bundles jsr250-api 1.0, which is available under a "Common Development and Distribution License v1.0" license.  For details, see http://jcp.org/aboutJava/communityprocess/final/jsr250/index.html
-This product bundles mail 1.4, which is available under a "Common Development and Distribution License v1.0" license.  For details, see https://glassfish.dev.java.net/javaee5/mail/
-This product bundles javax.servlet-api 3.1.0, which is available under a "Common Development and Distribution License" license.  For details, see http://servlet-spec.java.net
-This product bundles servlet-api 2.5, which is available under a "Common Development and Distribution License" license.  For details, see http://oracle.com
-This product bundles jaxb-api 2.2.2, which is available under a "Common Development and Distribution License" license.  For details, see https://jaxb.dev.java.net/
-This product bundles stax-api 1.0-2, which is available under a "Common Development and Distribution License v1.0" license.  For details, see https://docs.oracle.com/javase/7/docs/api/javax/xml/stream/package-summary.html
-
-OMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-      1. Definitions.
-            1.1. "Contributor" means each individual or entity that
-            creates or contributes to the creation of Modifications.
-            1.2. "Contributor Version" means the combination of the
-            Original Software, prior Modifications used by a
-            Contributor (if any), and the Modifications made by that
-            particular Contributor.
-            1.3. "Covered Software" means (a) the Original Software, or
-            (b) Modifications, or (c) the combination of files
-            containing Original Software with files containing
-            Modifications, in each case including portions thereof.
-            1.4. "Executable" means the Covered Software in any form
-            other than Source Code. 
-            1.5. "Initial Developer" means the individual or entity
-            that first makes Original Software available under this
-            License. 
-            1.6. "Larger Work" means a work which combines Covered
-            Software or portions thereof with code not governed by the
-            terms of this License.
-            1.7. "License" means this document.
-            1.8. "Licensable" means having the right to grant, to the
-            maximum extent possible, whether at the time of the initial
-            grant or subsequently acquired, any and all of the rights
-            conveyed herein.
-            1.9. "Modifications" means the Source Code and Executable
-            form of any of the following: 
-                  A. Any file that results from an addition to,
-                  deletion from or modification of the contents of a
-                  file containing Original Software or previous
-                  Modifications; 
-                  B. Any new file that contains any part of the
-                  Original Software or previous Modification; or 
-                  C. Any new file that is contributed or otherwise made
-                  available under the terms of this License.
-            1.10. "Original Software" means the Source Code and
-            Executable form of computer software code that is
-            originally released under this License. 
-            1.11. "Patent Claims" means any patent claim(s), now owned
-            or hereafter acquired, including without limitation,
-            method, process, and apparatus claims, in any patent
-            Licensable by grantor. 
-            1.12. "Source Code" means (a) the common form of computer
-            software code in which modifications are made and (b)
-            associated documentation included in or with such code.
-            1.13. "You" (or "Your") means an individual or a legal
-            entity exercising rights under, and complying with all of
-            the terms of, this License. For legal entities, "You"
-            includes any entity which controls, is controlled by, or is
-            under common control with You. For purposes of this
-            definition, "control" means (a) the power, direct or
-            indirect, to cause the direction or management of such
-            entity, whether by contract or otherwise, or (b) ownership
-            of more than fifty percent (50%) of the outstanding shares
-            or beneficial ownership of such entity.
-      2. License Grants. 
-            2.1. The Initial Developer Grant.
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, the
-            Initial Developer hereby grants You a world-wide,
-            royalty-free, non-exclusive license: 
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Initial Developer,
-                  to use, reproduce, modify, display, perform,
-                  sublicense and distribute the Original Software (or
-                  portions thereof), with or without Modifications,
-                  and/or as part of a Larger Work; and 
-                  (b) under Patent Claims infringed by the making,
-                  using or selling of Original Software, to make, have
-                  made, use, practice, sell, and offer for sale, and/or
-                  otherwise dispose of the Original Software (or
-                  portions thereof). 
-                  (c) The licenses granted in Sections 2.1(a) and (b)
-                  are effective on the date Initial Developer first
-                  distributes or otherwise makes the Original Software
-                  available to a third party under the terms of this
-                  License. 
-                  (d) Notwithstanding Section 2.1(b) above, no patent
-                  license is granted: (1) for code that You delete from
-                  the Original Software, or (2) for infringements
-                  caused by: (i) the modification of the Original
-                  Software, or (ii) the combination of the Original
-                  Software with other software or devices. 
-            2.2. Contributor Grant.
-            Conditioned upon Your compliance with Section 3.1 below and
-            subject to third party intellectual property claims, each
-            Contributor hereby grants You a world-wide, royalty-free,
-            non-exclusive license:
-                  (a) under intellectual property rights (other than
-                  patent or trademark) Licensable by Contributor to
-                  use, reproduce, modify, display, perform, sublicense
-                  and distribute the Modifications created by such
-                  Contributor (or portions thereof), either on an
-                  unmodified basis, with other Modifications, as
-                  Covered Software and/or as part of a Larger Work; and
-                  (b) under Patent Claims infringed by the making,
-                  using, or selling of Modifications made by that
-                  Contributor either alone and/or in combination with
-                  its Contributor Version (or portions of such
-                  combination), to make, use, sell, offer for sale,
-                  have made, and/or otherwise dispose of: (1)
-                  Modifications made by that Contributor (or portions
-                  thereof); and (2) the combination of Modifications
-                  made by that Contributor with its Contributor Version
-                  (or portions of such combination). 
-                  (c) The licenses granted in Sections 2.2(a) and
-                  2.2(b) are effective on the date Contributor first
-                  distributes or otherwise makes the Modifications
-                  available to a third party. 
-                  (d) Notwithstanding Section 2.2(b) above, no patent
-                  license is granted: (1) for any code that Contributor
-                  has deleted from the Contributor Version; (2) for
-                  infringements caused by: (i) third party
-                  modifications of Contributor Version, or (ii) the
-                  combination of Modifications made by that Contributor
-                  with other software (except as part of the
-                  Contributor Version) or other devices; or (3) under
-                  Patent Claims infringed by Covered Software in the
-                  absence of Modifications made by that Contributor. 
-      3. Distribution Obligations.
-            3.1. Availability of Source Code.
-            Any Covered Software that You distribute or otherwise make
-            available in Executable form must also be made available in
-            Source Code form and that Source Code form must be
-            distributed only under the terms of this License. You must
-            include a copy of this License with every copy of the
-            Source Code form of the Covered Software You distribute or
-            otherwise make available. You must inform recipients of any
-            such Covered Software in Executable form as to how they can
-            obtain such Covered Software in Source Code form in a
-            reasonable manner on or through a medium customarily used
-            for software exchange.
-            3.2. Modifications.
-            The Modifications that You create or to which You
-            contribute are governed by the terms of this License. You
-            represent that You believe Your Modifications are Your
-            original creation(s) and/or You have sufficient rights to
-            grant the rights conveyed by this License.
-            3.3. Required Notices.
-            You must include a notice in each of Your Modifications
-            that identifies You as the Contributor of the Modification.
-            You may not remove or alter any copyright, patent or
-            trademark notices contained within the Covered Software, or
-            any notices of licensing or any descriptive text giving
-            attribution to any Contributor or the Initial Developer.
-            3.4. Application of Additional Terms.
-            You may not offer or impose any terms on any Covered
-            Software in Source Code form that alters or restricts the
-            applicable version of this License or the recipients'
-            rights hereunder. You may choose to offer, and to charge a
-            fee for, warranty, support, indemnity or liability
-            obligations to one or more recipients of Covered Software.
-            However, you may do so only on Your own behalf, and not on
-            behalf of the Initial Developer or any Contributor. You
-            must make it absolutely clear that any such warranty,
-            support, indemnity or liability obligation is offered by
-            You alone, and You hereby agree to indemnify the Initial
-            Developer and every Contributor for any liability incurred
-            by the Initial Developer or such Contributor as a result of
-            warranty, support, indemnity or liability terms You offer.
-            3.5. Distribution of Executable Versions.
-            You may distribute the Executable form of the Covered
-            Software under the terms of this License or under the terms
-            of a license of Your choice, which may contain terms
-            different from this License, provided that You are in
-            compliance with the terms of this License and that the
-            license for the Executable form does not attempt to limit
-            or alter the recipient's rights in the Source Code form
-            from the rights set forth in this License. If You
-            distribute the Covered Software in Executable form under a
-            different license, You must make it absolutely clear that
-            any terms which differ from this License are offered by You
-            alone, not by the Initial Developer or Contributor. You
-            hereby agree to indemnify the Initial Developer and every
-            Contributor for any liability incurred by the Initial
-            Developer or such Contributor as a result of any such terms
-            You offer.
-            3.6. Larger Works.
-            You may create a Larger Work by combining Covered Software
-            with other code not governed by the terms of this License
-            and distribute the Larger Work as a single product. In such
-            a case, You must make sure the requirements of this License
-            are fulfilled for the Covered Software. 
-      4. Versions of the License. 
-            4.1. New Versions.
-            Sun Microsystems, Inc. is the initial license steward and
-            may publish revised and/or new versions of this License
-            from time to time. Each version will be given a
-            distinguishing version number. Except as provided in
-            Section 4.3, no one other than the license steward has the
-            right to modify this License. 
-            4.2. Effect of New Versions.
-            You may always continue to use, distribute or otherwise
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. If the Initial Developer includes a
-            notice in the Original Software prohibiting it from being
-            distributed or otherwise made available under any
-            subsequent version of the License, You must distribute and
-            make the Covered Software available under the terms of the
-            version of the License under which You originally received
-            the Covered Software. Otherwise, You may also choose to
-            use, distribute or otherwise make the Covered Software
-            available under the terms of any subsequent version of the
-            License published by the license steward. 
-            4.3. Modified Versions.
-            When You are an Initial Developer and You want to create a
-            new license for Your Original Software, You may create and
-            use a modified version of this License if You: (a) rename
-            the license and remove any references to the name of the
-            license steward (except to note that the license differs
-            from this License); and (b) otherwise make it clear that
-            the license contains terms which differ from this License.
-      5. DISCLAIMER OF WARRANTY.
-      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
-      BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-      INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
-      SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-      PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
-      PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
-      COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-      INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
-      ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
-      WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-      ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-      DISCLAIMER. 
-      6. TERMINATION. 
-            6.1. This License and the rights granted hereunder will
-            terminate automatically if You fail to comply with terms
-            herein and fail to cure such breach within 30 days of
-            becoming aware of the breach. Provisions which, by their
-            nature, must remain in effect beyond the termination of
-            this License shall survive.
-            6.2. If You assert a patent infringement claim (excluding
-            declaratory judgment actions) against Initial Developer or
-            a Contributor (the Initial Developer or Contributor against
-            whom You assert such claim is referred to as "Participant")
-            alleging that the Participant Software (meaning the
-            Contributor Version where the Participant is a Contributor
-            or the Original Software where the Participant is the
-            Initial Developer) directly or indirectly infringes any
-            patent, then any and all rights granted directly or
-            indirectly to You by such Participant, the Initial
-            Developer (if the Initial Developer is not the Participant)
-            and all Contributors under Sections 2.1 and/or 2.2 of this
-            License shall, upon 60 days notice from Participant
-            terminate prospectively and automatically at the expiration
-            of such 60 day notice period, unless if within such 60 day
-            period You withdraw Your claim with respect to the
-            Participant Software against such Participant either
-            unilaterally or pursuant to a written agreement with
-            Participant.
-            6.3. In the event of termination under Sections 6.1 or 6.2
-            above, all end user licenses that have been validly granted
-            by You or any distributor hereunder prior to termination
-            (excluding licenses granted to You by any distributor)
-            shall survive termination.
-      7. LIMITATION OF LIABILITY.
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-      (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-      INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-      COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
-      LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-      CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-      LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-      COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-      INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-      LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-      INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-      APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-      NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
-      APPLY TO YOU.
-      8. U.S. GOVERNMENT END USERS.
-      The Covered Software is a "commercial item," as that term is
-      defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-      computer software" (as that term is defined at 48 C.F.R. ¤
-      252.227-7014(a)(1)) and "commercial computer software
-      documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
-      1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
-      through 227.7202-4 (June 1995), all U.S. Government End Users
-      acquire Covered Software with only those rights set forth herein.
-      This U.S. Government Rights clause is in lieu of, and supersedes,
-      any other FAR, DFAR, or other clause or provision that addresses
-      Government rights in computer software under this License.
-      9. MISCELLANEOUS.
-      This License represents the complete agreement concerning subject
-      matter hereof. If any provision of this License is held to be
-      unenforceable, such provision shall be reformed only to the
-      extent necessary to make it enforceable. This License shall be
-      governed by the law of the jurisdiction specified in a notice
-      contained within the Original Software (except to the extent
-      applicable law, if any, provides otherwise), excluding such
-      jurisdiction's conflict-of-law provisions. Any litigation
-      relating to this License shall be subject to the jurisdiction of
-      the courts located in the jurisdiction and venue specified in a
-      notice contained within the Original Software, with the losing
-      party responsible for costs, including, without limitation, court
-      costs and reasonable attorneys' fees and expenses. The
-      application of the United Nations Convention on Contracts for the
-      International Sale of Goods is expressly excluded. Any law or
-      regulation which provides that the language of a contract shall
-      be construed against the drafter shall not apply to this License.
-      You agree that You alone are responsible for compliance with the
-      United States export administration regulations (and the export
-      control laws and regulation of any other countries) when You use,
-      distribute or otherwise make available any Covered Software.
-      10. RESPONSIBILITY FOR CLAIMS.
-      As between Initial Developer and the Contributors, each party is
-      responsible for claims and damages arising, directly or
-      indirectly, out of its utilization of rights under this License
-      and You agree to work with Initial Developer and Contributors to
-      distribute such responsibility on an equitable basis. Nothing
-      herein is intended or shall be deemed to constitute any admission
-      of liability.
-
-------------------------------------------------------------------------------------
-  MIT
-------------------------------------------------------------------------------------
-
-This product bundles slf4j-api 1.7.7, which is available under a "MIT Software License" license.  For details, see http://www.slf4j.org
-This product bundles slf4j-log4j12 1.7.7, which is available under a "MIT Software License" license.  For details, see http://www.slf4j.org
-This product bundles slf4j-simple 1.7.7, which is available under a "MIT Software License" license.  For details, see http://www.slf4j.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-------------------------------------------------------------------------------------
-  Public Domain
-------------------------------------------------------------------------------------
-
-This product contains the extensions to Java Collections Framework which has
-been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:
-
-  * LICENSE:
-    * license/LICENSE.jsr166y.txt (Public Domain)
-  * HOMEPAGE:
-    * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/
-    * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/
-
-This product contains a modified version of Robert Harder's Public Domain
-Base64 Encoder and Decoder, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.base64.txt (Public Domain)
-  * HOMEPAGE:
-    * http://iharder.sourceforge.net/current/java/base64/
-
-

http://git-wip-us.apache.org/repos/asf/metron/blob/dbbf6243/metron-platform/metron-api/src/main/resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/metron-platform/metron-api/src/main/resources/META-INF/NOTICE b/metron-platform/metron-api/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 63bf87a..0000000
--- a/metron-platform/metron-api/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,39 +0,0 @@
-
-metron-api
-Copyright 2006-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes software developed for Orekit by
-CS Systèmes d'Information (http://www.c-s.fr/)
-Copyright 2010-2012 CS Systèmes d'Information
-
-                            The Netty Project
-                            =================
-
-Please visit the Netty web site for more information:
-
-  * http://netty.io/
-
-Copyright 2011 The Netty Project
-
-This product includes software developed by
-Joda.org (http://www.joda.org/).
-
-Spring Framework 3.2.6.RELEASE
-Copyright (c) 2002-2013 Pivotal, Inc.
-
-Google Guice - Core Library
-Copyright 2006-2011 Google, Inc.
-
-Google Guice - Extensions - Servlet
-Copyright 2006-2011 Google, Inc.
-
-   Portions of this software were originally based on the following:
-     - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
-     - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
-     - voluntary contributions made by Paul Eng on behalf of the 
-       Apache Software Foundation that were originally developed at iClick, Inc.,
-       software copyright (c) 1999.
-

http://git-wip-us.apache.org/repos/asf/metron/blob/dbbf6243/metron-platform/metron-api/src/test/java/org/apache/metron/pcapservice/ConfigurationUtilTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-api/src/test/java/org/apache/metron/pcapservice/ConfigurationUtilTest.java b/metron-platform/metron-api/src/test/java/org/apache/metron/pcapservice/ConfigurationUtilTest.java
deleted file mode 100644
index 4ecb3a4..0000000
--- a/metron-platform/metron-api/src/test/java/org/apache/metron/pcapservice/ConfigurationUtilTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.metron.pcapservice;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-
-
-public class ConfigurationUtilTest {
-
-
-  @Test
-  public void test_getPcapOutputPath() {
-    ConfigurationUtil.setPcapOutputPath("/foo");
-    Assert.assertEquals(ConfigurationUtil.getPcapOutputPath(), "/foo");
-  }
-
-  /**
-   * Test_get max allowable results size unit.
-   */
-  @Test
-  public void test_getTempQueryDir() {
-    ConfigurationUtil.setTempQueryOutputPath("/tmp");
-    Assert.assertEquals(ConfigurationUtil.getTempQueryOutputPath(), "/tmp");
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/metron/blob/dbbf6243/metron-platform/metron-api/src/test/java/org/apache/metron/pcapservice/PcapReceiverImplRestEasyTest.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-api/src/test/java/org/apache/metron/pcapservice/PcapReceiverImplRestEasyTest.java b/metron-platform/metron-api/src/test/java/org/apache/metron/pcapservice/PcapReceiverImplRestEasyTest.java
deleted file mode 100644
index ea6db70..0000000
--- a/metron-platform/metron-api/src/test/java/org/apache/metron/pcapservice/PcapReceiverImplRestEasyTest.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.metron.pcapservice;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.metron.common.Constants;
-import org.apache.metron.common.hadoop.SequenceFileIterable;
-import org.apache.metron.common.utils.timestamp.TimestampConverters;
-import org.apache.metron.pcap.PcapHelper;
-import org.apache.metron.pcap.filter.PcapFilterConfigurator;
-import org.apache.metron.pcap.mr.PcapJob;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.util.EnumMap;
-import java.util.Map;
-
-public class PcapReceiverImplRestEasyTest {
-
-  public static class MockQueryHandler<R> extends PcapJob {
-    Path basePath;
-    Path baseOutputPath;
-    long beginNS;
-    long endNS;
-    R fields;
-    PcapFilterConfigurator<R> filterImpl;
-
-    @Override
-    public <T> SequenceFileIterable query(Path basePath
-            , Path baseOutputPath
-            , long beginNS
-            , long endNS
-            , int numReducers
-            , T fields
-            , Configuration conf
-            , FileSystem fs
-            , PcapFilterConfigurator<T> filterImpl
-    ) throws IOException, ClassNotFoundException, InterruptedException
-    {
-      this.basePath = basePath;
-      this.baseOutputPath = baseOutputPath;
-      this.beginNS = beginNS;
-      this.endNS = endNS;
-      this.fields = (R) fields;
-      this.filterImpl = (PcapFilterConfigurator<R>) filterImpl;
-      return null;
-    }
-  }
-
-  final MockQueryHandler<Map<String, String>> fixedQueryHandler = new MockQueryHandler<>();
-  final MockQueryHandler<String> queryQueryHandler = new MockQueryHandler<String>();
-  PcapReceiverImplRestEasy fixedRestEndpoint = new PcapReceiverImplRestEasy() {{
-    this.queryUtil = fixedQueryHandler;
-  }};
-  PcapReceiverImplRestEasy queryRestEndpoint = new PcapReceiverImplRestEasy() {{
-      this.queryUtil = queryQueryHandler;
-  }};
-
-  @Before
-  public void setup() throws Exception {
-    ConfigurationUtil.setPcapOutputPath("/output");
-    ConfigurationUtil.setTempQueryOutputPath("/tmp");
-  }
-
-  @Test
-  public void testNormalFixedPath() throws Exception {
-    String srcIp = "srcIp";
-    String dstIp = "dstIp";
-    String protocol = "protocol";
-    String srcPort = "80";
-    String dstPort = "100";
-    long startTime = 100;
-    long endTime = 1000;
-    String query = "`blah`";
-
-    {
-      boolean includeReverseTraffic = false;
-      fixedRestEndpoint.getPcapsByIdentifiers(srcIp, dstIp, protocol, srcPort, dstPort, startTime, endTime, 10, includeReverseTraffic, query, null);
-      Assert.assertEquals(new Path(ConfigurationUtil.getPcapOutputPath()), fixedQueryHandler.basePath);
-      Assert.assertEquals(new Path(ConfigurationUtil.getTempQueryOutputPath()), fixedQueryHandler.baseOutputPath);
-      Assert.assertEquals(srcIp, fixedQueryHandler.fields.get(Constants.Fields.SRC_ADDR.getName()));
-      Assert.assertEquals(dstIp, fixedQueryHandler.fields.get(Constants.Fields.DST_ADDR.getName()));
-      Assert.assertEquals(srcPort, fixedQueryHandler.fields.get(Constants.Fields.SRC_PORT.getName()));
-      Assert.assertEquals(dstPort, fixedQueryHandler.fields.get(Constants.Fields.DST_PORT.getName()));
-      Assert.assertEquals(TimestampConverters.MILLISECONDS.toNanoseconds(startTime), fixedQueryHandler.beginNS);
-      Assert.assertEquals(TimestampConverters.MILLISECONDS.toNanoseconds(endTime), fixedQueryHandler.endNS);
-      Assert.assertEquals(includeReverseTraffic, Boolean.parseBoolean(fixedQueryHandler.fields.get(Constants.Fields.INCLUDES_REVERSE_TRAFFIC.getName())));
-      Assert.assertEquals(query, fixedQueryHandler.fields.get(PcapHelper.PacketFields.PACKET_FILTER.getName()));
-    }
-    {
-      boolean includeReverseTraffic = true;
-      fixedRestEndpoint.getPcapsByIdentifiers(srcIp, dstIp, protocol, srcPort, dstPort, startTime, endTime, 10, includeReverseTraffic, query, null);
-      Assert.assertEquals(new Path(ConfigurationUtil.getPcapOutputPath()), fixedQueryHandler.basePath);
-      Assert.assertEquals(new Path(ConfigurationUtil.getTempQueryOutputPath()), fixedQueryHandler.baseOutputPath);
-      Assert.assertEquals(srcIp, fixedQueryHandler.fields.get(Constants.Fields.SRC_ADDR.getName()));
-      Assert.assertEquals(dstIp, fixedQueryHandler.fields.get(Constants.Fields.DST_ADDR.getName()));
-      Assert.assertEquals(srcPort, fixedQueryHandler.fields.get(Constants.Fields.SRC_PORT.getName()));
-      Assert.assertEquals(dstPort, fixedQueryHandler.fields.get(Constants.Fields.DST_PORT.getName()));
-      Assert.assertEquals(TimestampConverters.MILLISECONDS.toNanoseconds(startTime), fixedQueryHandler.beginNS);
-      Assert.assertEquals(TimestampConverters.MILLISECONDS.toNanoseconds(endTime), fixedQueryHandler.endNS);
-      Assert.assertEquals(includeReverseTraffic, Boolean.parseBoolean(fixedQueryHandler.fields.get(Constants.Fields.INCLUDES_REVERSE_TRAFFIC.getName())));
-      Assert.assertEquals(query, fixedQueryHandler.fields.get(PcapHelper.PacketFields.PACKET_FILTER.getName()));
-    }
-  }
-
-  @Test
-  public void testNormalQueryPath() throws Exception {
-    long startTime = 100;
-    long endTime = 1000;
-    String query = "ip_src_addr == 'srcIp' and ip_src_port == '80' and ip_dst_addr == 'dstIp' and ip_dst_port == '100' and protocol == 'protocol'";
-    queryRestEndpoint.getPcapsByIdentifiers(query, startTime, endTime, 10,  null);
-    Assert.assertEquals(new Path(ConfigurationUtil.getPcapOutputPath()), queryQueryHandler.basePath);
-    Assert.assertEquals(new Path(ConfigurationUtil.getTempQueryOutputPath()), queryQueryHandler.baseOutputPath);
-    Assert.assertEquals(query, queryQueryHandler.fields);
-    Assert.assertEquals(TimestampConverters.MILLISECONDS.toNanoseconds(startTime), queryQueryHandler.beginNS);
-    Assert.assertEquals(TimestampConverters.MILLISECONDS.toNanoseconds(endTime), queryQueryHandler.endNS);
-  }
-
-  @Test
-  public void testNullSrcIp() throws Exception {
-    String srcIp = null;
-    String dstIp = "dstIp";
-    String protocol = "protocol";
-    String srcPort = "80";
-    String dstPort = "100";
-    long startTime = 100;
-    long endTime = 1000;
-    boolean includeReverseTraffic = false;
-    String query = "`metron`";
-    fixedRestEndpoint.getPcapsByIdentifiers(srcIp, dstIp, protocol, srcPort, dstPort, startTime, endTime, 10, includeReverseTraffic, query, null);
-    Assert.assertEquals(new Path(ConfigurationUtil.getPcapOutputPath()), fixedQueryHandler.basePath);
-    Assert.assertEquals(new Path(ConfigurationUtil.getTempQueryOutputPath()), fixedQueryHandler.baseOutputPath);
-    Assert.assertEquals(srcIp, fixedQueryHandler.fields.get(Constants.Fields.SRC_ADDR.getName()));
-    Assert.assertEquals(dstIp, fixedQueryHandler.fields.get(Constants.Fields.DST_ADDR.getName()));
-    Assert.assertEquals(srcPort, fixedQueryHandler.fields.get(Constants.Fields.SRC_PORT.getName()));
-    Assert.assertEquals(dstPort, fixedQueryHandler.fields.get(Constants.Fields.DST_PORT.getName()));
-    Assert.assertEquals(TimestampConverters.MILLISECONDS.toNanoseconds(startTime), fixedQueryHandler.beginNS);
-    Assert.assertEquals(TimestampConverters.MILLISECONDS.toNanoseconds(endTime), fixedQueryHandler.endNS);
-    Assert.assertEquals(includeReverseTraffic, Boolean.parseBoolean(fixedQueryHandler.fields.get(Constants.Fields.INCLUDES_REVERSE_TRAFFIC.getName())));
-    Assert.assertEquals(query, fixedQueryHandler.fields.get(PcapHelper.PacketFields.PACKET_FILTER.getName()));
-  }
-
-  @Test
-  public void testNullDstIp() throws Exception {
-    String srcIp = "srcIp";
-    String dstIp = null;
-    String protocol = "protocol";
-    String srcPort = "80";
-    String dstPort = "100";
-    long startTime = 100;
-    long endTime = 1000;
-    String query = null;
-    boolean includeReverseTraffic = false;
-    fixedRestEndpoint.getPcapsByIdentifiers(srcIp, dstIp, protocol, srcPort, dstPort, startTime, endTime, 10, includeReverseTraffic, query, null);
-    Assert.assertEquals(new Path(ConfigurationUtil.getPcapOutputPath()), fixedQueryHandler.basePath);
-    Assert.assertEquals(new Path(ConfigurationUtil.getTempQueryOutputPath()), fixedQueryHandler.baseOutputPath);
-    Assert.assertEquals(srcIp, fixedQueryHandler.fields.get(Constants.Fields.SRC_ADDR.getName()));
-    Assert.assertEquals(dstIp, fixedQueryHandler.fields.get(Constants.Fields.DST_ADDR.getName()));
-    Assert.assertEquals(srcPort, fixedQueryHandler.fields.get(Constants.Fields.SRC_PORT.getName()));
-    Assert.assertEquals(dstPort, fixedQueryHandler.fields.get(Constants.Fields.DST_PORT.getName()));
-    Assert.assertEquals(TimestampConverters.MILLISECONDS.toNanoseconds(startTime), fixedQueryHandler.beginNS);
-    Assert.assertEquals(TimestampConverters.MILLISECONDS.toNanoseconds(endTime), fixedQueryHandler.endNS);
-    Assert.assertEquals(includeReverseTraffic, Boolean.parseBoolean(fixedQueryHandler.fields.get(Constants.Fields.INCLUDES_REVERSE_TRAFFIC.getName())));
-    Assert.assertEquals(query, fixedQueryHandler.fields.get(PcapHelper.PacketFields.PACKET_FILTER.getName()));
-  }
-
-  @Test
-  public void testEmptyStartTime() throws Exception {
-    String srcIp = "srcIp";
-    String dstIp = "dstIp";
-    String protocol = "protocol";
-    String srcPort = "80";
-    String dstPort = "100";
-    long startTime = -1;
-    long endTime = 1000;
-    {
-      String query = "";
-      boolean includeReverseTraffic = false;
-      fixedRestEndpoint.getPcapsByIdentifiers(srcIp, dstIp, protocol, srcPort, dstPort, startTime, endTime, 10, includeReverseTraffic, query, null);
-      Assert.assertEquals(new Path(ConfigurationUtil.getPcapOutputPath()), fixedQueryHandler.basePath);
-      Assert.assertEquals(new Path(ConfigurationUtil.getTempQueryOutputPath()), fixedQueryHandler.baseOutputPath);
-      Assert.assertEquals(srcIp, fixedQueryHandler.fields.get(Constants.Fields.SRC_ADDR.getName()));
-      Assert.assertEquals(dstIp, fixedQueryHandler.fields.get(Constants.Fields.DST_ADDR.getName()));
-      Assert.assertEquals(srcPort, fixedQueryHandler.fields.get(Constants.Fields.SRC_PORT.getName() ));
-      Assert.assertEquals(dstPort, fixedQueryHandler.fields.get(Constants.Fields.DST_PORT.getName()));
-      Assert.assertEquals(0, fixedQueryHandler.beginNS);
-      Assert.assertEquals(TimestampConverters.MILLISECONDS.toNanoseconds(endTime), fixedQueryHandler.endNS);
-      Assert.assertEquals(includeReverseTraffic, Boolean.parseBoolean(fixedQueryHandler.fields.get(Constants.Fields.INCLUDES_REVERSE_TRAFFIC.getName())));
-      Assert.assertEquals(null, fixedQueryHandler.fields.get(PcapHelper.PacketFields.PACKET_FILTER.getName()));
-    }
-    {
-      String query = "ip_src_addr == 'srcIp' and ip_src_port == '80' and ip_dst_addr == 'dstIp' and ip_dst_port == '100' and protocol == 'protocol'";
-      queryRestEndpoint.getPcapsByIdentifiers(query, startTime, endTime, 10, null);
-      Assert.assertEquals(new Path(ConfigurationUtil.getPcapOutputPath()), queryQueryHandler.basePath);
-      Assert.assertEquals(new Path(ConfigurationUtil.getTempQueryOutputPath()), queryQueryHandler.baseOutputPath);
-      Assert.assertEquals(query, queryQueryHandler.fields);
-      Assert.assertEquals(0, queryQueryHandler.beginNS);
-      Assert.assertEquals(TimestampConverters.MILLISECONDS.toNanoseconds(endTime), queryQueryHandler.endNS);
-    }
-  }
-
-  @Test
-  public void testEmptyEndTime() throws Exception {
-    String srcIp = "srcIp";
-    String dstIp = "dstIp";
-    String protocol = "protocol";
-    String srcPort = "80";
-    String dstPort = "100";
-    long startTime = -1;
-    long endTime = -1;
-    {
-      boolean includeReverseTraffic = false;
-      fixedRestEndpoint.getPcapsByIdentifiers(srcIp, dstIp, protocol, srcPort, dstPort, startTime, endTime, 10, includeReverseTraffic, null, null);
-      Assert.assertEquals(new Path(ConfigurationUtil.getPcapOutputPath()), fixedQueryHandler.basePath);
-      Assert.assertEquals(new Path(ConfigurationUtil.getTempQueryOutputPath()), fixedQueryHandler.baseOutputPath);
-      Assert.assertEquals(srcIp, fixedQueryHandler.fields.get(Constants.Fields.SRC_ADDR.getName()));
-      Assert.assertEquals(dstIp, fixedQueryHandler.fields.get(Constants.Fields.DST_ADDR.getName()));
-      Assert.assertEquals(srcPort, fixedQueryHandler.fields.get(Constants.Fields.SRC_PORT.getName()));
-      Assert.assertEquals(dstPort, fixedQueryHandler.fields.get(Constants.Fields.DST_PORT.getName()));
-      Assert.assertEquals(0, fixedQueryHandler.beginNS);
-      Assert.assertTrue(fixedQueryHandler.endNS > 0);
-      Assert.assertEquals(includeReverseTraffic, Boolean.parseBoolean(fixedQueryHandler.fields.get(Constants.Fields.INCLUDES_REVERSE_TRAFFIC.getName())));
-    }
-    {
-      String query = "ip_src_addr == 'srcIp' and ip_src_port == '80' and ip_dst_addr == 'dstIp' and ip_dst_port == '100' and protocol == 'protocol'";
-      queryRestEndpoint.getPcapsByIdentifiers(query, startTime, endTime, 10, null);
-      Assert.assertEquals(new Path(ConfigurationUtil.getPcapOutputPath()), queryQueryHandler.basePath);
-      Assert.assertEquals(new Path(ConfigurationUtil.getTempQueryOutputPath()), queryQueryHandler.baseOutputPath);
-      Assert.assertEquals(query, queryQueryHandler.fields);
-      Assert.assertEquals(0, queryQueryHandler.beginNS);
-      Assert.assertTrue(queryQueryHandler.endNS > 0);
-    }
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/metron/blob/dbbf6243/metron-platform/metron-api/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/metron-platform/metron-api/src/test/resources/log4j.properties b/metron-platform/metron-api/src/test/resources/log4j.properties
deleted file mode 100644
index 0d50388..0000000
--- a/metron-platform/metron-api/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-# Root logger option
-log4j.rootLogger=ERROR, stdout
-
-# Direct log messages to stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n

http://git-wip-us.apache.org/repos/asf/metron/blob/dbbf6243/metron-platform/metron-api/src/test/resources/test-tcp-packet.pcap
----------------------------------------------------------------------
diff --git a/metron-platform/metron-api/src/test/resources/test-tcp-packet.pcap b/metron-platform/metron-api/src/test/resources/test-tcp-packet.pcap
deleted file mode 100644
index 25d47da..0000000
Binary files a/metron-platform/metron-api/src/test/resources/test-tcp-packet.pcap and /dev/null differ

http://git-wip-us.apache.org/repos/asf/metron/blob/dbbf6243/metron-platform/metron-common/src/main/java/org/apache/metron/common/configuration/ConfigOption.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/src/main/java/org/apache/metron/common/configuration/ConfigOption.java b/metron-platform/metron-common/src/main/java/org/apache/metron/common/configuration/ConfigOption.java
new file mode 100644
index 0000000..473664c
--- /dev/null
+++ b/metron-platform/metron-common/src/main/java/org/apache/metron/common/configuration/ConfigOption.java
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.metron.common.configuration;
+
+import java.util.Map;
+import java.util.function.BiFunction;
+
+public interface ConfigOption {
+  String getKey();
+  default BiFunction<String, Object, Object> transform() {
+    return (s,o) -> o;
+  }
+
+  default void put(Map<String, Object> map, Object value) {
+    map.put(getKey(), value);
+  }
+
+  default <T> T get(Map<String, Object> map, Class<T> clazz) {
+    return clazz.cast(map.get(getKey()));
+  }
+
+  default <T> T get(Map<String, Object> map, BiFunction<String, Object, T> transform, Class<T> clazz) {
+    return clazz.cast(map.get(getKey()));
+  }
+
+  default <T> T getTransformed(Map<String, Object> map, Class<T> clazz) {
+    return clazz.cast(transform().apply(getKey(), map.get(getKey())));
+  }
+}

http://git-wip-us.apache.org/repos/asf/metron/blob/dbbf6243/metron-platform/metron-common/src/main/java/org/apache/metron/common/utils/HDFSUtils.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-common/src/main/java/org/apache/metron/common/utils/HDFSUtils.java b/metron-platform/metron-common/src/main/java/org/apache/metron/common/utils/HDFSUtils.java
index ae09edf..31a4d0e 100644
--- a/metron-platform/metron-common/src/main/java/org/apache/metron/common/utils/HDFSUtils.java
+++ b/metron-platform/metron-common/src/main/java/org/apache/metron/common/utils/HDFSUtils.java
@@ -29,6 +29,17 @@ import org.apache.hadoop.fs.Path;
 
 public class HDFSUtils {
 
+  public static byte[] readBytes(String path) throws IOException {
+    return readBytes(new Path(path));
+  }
+
+  public static byte[] readBytes(Path inPath) throws IOException {
+    FileSystem fs = FileSystem.get(inPath.toUri(), new Configuration());
+    try (FSDataInputStream inputStream = fs.open(inPath)) {
+      return IOUtils.toByteArray(inputStream);
+    }
+  }
+
   /**
    * Reads full file contents into a List of Strings. Reads from local FS if file:/// used as the
    * scheme. Initializes file system with default configuration.
@@ -57,9 +68,10 @@ public class HDFSUtils {
    */
   public static List<String> readFile(Configuration config, String path) throws IOException {
     Path inPath = new Path(path);
-    FileSystem fs = FileSystem.newInstance(inPath.toUri(), config);
-    FSDataInputStream inputStream = fs.open(inPath);
-    return IOUtils.readLines(inputStream, "UTF-8");
+    FileSystem fs = FileSystem.get(inPath.toUri(), config);
+    try (FSDataInputStream inputStream = fs.open(inPath)) {
+      return IOUtils.readLines(inputStream, "UTF-8");
+    }
   }
 
   /**
@@ -74,7 +86,7 @@ public class HDFSUtils {
    */
   public static void write(Configuration config, byte[] bytes, String path) throws IOException {
     Path outPath = new Path(path);
-    FileSystem fs = FileSystem.newInstance(outPath.toUri(), config);
+    FileSystem fs = FileSystem.get(outPath.toUri(), config);
     fs.mkdirs(outPath.getParent());
     try (FSDataOutputStream outputStream = fs.create(outPath)) {
       outputStream.write(bytes);

http://git-wip-us.apache.org/repos/asf/metron/blob/dbbf6243/metron-platform/metron-job/README.md
----------------------------------------------------------------------
diff --git a/metron-platform/metron-job/README.md b/metron-platform/metron-job/README.md
new file mode 100644
index 0000000..19b006c
--- /dev/null
+++ b/metron-platform/metron-job/README.md
@@ -0,0 +1,26 @@
+<!--
+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.
+-->
+
+# Metron Job
+
+This module holds abstractions for creating jobs. The main actors are a JobManager interface and subsequent implementation, InMemoryJobManger, that handles maintaining a cache of running and completed Statusable jobs. Each Statusable
+can provide a Finalizer implementation that should be executed on completion of the underlying job. Successful jobs should return a Pageable object that allow consumers to request results on a per-page basis.
+
+## Job State Statechart
+
+![Job State Statechart](metron-job_state_statechart_diagram.svg)


Mime
View raw message