You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ce...@apache.org on 2015/12/17 21:46:12 UTC

[10/26] incubator-metron git commit: replace opensoc-steaming version 0.4BETA with 0.6BETA 8e7a6b4ad9febbc4ea47ba7810c42cc94d4dee37

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a919cc19/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/java/com/cisco/opensoc/hbase/client/PcapGetterHBaseImplTest.java
----------------------------------------------------------------------
diff --git a/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/java/com/cisco/opensoc/hbase/client/PcapGetterHBaseImplTest.java b/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/java/com/cisco/opensoc/hbase/client/PcapGetterHBaseImplTest.java
deleted file mode 100644
index ea49d9c..0000000
--- a/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/java/com/cisco/opensoc/hbase/client/PcapGetterHBaseImplTest.java
+++ /dev/null
@@ -1,536 +0,0 @@
-package com.cisco.opensoc.hbase.client;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.collections.ListUtils;
-import org.apache.commons.io.FileUtils;
-import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.Scan;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.springframework.util.Assert;
-
-import com.cisco.opensoc.hbase.client.PcapGetterHBaseImpl;
-import com.cisco.opensoc.hbase.client.PcapsResponse;
-
-/**
- * The Class PcapGetterHBaseImplTest.
- */
-public class PcapGetterHBaseImplTest {
-
-  /**
-   * Sets the up.
-   * 
-   * @throws Exception
-   *           the exception
-   */
-  @Before
-  public void setUp() throws Exception {
-  }
-
-  /**
-   * Tear down.
-   * 
-   * @throws Exception
-   *           the exception
-   */
-  @After
-  public void tearDown() throws Exception {
-  }
-
-  /**
-   * Test_get pcaps_with list.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @SuppressWarnings("unchecked")
-  @Test
-  public void test_getPcaps_withList() throws IOException {
-    // mocking
-    String[] keys = { "0a07002b-0a078039-06-1e8b-0087",
-        "0a070025-0a07807a-06-aab8-c360" };
-    PcapGetterHBaseImpl pcapGetter = (PcapGetterHBaseImpl) PcapGetterHBaseImpl
-        .getInstance();
-    PcapGetterHBaseImpl spy = Mockito.spy(pcapGetter);
-
-    List<byte[]> mockPcaps = new ArrayList<byte[]>();
-    mockPcaps.add(getTestPcapBytes());
-
-    // Mockito.doReturn(mockPcaps).when(spy).scanPcaps(Mockito.any(ArrayList.class),
-    // Mockito.any(HTable.class), Mockito.any(Scan.class),
-    // Mockito.any(byte[].class), Mockito.any(byte[].class));
-    //
-    //
-    // actual call
-    // PcapsResponse response = spy.getPcaps(Arrays.asList(keys));
-
-    // verify
-    // Assert.assertTrue(response.getResponseSize() == mockPcaps.get(0).length);
-  }
-
-  /**
-   * Test_get pcaps_with key.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @SuppressWarnings("unchecked")
-  @Test
-  public void test_getPcaps_withKey() throws IOException {
-    // mocking
-    String key = "0a07002b-0a078039-06-1e8b-0087";
-    PcapGetterHBaseImpl pcapGetter = (PcapGetterHBaseImpl) PcapGetterHBaseImpl
-        .getInstance();
-    PcapGetterHBaseImpl spy = Mockito.spy(pcapGetter);
-
-    List<byte[]> mockPcaps = new ArrayList<byte[]>();
-    mockPcaps.add(getTestPcapBytes());
-
-    // //
-    // Mockito.doReturn(mockPcaps).when(spy).scanPcaps(Mockito.any(ArrayList.class),
-    // Mockito.any(HTable.class), Mockito.any(Scan.class),
-    // Mockito.any(byte[].class), Mockito.any(byte[].class));
-    //
-
-    // actual call
-    // PcapsResponse response = spy.getPcaps(key);
-
-    // verify
-    // Assert.assertTrue(response.getResponseSize() == mockPcaps.get(0).length);
-  }
-
-  /**
-   * Test_get pcaps_with key and timestamps.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @SuppressWarnings("unchecked")
-  @Test
-  public void test_getPcaps_withKeyAndTimestamps() throws IOException {
-    // mocking
-    String key = "0a07002b-0a078039-06-1e8b-0087";
-    long startTime = 1376782349234555L;
-    long endTime = 1396782349234555L;
-    PcapGetterHBaseImpl pcapGetter = (PcapGetterHBaseImpl) PcapGetterHBaseImpl
-        .getInstance();
-    PcapGetterHBaseImpl spy = Mockito.spy(pcapGetter);
-
-    List<byte[]> mockPcaps = new ArrayList<byte[]>();
-    mockPcaps.add(getTestPcapBytes());
-
-    // Mockito.doReturn(mockPcaps).when(spy).scanPcaps(Mockito.any(ArrayList.class),
-    // Mockito.any(HTable.class), Mockito.any(Scan.class),
-    // Mockito.any(byte[].class), Mockito.any(byte[].class));
-
-    // actual call
-    // PcapsResponse response = spy.getPcaps(key, startTime, endTime, false);
-
-    // verify
-    // Assert.assertTrue(response.getResponseSize() == mockPcaps.get(0).length);
-  }
-
-  /**
-   * Test_get pcaps_with key_multiple pcaps.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @SuppressWarnings("unchecked")
-  @Test
-  public void test_getPcaps_withKey_multiplePcaps() throws IOException {
-    // mocking
-    String key = "0a07002b-0a078039-06-1e8b-0087";
-    PcapGetterHBaseImpl pcapGetter = (PcapGetterHBaseImpl) PcapGetterHBaseImpl
-        .getInstance();
-    PcapGetterHBaseImpl spy = Mockito.spy(pcapGetter);
-
-    List<byte[]> mockPcaps = new ArrayList<byte[]>();
-    mockPcaps.add(getTestPcapBytes());
-    mockPcaps.add(getTestPcapBytes());
-
-    /*
-     * Mockito.doReturn(mockPcaps).when(spy).scanPcaps(Mockito.any(ArrayList.class
-     * ), Mockito.any(HTable.class), Mockito.any(Scan.class),
-     * Mockito.any(byte[].class), Mockito.any(byte[].class));
-     */
-    // actual call
-    // PcapsResponse response = spy.getPcaps(key);
-
-    // verify
-    // Assert.assertNotNull(response);
-    // Assert.assertTrue(response.getResponseSize() > mockPcaps.get(0).length);
-  }
-
-  /**
-   * Gets the test pcap bytes.
-   * 
-   * @return the test pcap bytes
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  private byte[] getTestPcapBytes() throws IOException {
-    File fin = new File("src/test/resources/test-tcp-packet.pcap");
-    byte[] pcapBytes = FileUtils.readFileToByteArray(fin);
-    return pcapBytes;
-  }
-
-  /**
-   * Test_remove duplicates.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @Test
-  public void test_removeDuplicates() throws IOException {
-    PcapGetterHBaseImpl pcapGetter = (PcapGetterHBaseImpl) PcapGetterHBaseImpl
-        .getInstance();
-    List<String> keys = new ArrayList<String>();
-
-    keys.add("18800006-1800000b-06-0050-5af6");
-    keys.add("18800006-1800000b-11-0035-3810");
-    keys.add("18800006-1800000b-06-0019-caac");
-    keys.add("18800006-1800000b-06-0050-5af6");
-
-    List<String> deDupKeys = pcapGetter.removeDuplicateKeys(keys);
-    Assert.isTrue(deDupKeys.size() == 3);
-    List<String> testKeys = new ArrayList<String>();
-    keys.add("18800006-1800000b-06-0050-5af6");
-    keys.add("18800006-1800000b-11-0035-3810");
-    keys.add("18800006-1800000b-06-0019-caac");
-
-    ListUtils.isEqualList(deDupKeys, testKeys);
-  }
-
-  /**
-   * Test_sort keys by asc order_with out reverse traffic.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @Test
-  public void test_sortKeysByAscOrder_withOutReverseTraffic()
-      throws IOException {
-    PcapGetterHBaseImpl pcapGetter = (PcapGetterHBaseImpl) PcapGetterHBaseImpl
-        .getInstance();
-    List<String> keys = new ArrayList<String>();
-    keys.add("18800006-1800000b-11-0035-3810");
-    keys.add("18800006-1800000b-06-0050-5af6");
-    keys.add("18800006-1800000b-06-0019-caac");
-
-    List<String> result = pcapGetter.sortKeysByAscOrder(keys, false);
-
-    List<String> testKeys = new ArrayList<String>();
-    testKeys.add("18800006-1800000b-06-0019-caac");
-    testKeys.add("18800006-1800000b-06-0050-5af6");
-    testKeys.add("18800006-1800000b-11-0035-3810");
-
-    Assert.isTrue(ListUtils.isEqualList(result, testKeys));
-  }
-
-  /**
-   * Test_sort keys by asc order_with reverse traffic.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @Test
-  public void test_sortKeysByAscOrder_withReverseTraffic() throws IOException {
-    PcapGetterHBaseImpl pcapGetter = (PcapGetterHBaseImpl) PcapGetterHBaseImpl
-        .getInstance();
-    List<String> keys = new ArrayList<String>();
-    keys.add("18800006-1800000b-11-0035-3812");
-    keys.add("18800006-1800000b-11-0035-3810");
-    keys.add("18800006-1800000b-11-0035-3811");
-
-    List<String> result = pcapGetter.sortKeysByAscOrder(keys, true);
-    Assert.isTrue(result.size() == 6);
-  }
-
-  /**
-   * Test_sort keys by asc order_get unprocessed sublist of keys.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @Test
-  public void test_sortKeysByAscOrder_getUnprocessedSublistOfKeys()
-      throws IOException {
-    PcapGetterHBaseImpl pcapGetter = (PcapGetterHBaseImpl) PcapGetterHBaseImpl
-        .getInstance();
-    List<String> keys = new ArrayList<String>();
-    keys.add("18800006-1800000b-11-0035-3810");
-    keys.add("18800006-1800000b-06-0050-5af6");
-    keys.add("18800006-1800000b-06-0019-caac");
-    System.out.println("original keys =" + keys.toString());
-
-    List<String> sortedKeys = pcapGetter.sortKeysByAscOrder(keys, false);
-    System.out.println("after sortKeysByAscOrder =" + sortedKeys.toString());
-
-    List<String> unprocessedKeys1 = pcapGetter.getUnprocessedSublistOfKeys(
-        sortedKeys, "18800006-1800000b-06-0019-caac-65140-40815");
-    System.out.println("unprocessedKeys1 =" + unprocessedKeys1);
-    Assert.isTrue(unprocessedKeys1.size() == 2);
-
-    List<String> unprocessedKeys2 = pcapGetter.getUnprocessedSublistOfKeys(
-        sortedKeys, "18800006-1800000b-06-0050-5af6-65140-40815");
-    // System.out.println("unprocessedKeys2 ="+unprocessedKeys2);
-    Assert.isTrue(unprocessedKeys2.size() == 1);
-
-    List<String> unprocessedKeys3 = pcapGetter.getUnprocessedSublistOfKeys(
-        sortedKeys, "18800006-1800000b-11-0035-3810-6514040815");
-    // System.out.println("unprocessedKeys3 ="+unprocessedKeys3);
-    Assert.isTrue(unprocessedKeys3.size() == 0);
-
-  }
-
-  /**
-   * Test_sort keys by asc order_get unprocessed sublist of keys_with out match.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @Test
-  public void test_sortKeysByAscOrder_getUnprocessedSublistOfKeys_withOutMatch()
-      throws IOException {
-    PcapGetterHBaseImpl pcapGetter = (PcapGetterHBaseImpl) PcapGetterHBaseImpl
-        .getInstance();
-    List<String> keys = new ArrayList<String>();
-    keys.add("18800006-1800000b-11-0035-3810");
-    keys.add("18800006-1800000b-06-0050-5af6");
-    keys.add("18800006-1800000b-06-0019-caac");
-    System.out.println("original keys =" + keys.toString());
-
-    List<String> sortedKeys = pcapGetter.sortKeysByAscOrder(keys, false);
-    System.out.println("after sortKeysByAscOrder =" + sortedKeys.toString());
-
-    List<String> unprocessedKeys1 = pcapGetter.getUnprocessedSublistOfKeys(
-        sortedKeys, "18800006-1800000b-11-89-455-65140-40815");
-    System.out.println("unprocessedKeys1 =" + unprocessedKeys1);
-    Assert.isTrue(unprocessedKeys1.size() == 3);
-  }
-
-  /**
-   * Test_create start and stop row keys.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @Test
-  public void test_createStartAndStopRowKeys() throws IOException {
-    PcapGetterHBaseImpl pcapGetter = (PcapGetterHBaseImpl) PcapGetterHBaseImpl
-        .getInstance();
-    String key = "18800006-1800000b-11-0035-3810";
-    Map<String, String> map = pcapGetter.createStartAndStopRowKeys(key, false,
-        false);
-    System.out.println("map =" + map.toString());
-
-    String lastRowKey = "18800006-1800000b-11-0035-3810-23234-32423";
-    Map<String, String> map1 = pcapGetter.createStartAndStopRowKeys(
-        lastRowKey, true, false);
-    System.out.println("map1 =" + map1.toString());
-
-    String lastRowKey2 = "18800006-1800000b-11-0035-3810-23234-32423";
-    Map<String, String> map2 = pcapGetter.createStartAndStopRowKeys(
-        lastRowKey2, true, true);
-    System.out.println("map2 =" + map2.toString());
-
-  }
-
-  /**
-   * Test_check if valid input_valid.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @Test
-  public void test_checkIfValidInput_valid() throws IOException {
-    PcapGetterHBaseImpl pcapGetter = (PcapGetterHBaseImpl) PcapGetterHBaseImpl
-        .getInstance();
-    List<String> keys = new ArrayList<String>();
-    keys.add("18800006-1800000b-11-0035-3810");
-    keys.add("18800006-1800000b-06-0050-5af6");
-    keys.add("18800006-1800000b-06-0019-caac");
-
-    String lastRowKey = "18800006-1800000b-11-0035-3810-23234-32423";
-
-    boolean response = pcapGetter.checkIfValidInput(keys, lastRowKey);
-    Assert.isTrue(response);
-
-  }
-
-  /**
-   * Test_check if valid input_in valid.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @Test
-  public void test_checkIfValidInput_inValid() throws IOException {
-    PcapGetterHBaseImpl pcapGetter = (PcapGetterHBaseImpl) PcapGetterHBaseImpl
-        .getInstance();
-    @SuppressWarnings("unchecked")
-    boolean response = pcapGetter.checkIfValidInput(Collections.EMPTY_LIST,
-        null);
-    Assert.isTrue(!response);
-
-  }
-
-  /**
-   * Test_check if valid input_valid_mixed.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @Test
-  public void test_checkIfValidInput_valid_mixed() throws IOException {
-    PcapGetterHBaseImpl pcapGetter = (PcapGetterHBaseImpl) PcapGetterHBaseImpl
-        .getInstance();
-    String lastRowKey = "18800006-1800000b-11-0035-3810-23234-32423";
-    @SuppressWarnings("unchecked")
-    boolean response = pcapGetter.checkIfValidInput(Collections.EMPTY_LIST,
-        lastRowKey);
-    Assert.isTrue(response);
-  }
-
-  /**
-   * Test_create get request.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @Test
-  public void test_createGetRequest() throws IOException {
-    PcapGetterHBaseImpl pcapGetter = (PcapGetterHBaseImpl) PcapGetterHBaseImpl
-        .getInstance();
-    String key = "18800006-1800000b-11-0035-3810-23234-324230";
-
-    long startTime = 139812323L; // in seconds
-    long endTime = 139923424L; // in seconds
-
-    Get get = pcapGetter.createGetRequest(key, startTime, endTime);
-    Assert.notNull(get);
-
-    Assert.isTrue(Arrays.equals(get.getRow(), key.getBytes()));
-    // compare in micros as the data creation time unit is set to Micros in
-    // properties file.
-    Assert.isTrue(get.getTimeRange().getMin() == startTime * 1000 * 1000);
-    Assert.isTrue(get.getTimeRange().getMax() == endTime * 1000 * 1000);
-  }
-
-  /**
-   * Test_create get request_default time range.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @Test
-  public void test_createGetRequest_defaultTimeRange() throws IOException {
-    PcapGetterHBaseImpl pcapGetter = (PcapGetterHBaseImpl) PcapGetterHBaseImpl
-        .getInstance();
-    String key = "18800006-1800000b-11-0035-3810-23234-324230";
-
-    Get get = pcapGetter.createGetRequest(key, -1, -1);
-    Assert.notNull(get);
-
-    Assert.isTrue(Arrays.equals(get.getRow(), key.getBytes()));
-    Assert.isTrue(get.getTimeRange().getMin() == 0);
-  }
-
-  /**
-   * Test_create get request_with start time.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @Test
-  public void test_createGetRequest_withStartTime() throws IOException {
-    PcapGetterHBaseImpl pcapGetter = (PcapGetterHBaseImpl) PcapGetterHBaseImpl
-        .getInstance();
-    String key = "18800006-1800000b-11-0035-3810-23234-324230";
-
-    long startTime = 139812323L; // in seconds
-
-    Get get = pcapGetter.createGetRequest(key, startTime, -1);
-    Assert.notNull(get);
-
-    Assert.isTrue(Arrays.equals(get.getRow(), key.getBytes()));
-    Assert.isTrue(get.getTimeRange().getMin() == startTime * 1000 * 1000);
-    Assert.isTrue(get.getTimeRange().getMax() == Long.valueOf(Long.MAX_VALUE));
-  }
-
-  /**
-   * Test_create get request_with end time.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @Test
-  public void test_createGetRequest_withEndTime() throws IOException {
-    PcapGetterHBaseImpl pcapGetter = (PcapGetterHBaseImpl) PcapGetterHBaseImpl
-        .getInstance();
-    String key = "18800006-1800000b-11-0035-3810-23234-324230";
-
-    long endTime = 139923424L; // in seconds
-
-    Get get = pcapGetter.createGetRequest(key, -1, endTime);
-    Assert.notNull(get);
-
-    Assert.isTrue(Arrays.equals(get.getRow(), key.getBytes()));
-    Assert.isTrue(get.getTimeRange().getMin() == 0);
-    Assert.isTrue(get.getTimeRange().getMax() == endTime * 1000 * 1000);
-  }
-
-  /**
-   * Test_create scan request.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @Test
-  public void test_createScanRequest() throws IOException {
-    // mocking
-    PcapGetterHBaseImpl pcapGetter = (PcapGetterHBaseImpl) PcapGetterHBaseImpl
-        .getInstance();
-
-    PcapsResponse pcapsResponse = new PcapsResponse();
-
-    Map<String, String> keysMap = new HashMap<String, String>();
-    String startKey = "0a07002b-0a078039-06-1e8b-0087-00000-00000";
-    String endKey = "0a070025-0a07807a-06-aab8-c360-99999-99999";
-    keysMap.put("startKey", startKey);
-    keysMap.put("endKey", endKey);
-
-    long startTime = 139812323L; // in seconds
-    long endTime = 139923424L; // in seconds
-    long maxResultSize = 673424;
-
-    // actual call
-    Scan scan = pcapGetter.createScanRequest(pcapsResponse, keysMap, startTime,
-        endTime, maxResultSize);
-
-    // verify time range
-    Assert.isTrue(scan.getTimeRange().getMin() == startTime * 1000 * 1000); // compare
-                                                                            // in
-                                                                            // micros
-    Assert.isTrue(scan.getTimeRange().getMax() == endTime * 1000 * 1000); // compare
-                                                                          // in
-                                                                          // micros
-
-    // verify start and stop rows
-    Assert.isTrue(Arrays.equals(scan.getStartRow(), startKey.getBytes()));
-    Assert.isTrue(Arrays.equals(scan.getStopRow(), endKey.getBytes()));
-
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a919cc19/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/java/com/cisco/opensoc/hbase/client/PcapHelperTest.java
----------------------------------------------------------------------
diff --git a/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/java/com/cisco/opensoc/hbase/client/PcapHelperTest.java b/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/java/com/cisco/opensoc/hbase/client/PcapHelperTest.java
deleted file mode 100644
index 88392d1..0000000
--- a/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/java/com/cisco/opensoc/hbase/client/PcapHelperTest.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/**
- * 
- */
-package com.cisco.opensoc.hbase.client;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jdt.internal.core.Assert;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import com.cisco.opensoc.hbase.client.PcapHelper;
-import com.cisco.opensoc.hbase.client.PcapHelper.TimeUnit;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class PcapHelperTest.
- * 
- * @author Sayi
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(PcapHelper.class)
-public class PcapHelperTest {
-
-  /**
-   * Sets the up.
-   * 
-   * @throws Exception
-   *           the exception
-   */
-  @Before
-  public void setUp() throws Exception {
-    PowerMockito.spy(PcapHelper.class);
-  }
-
-  /**
-   * Tear down.
-   * 
-   * @throws Exception
-   *           the exception
-   */
-  @After
-  public void tearDown() throws Exception {
-  }
-
-  /**
-   * Input time is in SECONDS and data creation time is in SECONDS.
-   */
-  @Test
-  public void test_convertToDataCreationTimeUnit_seconds_seconds() {
-    PowerMockito.when(PcapHelper.getDataCreationTimeUnit()).thenReturn(
-        TimeUnit.SECONDS);
-    PowerMockito.verifyNoMoreInteractions();
-
-    long endTime = 1111122222L; // input time in seconds
-    long time = PcapHelper.convertToDataCreationTimeUnit(endTime);
-
-    Assert.isTrue(1111122222L == time);
-  }
-
-  /**
-   * Input time is in MILLIS and data creation time is in SECONDS.
-   */
-  @Test
-  public void test_convertToDataCreationTimeUnit_millis_seconds() {
-    PowerMockito.when(PcapHelper.getDataCreationTimeUnit()).thenReturn(
-        TimeUnit.SECONDS);
-    PowerMockito.verifyNoMoreInteractions();
-
-    long endTime = 1111122222333L; // input time in millis
-    long time = PcapHelper.convertToDataCreationTimeUnit(endTime);
-
-    Assert.isTrue(1111122222L == time);
-  }
-
-  /**
-   * Input time is in MICROS and data creation time is in SECONDS.
-   */
-  @Test
-  public void test_convertToDataCreationTimeUnit_micros_seconds() {
-    PowerMockito.when(PcapHelper.getDataCreationTimeUnit()).thenReturn(
-        TimeUnit.SECONDS);
-    PowerMockito.verifyNoMoreInteractions();
-
-    long endTime = 1111122222333444L; // input time in micros
-    long time = PcapHelper.convertToDataCreationTimeUnit(endTime);
-
-    Assert.isTrue(1111122222L == time);
-  }
-
-  /**
-   * Input time is in SECONDS and data creation time is in MILLIS.
-   */
-  @Test
-  public void test_convertToDataCreationTimeUnit_seconds_millis() {
-    PowerMockito.when(PcapHelper.getDataCreationTimeUnit()).thenReturn(
-        TimeUnit.MILLIS);
-    PowerMockito.verifyNoMoreInteractions();
-
-    long endTime = 1111122222L; // input time in seconds
-    long time = PcapHelper.convertToDataCreationTimeUnit(endTime);
-
-    Assert.isTrue(1111122222000L == time);
-  }
-
-  /**
-   * Input time is in MILLIS and data creation time is in MILLIS.
-   */
-  @Test
-  public void test_convertToDataCreationTimeUnit_millis_millis() {
-    PowerMockito.when(PcapHelper.getDataCreationTimeUnit()).thenReturn(
-        TimeUnit.MILLIS);
-    PowerMockito.verifyNoMoreInteractions();
-
-    long endTime = 111112222233L; // input time in millis
-    long time = PcapHelper.convertToDataCreationTimeUnit(endTime);
-
-    Assert.isTrue(111112222233L == time);
-  }
-
-  /**
-   * Input time is in MICROS and data creation time is in MILLIS.
-   */
-  @Test
-  public void test_convertToDataCreationTimeUnit_micros_millis() {
-    PowerMockito.when(PcapHelper.getDataCreationTimeUnit()).thenReturn(
-        TimeUnit.MILLIS);
-    PowerMockito.verifyNoMoreInteractions();
-
-    long endTime = 111112222233344L; // input time in micros
-    long time = PcapHelper.convertToDataCreationTimeUnit(endTime);
-
-    Assert.isTrue(111112222233L == time);
-  }
-
-  /**
-   * Input time is in SECONDS and data creation time is in MICROS.
-   */
-  @Test
-  public void test_convertToDataCreationTimeUnit_seconds_micros() {
-    PowerMockito.when(PcapHelper.getDataCreationTimeUnit()).thenReturn(
-        TimeUnit.MICROS);
-    PowerMockito.verifyNoMoreInteractions();
-
-    long endTime = 1111122222L; // input time in seconds
-    long time = PcapHelper.convertToDataCreationTimeUnit(endTime);
-
-    Assert.isTrue(1111122222000000L == time);
-  }
-
-  /**
-   * Input time is in SECONDS and data creation time is in MICROS.
-   */
-  @Test
-  public void test_convertToDataCreationTimeUnit_seconds_micros_random() {
-    PowerMockito.when(PcapHelper.getDataCreationTimeUnit()).thenReturn(
-        TimeUnit.MICROS);
-    PowerMockito.verifyNoMoreInteractions();
-
-    long endTime = 13388; // input time in seconds
-    long time = PcapHelper.convertToDataCreationTimeUnit(endTime);
-
-    Assert.isTrue(13388000000L == time);
-  }
-
-  /**
-   * Input time is in MILLIS and data creation time is in MICROS.
-   */
-  @Test
-  public void test_convertToDataCreationTimeUnit_millis_micros() {
-    PowerMockito.when(PcapHelper.getDataCreationTimeUnit()).thenReturn(
-        TimeUnit.MICROS);
-    PowerMockito.verifyNoMoreInteractions();
-
-    long endTime = 111112222233L; // input time in millis
-    long time = PcapHelper.convertToDataCreationTimeUnit(endTime);
-
-    Assert.isTrue(111112222233000L == time);
-  }
-
-  /**
-   * Input time is in MICROS and data creation time is in MICROS.
-   */
-  @Test
-  public void test_convertToDataCreationTimeUnit_micros_micros() {
-    PowerMockito.when(PcapHelper.getDataCreationTimeUnit()).thenReturn(
-        TimeUnit.MICROS);
-    PowerMockito.verifyNoMoreInteractions();
-
-    long endTime = 1111122222334444L; // input time in micros
-    long time = PcapHelper.convertToDataCreationTimeUnit(endTime);
-
-    Assert.isTrue(1111122222334444L == time);
-  }
-
-  /**
-   * Input time is in SECONDS and data creation time is in MICROS.
-   */
-  @Test
-  public void test_convertToDataCreationTimeUnit_seconds_micros_0() {
-    PowerMockito.when(PcapHelper.getDataCreationTimeUnit()).thenReturn(
-        TimeUnit.MICROS);
-    PowerMockito.verifyNoMoreInteractions();
-
-    long endTime = 0; // input time in micros
-    long time = PcapHelper.convertToDataCreationTimeUnit(endTime);
-
-    Assert.isTrue(0 == time);
-  }
-
-  /**
-   * Input time is in SECONDS and data creation time is in MICROS.
-   */
-  @Test
-  public void test_convertToDataCreationTimeUnit_seconds_micros_1() {
-    PowerMockito.when(PcapHelper.getDataCreationTimeUnit()).thenReturn(
-        TimeUnit.MICROS);
-    PowerMockito.verifyNoMoreInteractions();
-
-    long endTime = 1; // input time in micros
-    long time = PcapHelper.convertToDataCreationTimeUnit(endTime);
-
-    Assert.isTrue(1000000L == time);
-  }
-
-  /**
-   * Input time is in SECONDS and data creation time is in MICROS.
-   */
-  @Test
-  public void test_convertToDataCreationTimeUnit_seconds_micros_decimal() {
-    PowerMockito.when(PcapHelper.getDataCreationTimeUnit()).thenReturn(
-        TimeUnit.MICROS);
-    PowerMockito.verifyNoMoreInteractions();
-
-    long inputTime = 13; // input time in seconds (double to long type casting)
-    long time = PcapHelper.convertSecondsToDataCreationTimeUnit(inputTime);
-
-    Assert.isTrue(13000000L == time);
-  }
-
-  /**
-   * Input time is in SECONDS and data creation time is in MICROS.
-   */
-  @Test
-  public void test_convertToDataCreationTimeUnit_() {
-    PowerMockito.when(PcapHelper.getDataCreationTimeUnit()).thenReturn(
-        TimeUnit.MICROS);
-    PowerMockito.verifyNoMoreInteractions();
-
-    long endTime = (long) 111.333; // input time in seconds (double to long type
-                                   // casting)
-    long time = PcapHelper.convertToDataCreationTimeUnit(endTime);
-
-    Assert.isTrue(111000000L == time);
-  }
-
-  /**
-   * Test_get data creation time unit.
-   */
-  @Test
-  public void test_getDataCreationTimeUnit() {
-    TimeUnit dataCreationTimeUnit = PcapHelper.getDataCreationTimeUnit();
-    Assert.isTrue(TimeUnit.MICROS == dataCreationTimeUnit);
-  }
-
-  /**
-   * Test_reverse key_valid.
-   */
-  @Test
-  public void test_reverseKey_valid() {
-    String key = "162.242.152.24-162.242.153.12-TCP-38190-9092";
-    String reversekey = PcapHelper.reverseKey(key);
-    Assert.isTrue("162.242.153.12-162.242.152.24-TCP-9092-38190"
-        .equals(reversekey));
-  }
-
-  /**
-   * Test_reverse key_valid_with fragment.
-   */
-  @Test
-  public void test_reverseKey_valid_withFragment() {
-    String key = "162.242.152.24-162.242.153.12-TCP-38190-9092-fragmentId";
-    String reversekey = PcapHelper.reverseKey(key);
-    Assert.isTrue("162.242.153.12-162.242.152.24-TCP-9092-38190"
-        .equals(reversekey));
-  }
-
-  /**
-   * Test_reverse key_in valid.
-   */
-  @Test
-  public void test_reverseKey_inValid() {
-    String key = "162.242.152.24-162.242.153.12-TCP-38190-9092-ipId-fragmentId-extra";
-    String reversekey = PcapHelper.reverseKey(key);
-    Assert.isTrue("".equals(reversekey));
-  }
-
-  /**
-   * Test_reverse key_as list.
-   */
-  @Test
-  public void test_reverseKey_asList() {
-    String[] keys = {
-        "162.242.152.24-162.242.153.12-TCP-38190-9092-fragmentId",
-        "162.242.152.24-162.242.153.12-UDP-38190-9092" };
-
-    List<String> reverseKeys = PcapHelper.reverseKey(Arrays.asList(keys));
-
-    Assert.isTrue("162.242.153.12-162.242.152.24-TCP-9092-38190"
-        .equals(reverseKeys.get(0)));
-    Assert.isTrue("162.242.153.12-162.242.152.24-UDP-9092-38190"
-        .equals(reverseKeys.get(1)));
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a919cc19/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/java/com/cisco/opensoc/hbase/client/PcapReceiverImplTest.java
----------------------------------------------------------------------
diff --git a/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/java/com/cisco/opensoc/hbase/client/PcapReceiverImplTest.java b/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/java/com/cisco/opensoc/hbase/client/PcapReceiverImplTest.java
deleted file mode 100644
index f59bea6..0000000
--- a/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/java/com/cisco/opensoc/hbase/client/PcapReceiverImplTest.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/**
- * 
- */
-package com.cisco.opensoc.hbase.client;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.Assert;
-
-import com.cisco.opensoc.hbase.client.PcapGetterHBaseImpl;
-import com.cisco.opensoc.hbase.client.PcapReceiverImpl;
-import com.cisco.opensoc.hbase.client.PcapsResponse;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class PcapReceiverImplTest.
- * 
- * @author Sayi
- */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(PcapGetterHBaseImpl.class)
-public class PcapReceiverImplTest {
-
-  /** The pcap receiver. */
-  PcapReceiverImpl pcapReceiver = new PcapReceiverImpl();
-
-  /** The exception. */
-  @Rule
-  public ExpectedException exception = ExpectedException.none();
-
-  /**
-   * Sets the up.
-   * 
-   * @throws Exception
-   *           the exception
-   */
-  @Before
-  public void setUp() throws Exception {
-  }
-
-  /**
-   * Tear down.
-   * 
-   * @throws Exception
-   *           the exception
-   */
-  @After
-  public void tearDown() throws Exception {
-  }
-
-  /**
-   * Test parse keys_single.
-   */
-  @Test
-  public void testParseKeys_single() {
-    String[] keysArr = { "234234234,565675675" };
-    List<String> keysList = Arrays.asList(keysArr);
-    List<String> parsedKeys = pcapReceiver.parseKeys(keysList);
-    Assert.isTrue(parsedKeys.size() == 2);
-  }
-
-  /**
-   * Test parse keys_multiple.
-   */
-  @Test
-  public void testParseKeys_multiple() {
-    String[] keysArr = { "234234234,565675675", "675757,234242" };
-    List<String> keysList = Arrays.asList(keysArr);
-    List<String> parsedKeys = pcapReceiver.parseKeys(keysList);
-    Assert.isTrue(parsedKeys.size() == 4);
-  }
-
-  /**
-   * Test parse keys_empty.
-   */
-  @Test
-  public void testParseKeys_empty() {
-    exception.expect(IllegalArgumentException.class);
-    pcapReceiver.parseKeys(Collections.<String> emptyList());
-  }
-
-  /**
-   * Test parse keys_null.
-   */
-  @Test
-  public void testParseKeys_null() {
-    exception.expect(IllegalArgumentException.class);
-    pcapReceiver.parseKeys(null);
-  }
-
-  /**
-   * Test_get pcaps by keys_complete response.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @Test
-  public void test_getPcapsByKeys_completeResponse() throws IOException {
-    // mocking
-    String[] keysArry = { "0a07002b-0a078039-06-1e8b-0087",
-        "0a070025-0a07807a-06-aab8-c360" };
-    List<String> keys = Arrays.asList(keysArry);
-    String lastRowKey = null;
-    long startTime = 1376782349234555L;
-    long endTime = 1396782349234555L;
-    PcapsResponse response = new PcapsResponse();
-    response.setStatus(PcapsResponse.Status.COMPLETE);
-    List<byte[]> pcaps = new ArrayList<byte[]>();
-    byte[] pcap = { 12, 123 };
-    pcaps.add(pcap);
-    response.setPcaps(pcaps);
-
-    PcapGetterHBaseImpl pcapGetter = Mockito.mock(PcapGetterHBaseImpl.class);
-
-    PowerMockito.mockStatic(PcapGetterHBaseImpl.class);
-    PowerMockito.when(PcapGetterHBaseImpl.getInstance()).thenReturn(pcapGetter);
-    PowerMockito.when(
-        pcapGetter.getPcaps(keys, lastRowKey, startTime, endTime,
-            false, false, 6291456)).thenReturn(response);
-
-    PcapReceiverImpl restImpl = new PcapReceiverImpl();
-
-    // actual call
-    ResponseEntity<byte[]> result = restImpl.getPcapsByKeys(keys,
-        lastRowKey, startTime, endTime, false, false, null);
-
-    // verify
-    Assert.notNull(result);
-    Assert.notNull(result.getBody());
-    Assert.isTrue(result.getStatusCode() == HttpStatus.OK);
-    Assert.isTrue(result.getHeaders().size() == 1); // 'Content-Disposition'
-  }
-
-  /**
-   * Test_get pcaps by keys_partial response.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @Test
-  public void test_getPcapsByKeys_partialResponse() throws IOException {
-    // mocking
-    String[] keysArry = { "0a07002b-0a078039-06-1e8b-0087",
-        "0a070025-0a07807a-06-aab8-c360" };
-    List<String> keys = Arrays.asList(keysArry);
-    String lastRowKey = null;
-    long startTime = 1376782349234555L;
-    long endTime = 1396782349234555L;
-    PcapsResponse response = new PcapsResponse();
-    response.setStatus(PcapsResponse.Status.PARTIAL);
-    List<byte[]> pcaps = new ArrayList<byte[]>();
-    byte[] pcap = { 12, 123 };
-    pcaps.add(pcap);
-    response.setPcaps(pcaps);
-
-    PcapGetterHBaseImpl pcapGetter = Mockito.mock(PcapGetterHBaseImpl.class);
-
-    PowerMockito.mockStatic(PcapGetterHBaseImpl.class);
-    PowerMockito.when(PcapGetterHBaseImpl.getInstance()).thenReturn(pcapGetter);
-    PowerMockito.when(
-        pcapGetter.getPcaps(keys, lastRowKey, startTime, endTime,
-            false, false, 6291456)).thenReturn(response);
-
-    PcapReceiverImpl restImpl = new PcapReceiverImpl();
-
-    // actual call
-    ResponseEntity<byte[]> result = restImpl.getPcapsByKeys(keys,
-        lastRowKey, startTime, endTime, false, false, null);
-
-    // verify
-    Assert.notNull(result);
-    Assert.notNull(result.getBody());
-    Assert.isTrue(result.getStatusCode() == HttpStatus.PARTIAL_CONTENT);
-    Assert.isTrue(result.getHeaders().size() == 2); // 'lastRowKey',
-                                                    // 'Content-Disposition'
-  }
-
-  /**
-   * Test_get pcaps by keys_partial no content.
-   * 
-   * @throws IOException
-   *           Signals that an I/O exception has occurred.
-   */
-  @Test
-  public void test_getPcapsByKeys_partialNoContent() throws IOException {
-    // mocking
-    String[] keysArry = { "0a07002b-0a078039-06-1e8b-0087",
-        "0a070025-0a07807a-06-aab8-c360" };
-    List<String> keys = Arrays.asList(keysArry);
-    String lastRowKey = null;
-    long startTime = 1376782349234555L;
-    long endTime = 1396782349234555L;
-    PcapsResponse response = new PcapsResponse();
-
-    PcapGetterHBaseImpl pcapGetter = Mockito.mock(PcapGetterHBaseImpl.class);
-
-    PowerMockito.mockStatic(PcapGetterHBaseImpl.class);
-    PowerMockito.when(PcapGetterHBaseImpl.getInstance()).thenReturn(pcapGetter);
-    PowerMockito.when(
-        pcapGetter.getPcaps(keys, lastRowKey, startTime, endTime,
-            false, false, 6291456)).thenReturn(response);
-
-    PcapReceiverImpl restImpl = new PcapReceiverImpl();
-
-    // actual call
-    ResponseEntity<byte[]> result = restImpl.getPcapsByKeys(keys,
-        lastRowKey, startTime, endTime, false, false, null);
-
-    // verify
-    Assert.notNull(result);
-    Assert.isNull(result.getBody());
-    Assert.isTrue(result.getStatusCode() == HttpStatus.NO_CONTENT);
-    Assert.isTrue(result.getHeaders().isEmpty());
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a919cc19/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/java/com/cisco/opensoc/hbase/client/PcapScannerHBaseImplTest.java
----------------------------------------------------------------------
diff --git a/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/java/com/cisco/opensoc/hbase/client/PcapScannerHBaseImplTest.java b/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/java/com/cisco/opensoc/hbase/client/PcapScannerHBaseImplTest.java
deleted file mode 100644
index 46f365a..0000000
--- a/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/java/com/cisco/opensoc/hbase/client/PcapScannerHBaseImplTest.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package com.cisco.opensoc.hbase.client;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.hadoop.hbase.client.HTable;
-import org.apache.hadoop.hbase.client.Scan;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import com.cisco.opensoc.hbase.client.PcapScannerHBaseImpl;
-
-// TODO: Auto-generated Javadoc
-/**
- * The Class PcapScannerHBaseImplTest.
- */
-public class PcapScannerHBaseImplTest {
-
-  /**
-   * Sets the up.
-   * 
-   * @throws Exception
-   *           the exception
-   */
-  @Before
-  public void setUp() throws Exception {
-  }
-
-  /**
-   * Tear down.
-   * 
-   * @throws Exception
-   *           the exception
-   */
-  @After
-  public void tearDown() throws Exception {
-  }
-
-  /**
-   * Test_create scan request.
-   * 
-   * @throws IOException
-   *           the IO exception
-   */
-  @Test
-  public void test_createScanRequest() throws IOException {
-    // mocking
-    PcapScannerHBaseImpl pcapScanner = (PcapScannerHBaseImpl) PcapScannerHBaseImpl
-        .getInstance();
-    byte[] cf = "cf".getBytes();
-    byte[] cq = "pcap".getBytes();
-    String startKey = "0a07002b-0a078039-06-1e8b-0087";
-    String endKey = "0a070025-0a07807a-06-aab8-c360";
-    long maxResultSize = 60;
-    long startTime = 1376782349234555L;
-    long endTime = 1396782349234555L;
-
-    // actual call
-    Scan scan = pcapScanner.createScanRequest(cf, cq, startKey, endKey,
-        maxResultSize, -1, -1);
-
-    // verify
-    Assert.assertTrue(scan.getTimeRange().getMin() == 0);
-    Assert.assertTrue(Arrays.equals(scan.getStartRow(), startKey.getBytes()));
-    Assert.assertTrue(Arrays.equals(scan.getStopRow(), endKey.getBytes()));
-  }
-
-  /**
-   * Test_create scan request_with timestamps.
-   * 
-   * @throws IOException
-   *           the IO exception
-   */
-  @Test
-  public void test_createScanRequest_withTimestamps() throws IOException {
-    // mocking
-    PcapScannerHBaseImpl pcapScanner = (PcapScannerHBaseImpl) PcapScannerHBaseImpl
-        .getInstance();
-    byte[] cf = "cf".getBytes();
-    byte[] cq = "pcap".getBytes();
-    String startKey = "0a07002b-0a078039-06-1e8b-0087";
-    String endKey = "0a070025-0a07807a-06-aab8-c360";
-    long maxResultSize = 60;
-    long startTime = 1376782349234555L;
-    long endTime = 1396782349234555L;
-
-    // actual call
-    Scan scan = pcapScanner.createScanRequest(cf, cq, startKey, endKey,
-        maxResultSize, startTime, endTime);
-
-    // verify
-    Assert.assertTrue(scan.getTimeRange().getMin() == 1376782349234555L);
-    Assert.assertTrue(Arrays.equals(scan.getStartRow(), startKey.getBytes()));
-    Assert.assertTrue(Arrays.equals(scan.getStopRow(), endKey.getBytes()));
-  }
-
-  /**
-   * Test_get pcaps_with all arguments.
-   * 
-   * @throws IOException
-   *           the IO exception
-   */
-  @SuppressWarnings({ "unchecked", "unused" })
-  @Test
-  public void test_getPcaps_withAllArguments() throws IOException {
-    // mocking
-    PcapScannerHBaseImpl pcapScanner = (PcapScannerHBaseImpl) PcapScannerHBaseImpl
-        .getInstance();
-    PcapScannerHBaseImpl spy = Mockito.spy(pcapScanner);
-    byte[] cf = "cf".getBytes();
-    byte[] cq = "pcap".getBytes();
-    String startKey = "0a07002b-0a078039-06-1e8b-0087";
-    String endKey = "0a070025-0a07807a-06-aab8-c360";
-    long maxResultSize = 60;
-    long startTime = 1376782349234555L;
-    long endTime = 1396782349234555L;
-
-    List<byte[]> mockPcaps = new ArrayList<byte[]>();
-    mockPcaps.add(getTestPcapBytes());
-
-    Mockito
-        .doReturn(mockPcaps)
-        .when(spy)
-        .scanPcaps(Mockito.any(ArrayList.class), Mockito.any(HTable.class),
-            Mockito.any(Scan.class), Mockito.any(byte[].class),
-            Mockito.any(byte[].class));
-
-    // actual call
-    byte[] response = spy.getPcaps(startKey, endKey, maxResultSize, startTime,
-        endTime);
-
-    // verify
-    Assert.assertTrue(response.length == mockPcaps.get(0).length);
-  }
-
-  /**
-   * Test_get pcaps_with minimal arguments.
-   * 
-   * @throws IOException
-   *           the IO exception
-   */
-  @SuppressWarnings({ "unchecked", "unused" })
-  @Test
-  public void test_getPcaps_withMinimalArguments() throws IOException {
-    // mocking
-    PcapScannerHBaseImpl pcapScanner = (PcapScannerHBaseImpl) PcapScannerHBaseImpl
-        .getInstance();
-    PcapScannerHBaseImpl spy = Mockito.spy(pcapScanner);
-    byte[] cf = "cf".getBytes();
-    byte[] cq = "pcap".getBytes();
-    String startKey = "0a07002b-0a078039-06-1e8b-0087";
-    String endKey = "0a070025-0a07807a-06-aab8-c360";
-    long maxResultSize = 60;
-    long startTime = 1376782349234555L;
-    long endTime = 1396782349234555L;
-
-    List<byte[]> mockPcaps = new ArrayList<byte[]>();
-    mockPcaps.add(getTestPcapBytes());
-
-    Mockito
-        .doReturn(mockPcaps)
-        .when(spy)
-        .scanPcaps(Mockito.any(ArrayList.class), Mockito.any(HTable.class),
-            Mockito.any(Scan.class), Mockito.any(byte[].class),
-            Mockito.any(byte[].class));
-
-    // actual call
-    byte[] response = spy.getPcaps(startKey, endKey);
-
-    // verify
-    Assert.assertTrue(response.length == mockPcaps.get(0).length);
-  }
-
-  /**
-   * Test_get pcaps_multiple pcaps.
-   * 
-   * @throws IOException
-   *           the IO exception
-   */
-  @SuppressWarnings({ "unchecked", "unused" })
-  @Test
-  public void test_getPcaps_multiplePcaps() throws IOException {
-    // mocking
-    PcapScannerHBaseImpl pcapScanner = (PcapScannerHBaseImpl) PcapScannerHBaseImpl
-        .getInstance();
-    PcapScannerHBaseImpl spy = Mockito.spy(pcapScanner);
-    byte[] cf = "cf".getBytes();
-    byte[] cq = "pcap".getBytes();
-    String startKey = "0a07002b-0a078039-06-1e8b-0087";
-    String endKey = "0a070025-0a07807a-06-aab8-c360";
-    long maxResultSize = 60;
-    long startTime = 1376782349234555L;
-    long endTime = 1396782349234555L;
-
-    List<byte[]> mockPcaps = new ArrayList<byte[]>();
-    mockPcaps.add(getTestPcapBytes());
-    mockPcaps.add(getTestPcapBytes());
-
-    Mockito
-        .doReturn(mockPcaps)
-        .when(spy)
-        .scanPcaps(Mockito.any(ArrayList.class), Mockito.any(HTable.class),
-            Mockito.any(Scan.class), Mockito.any(byte[].class),
-            Mockito.any(byte[].class));
-
-    // actual call
-    byte[] response = spy.getPcaps(startKey, endKey);
-
-    // verify
-    Assert.assertNotNull(response);
-    Assert.assertTrue(response.length > mockPcaps.get(0).length);
-  }
-
-  /**
-   * Gets the test pcap bytes.
-   * 
-   * @return the test pcap bytes
-   * @throws IOException
-   *           the IO exception
-   */
-  private byte[] getTestPcapBytes() throws IOException {
-    File fin = new File("src/test/resources/test-tcp-packet.pcap");
-    byte[] pcapBytes = FileUtils.readFileToByteArray(fin);
-    return pcapBytes;
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a919cc19/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/resources/hbase-config.properties
----------------------------------------------------------------------
diff --git a/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/resources/hbase-config.properties b/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/resources/hbase-config.properties
deleted file mode 100644
index 0efd799..0000000
--- a/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/resources/hbase-config.properties
+++ /dev/null
@@ -1,40 +0,0 @@
-#hbase zoo keeper configuration
-hbase.zookeeper.quorum=dn1.hw.com,dn2.hw.com,dn3.hw.com
-hbase.zookeeper.clientPort=2181
-hbase.client.retries.number=1
-zookeeper.session.timeout=60000
-zookeeper.recovery.retry=0
-
-#hbase table configuration
-hbase.table.name=pcap
-hbase.table.column.family=t
-hbase.table.column.qualifier=pcap
-hbase.table.column.maxVersions=5
-
-# scan size limit configuration in MB or KB; if the input is negative or greater than max value throw an error.
-hbase.scan.result.size.unit=MB
-hbase.scan.default.result.size=6
-hbase.scan.max.result.size=60
-
-# time stamp conversion configuration; possible values 'SECONDS'(seconds), 'MILLIS'(milli seconds), 'MICROS' (micro seconds)
-hbase.table.data.time.unit=MICROS
-
-#number of retries in case of ZooKeeper or HBase server down
-hbase.hconnection.retries.number=3
-
-#configuration for including pcaps in the reverse traffic
-pcaps.include.reverse.traffic = false
-
-#maximum table row size in KB or MB 
-hbase.table.row.size.unit = KB
-hbase.table.max.row.size = 0.07
-
-# tokens of row key configuration
-hbase.table.row.key.tokens=7
-rest.api.input.key.min.tokens=5
-
-# whether or not to include the last row from the previous request, applicable for only partial response scenario
-hbase.table.scan.include.duplicate.lastrow= true;
-
-#number of digits for appending tokens of the row key
-hbase.table.row.key.token.appending.digits=5

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a919cc19/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/resources/test-tcp-packet.pcap
----------------------------------------------------------------------
diff --git a/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/resources/test-tcp-packet.pcap b/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/resources/test-tcp-packet.pcap
deleted file mode 100644
index 25d47da..0000000
Binary files a/opensoc-streaming/OpenSOC-PCAP_Reconstruction/hbase/src/test/resources/test-tcp-packet.pcap and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a919cc19/opensoc-streaming/OpenSOC-PCAP_Reconstruction/service/.pmd
----------------------------------------------------------------------
diff --git a/opensoc-streaming/OpenSOC-PCAP_Reconstruction/service/.pmd b/opensoc-streaming/OpenSOC-PCAP_Reconstruction/service/.pmd
deleted file mode 100644
index 8a17775..0000000
--- a/opensoc-streaming/OpenSOC-PCAP_Reconstruction/service/.pmd
+++ /dev/null
@@ -1,1190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pmd>
-    <useProjectRuleSet>false</useProjectRuleSet>
-    <ruleSetFile>.ruleset</ruleSetFile>
-    <rules>
-        <rule>
-            <name>IfStmtsMustUseBraces</name>
-            <ruleset>Braces</ruleset>
-        </rule>
-        <rule>
-            <name>IfElseStmtsMustUseBraces</name>
-            <ruleset>Braces</ruleset>
-        </rule>
-        <rule>
-            <name>WhileLoopsMustUseBraces</name>
-            <ruleset>Braces</ruleset>
-        </rule>
-        <rule>
-            <name>ForLoopsMustUseBraces</name>
-            <ruleset>Braces</ruleset>
-        </rule>
-        <rule>
-            <name>UnnecessaryConstructor</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>NullAssignment</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>OnlyOneReturn</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>AssignmentInOperand</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>AtLeastOneConstructor</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>DontImportSun</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>SuspiciousOctalEscape</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>CallSuperInConstructor</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>UnnecessaryParentheses</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>DefaultPackage</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>BooleanInversion</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>DataflowAnomalyAnalysis</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidFinalLocalVariable</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidUsingShortType</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidUsingVolatile</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidUsingNativeCode</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidAccessibilityAlteration</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>DoNotCallGarbageCollectionExplicitly</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>OneDeclarationPerLine</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidPrefixingMethodParameters</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidLiteralsInIfCondition</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>UseObjectForClearerAPI</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>UseConcurrentHashMap</name>
-            <ruleset>Controversial</ruleset>
-        </rule>
-        <rule>
-            <name>UnusedPrivateField</name>
-            <ruleset>Unused Code</ruleset>
-        </rule>
-        <rule>
-            <name>UnusedLocalVariable</name>
-            <ruleset>Unused Code</ruleset>
-        </rule>
-        <rule>
-            <name>UnusedPrivateMethod</name>
-            <ruleset>Unused Code</ruleset>
-        </rule>
-        <rule>
-            <name>UnusedFormalParameter</name>
-            <ruleset>Unused Code</ruleset>
-        </rule>
-        <rule>
-            <name>UnusedModifier</name>
-            <ruleset>Unused Code</ruleset>
-        </rule>
-        <rule>
-            <name>MethodReturnsInternalArray</name>
-            <ruleset>Security Code Guidelines</ruleset>
-        </rule>
-        <rule>
-            <name>ArrayIsStoredDirectly</name>
-            <ruleset>Security Code Guidelines</ruleset>
-        </rule>
-        <rule>
-            <name>ProperCloneImplementation</name>
-            <ruleset>Clone Implementation</ruleset>
-        </rule>
-        <rule>
-            <name>CloneThrowsCloneNotSupportedException</name>
-            <ruleset>Clone Implementation</ruleset>
-        </rule>
-        <rule>
-            <name>CloneMethodMustImplementCloneable</name>
-            <ruleset>Clone Implementation</ruleset>
-        </rule>
-        <rule>
-            <name>JUnitStaticSuite</name>
-            <ruleset>JUnit</ruleset>
-        </rule>
-        <rule>
-            <name>JUnitSpelling</name>
-            <ruleset>JUnit</ruleset>
-        </rule>
-        <rule>
-            <name>JUnitAssertionsShouldIncludeMessage</name>
-            <ruleset>JUnit</ruleset>
-        </rule>
-        <rule>
-            <name>JUnitTestsShouldIncludeAssert</name>
-            <ruleset>JUnit</ruleset>
-        </rule>
-        <rule>
-            <name>TestClassWithoutTestCases</name>
-            <ruleset>JUnit</ruleset>
-        </rule>
-        <rule>
-            <name>UnnecessaryBooleanAssertion</name>
-            <ruleset>JUnit</ruleset>
-        </rule>
-        <rule>
-            <name>UseAssertEqualsInsteadOfAssertTrue</name>
-            <ruleset>JUnit</ruleset>
-        </rule>
-        <rule>
-            <name>UseAssertSameInsteadOfAssertTrue</name>
-            <ruleset>JUnit</ruleset>
-        </rule>
-        <rule>
-            <name>UseAssertNullInsteadOfAssertTrue</name>
-            <ruleset>JUnit</ruleset>
-        </rule>
-        <rule>
-            <name>SimplifyBooleanAssertion</name>
-            <ruleset>JUnit</ruleset>
-        </rule>
-        <rule>
-            <name>JUnitTestContainsTooManyAsserts</name>
-            <ruleset>JUnit</ruleset>
-        </rule>
-        <rule>
-            <name>UseAssertTrueInsteadOfAssertEquals</name>
-            <ruleset>JUnit</ruleset>
-        </rule>
-        <rule>
-            <name>CommentRequired</name>
-            <ruleset>Comments</ruleset>
-        </rule>
-        <rule>
-            <name>CommentSize</name>
-            <ruleset>Comments</ruleset>
-        </rule>
-        <rule>
-            <name>CommentContent</name>
-            <ruleset>Comments</ruleset>
-        </rule>
-        <rule>
-            <name>ShortVariable</name>
-            <ruleset>Naming</ruleset>
-        </rule>
-        <rule>
-            <name>LongVariable</name>
-            <ruleset>Naming</ruleset>
-        </rule>
-        <rule>
-            <name>ShortMethodName</name>
-            <ruleset>Naming</ruleset>
-        </rule>
-        <rule>
-            <name>VariableNamingConventions</name>
-            <ruleset>Naming</ruleset>
-        </rule>
-        <rule>
-            <name>MethodNamingConventions</name>
-            <ruleset>Naming</ruleset>
-        </rule>
-        <rule>
-            <name>ClassNamingConventions</name>
-            <ruleset>Naming</ruleset>
-        </rule>
-        <rule>
-            <name>AbstractNaming</name>
-            <ruleset>Naming</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidDollarSigns</name>
-            <ruleset>Naming</ruleset>
-        </rule>
-        <rule>
-            <name>MethodWithSameNameAsEnclosingClass</name>
-            <ruleset>Naming</ruleset>
-        </rule>
-        <rule>
-            <name>SuspiciousHashcodeMethodName</name>
-            <ruleset>Naming</ruleset>
-        </rule>
-        <rule>
-            <name>SuspiciousConstantFieldName</name>
-            <ruleset>Naming</ruleset>
-        </rule>
-        <rule>
-            <name>SuspiciousEqualsMethodName</name>
-            <ruleset>Naming</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidFieldNameMatchingTypeName</name>
-            <ruleset>Naming</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidFieldNameMatchingMethodName</name>
-            <ruleset>Naming</ruleset>
-        </rule>
-        <rule>
-            <name>NoPackage</name>
-            <ruleset>Naming</ruleset>
-        </rule>
-        <rule>
-            <name>PackageCase</name>
-            <ruleset>Naming</ruleset>
-        </rule>
-        <rule>
-            <name>MisleadingVariableName</name>
-            <ruleset>Naming</ruleset>
-        </rule>
-        <rule>
-            <name>BooleanGetMethodName</name>
-            <ruleset>Naming</ruleset>
-        </rule>
-        <rule>
-            <name>ShortClassName</name>
-            <ruleset>Naming</ruleset>
-        </rule>
-        <rule>
-            <name>GenericsNaming</name>
-            <ruleset>Naming</ruleset>
-        </rule>
-        <rule>
-            <name>DuplicateImports</name>
-            <ruleset>Import Statements</ruleset>
-        </rule>
-        <rule>
-            <name>DontImportJavaLang</name>
-            <ruleset>Import Statements</ruleset>
-        </rule>
-        <rule>
-            <name>UnusedImports</name>
-            <ruleset>Import Statements</ruleset>
-        </rule>
-        <rule>
-            <name>ImportFromSamePackage</name>
-            <ruleset>Import Statements</ruleset>
-        </rule>
-        <rule>
-            <name>TooManyStaticImports</name>
-            <ruleset>Import Statements</ruleset>
-        </rule>
-        <rule>
-            <name>UnnecessaryFullyQualifiedName</name>
-            <ruleset>Import Statements</ruleset>
-        </rule>
-        <rule>
-            <name>ReplaceVectorWithList</name>
-            <ruleset>Migration</ruleset>
-        </rule>
-        <rule>
-            <name>ReplaceHashtableWithMap</name>
-            <ruleset>Migration</ruleset>
-        </rule>
-        <rule>
-            <name>ReplaceEnumerationWithIterator</name>
-            <ruleset>Migration</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidEnumAsIdentifier</name>
-            <ruleset>Migration</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidAssertAsIdentifier</name>
-            <ruleset>Migration</ruleset>
-        </rule>
-        <rule>
-            <name>IntegerInstantiation</name>
-            <ruleset>Migration</ruleset>
-        </rule>
-        <rule>
-            <name>ByteInstantiation</name>
-            <ruleset>Migration</ruleset>
-        </rule>
-        <rule>
-            <name>ShortInstantiation</name>
-            <ruleset>Migration</ruleset>
-        </rule>
-        <rule>
-            <name>LongInstantiation</name>
-            <ruleset>Migration</ruleset>
-        </rule>
-        <rule>
-            <name>JUnit4TestShouldUseBeforeAnnotation</name>
-            <ruleset>Migration</ruleset>
-        </rule>
-        <rule>
-            <name>JUnit4TestShouldUseAfterAnnotation</name>
-            <ruleset>Migration</ruleset>
-        </rule>
-        <rule>
-            <name>JUnit4TestShouldUseTestAnnotation</name>
-            <ruleset>Migration</ruleset>
-        </rule>
-        <rule>
-            <name>JUnit4SuitesShouldUseSuiteAnnotation</name>
-            <ruleset>Migration</ruleset>
-        </rule>
-        <rule>
-            <name>JUnitUseExpected</name>
-            <ruleset>Migration</ruleset>
-        </rule>
-        <rule>
-            <name>UnnecessaryParentheses</name>
-            <ruleset>Unnecessary</ruleset>
-        </rule>
-        <rule>
-            <name>UnnecessaryBlock</name>
-            <ruleset>Unnecessary</ruleset>
-        </rule>
-        <rule>
-            <name>DontNestJsfInJstlIteration</name>
-            <ruleset>Basic JSF</ruleset>
-        </rule>
-        <rule>
-            <name>MistypedCDATASection</name>
-            <ruleset>Basic XML</ruleset>
-        </rule>
-        <rule>
-            <name>CallSuperFirst</name>
-            <ruleset>Android</ruleset>
-        </rule>
-        <rule>
-            <name>CallSuperLast</name>
-            <ruleset>Android</ruleset>
-        </rule>
-        <rule>
-            <name>DoNotHardCodeSDCard</name>
-            <ruleset>Android</ruleset>
-        </rule>
-        <rule>
-            <name>JumbledIncrementer</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>ForLoopShouldBeWhileLoop</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>OverrideBothEqualsAndHashcode</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>DoubleCheckedLocking</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>ReturnFromFinallyBlock</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>UnconditionalIfStatement</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>BooleanInstantiation</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>CollapsibleIfStatements</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>ClassCastExceptionWithToArray</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidDecimalLiteralsInBigDecimalConstructor</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>MisplacedNullCheck</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidThreadGroup</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>BrokenNullCheck</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>BigIntegerInstantiation</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidUsingOctalValues</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidUsingHardCodedIP</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>CheckResultSet</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidMultipleUnaryOperators</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>ExtendsObject</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>CheckSkipResult</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidBranchingStatementAsLastInLoop</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>DontCallThreadRun</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>DontUseFloatTypeForLoopIndices</name>
-            <ruleset>Basic</ruleset>
-        </rule>
-        <rule>
-            <name>EmptyCatchBlock</name>
-            <ruleset>Empty Code</ruleset>
-        </rule>
-        <rule>
-            <name>EmptyIfStmt</name>
-            <ruleset>Empty Code</ruleset>
-        </rule>
-        <rule>
-            <name>EmptyWhileStmt</name>
-            <ruleset>Empty Code</ruleset>
-        </rule>
-        <rule>
-            <name>EmptyTryBlock</name>
-            <ruleset>Empty Code</ruleset>
-        </rule>
-        <rule>
-            <name>EmptyFinallyBlock</name>
-            <ruleset>Empty Code</ruleset>
-        </rule>
-        <rule>
-            <name>EmptySwitchStatements</name>
-            <ruleset>Empty Code</ruleset>
-        </rule>
-        <rule>
-            <name>EmptySynchronizedBlock</name>
-            <ruleset>Empty Code</ruleset>
-        </rule>
-        <rule>
-            <name>EmptyStatementNotInLoop</name>
-            <ruleset>Empty Code</ruleset>
-        </rule>
-        <rule>
-            <name>EmptyInitializer</name>
-            <ruleset>Empty Code</ruleset>
-        </rule>
-        <rule>
-            <name>EmptyStatementBlock</name>
-            <ruleset>Empty Code</ruleset>
-        </rule>
-        <rule>
-            <name>EmptyStaticInitializer</name>
-            <ruleset>Empty Code</ruleset>
-        </rule>
-        <rule>
-            <name>CouplingBetweenObjects</name>
-            <ruleset>Coupling</ruleset>
-        </rule>
-        <rule>
-            <name>ExcessiveImports</name>
-            <ruleset>Coupling</ruleset>
-        </rule>
-        <rule>
-            <name>LooseCoupling</name>
-            <ruleset>Coupling</ruleset>
-        </rule>
-        <rule>
-            <name>LoosePackageCoupling</name>
-            <ruleset>Coupling</ruleset>
-        </rule>
-        <rule>
-            <name>LawOfDemeter</name>
-            <ruleset>Coupling</ruleset>
-        </rule>
-        <rule>
-            <name>UnnecessaryConversionTemporary</name>
-            <ruleset>Unnecessary</ruleset>
-        </rule>
-        <rule>
-            <name>UnnecessaryReturn</name>
-            <ruleset>Unnecessary</ruleset>
-        </rule>
-        <rule>
-            <name>UnnecessaryFinalModifier</name>
-            <ruleset>Unnecessary</ruleset>
-        </rule>
-        <rule>
-            <name>UselessOverridingMethod</name>
-            <ruleset>Unnecessary</ruleset>
-        </rule>
-        <rule>
-            <name>UselessOperationOnImmutable</name>
-            <ruleset>Unnecessary</ruleset>
-        </rule>
-        <rule>
-            <name>UnusedNullCheckInEquals</name>
-            <ruleset>Unnecessary</ruleset>
-        </rule>
-        <rule>
-            <name>UselessParentheses</name>
-            <ruleset>Unnecessary</ruleset>
-        </rule>
-        <rule>
-            <name>NoLongScripts</name>
-            <ruleset>Basic JSP</ruleset>
-        </rule>
-        <rule>
-            <name>NoScriptlets</name>
-            <ruleset>Basic JSP</ruleset>
-        </rule>
-        <rule>
-            <name>NoInlineStyleInformation</name>
-            <ruleset>Basic JSP</ruleset>
-        </rule>
-        <rule>
-            <name>NoClassAttribute</name>
-            <ruleset>Basic JSP</ruleset>
-        </rule>
-        <rule>
-            <name>NoJspForward</name>
-            <ruleset>Basic JSP</ruleset>
-        </rule>
-        <rule>
-            <name>IframeMissingSrcAttribute</name>
-            <ruleset>Basic JSP</ruleset>
-        </rule>
-        <rule>
-            <name>NoHtmlComments</name>
-            <ruleset>Basic JSP</ruleset>
-        </rule>
-        <rule>
-            <name>DuplicateJspImports</name>
-            <ruleset>Basic JSP</ruleset>
-        </rule>
-        <rule>
-            <name>JspEncoding</name>
-            <ruleset>Basic JSP</ruleset>
-        </rule>
-        <rule>
-            <name>NoInlineScript</name>
-            <ruleset>Basic JSP</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidCatchingThrowable</name>
-            <ruleset>Strict Exceptions</ruleset>
-        </rule>
-        <rule>
-            <name>SignatureDeclareThrowsException</name>
-            <ruleset>Strict Exceptions</ruleset>
-        </rule>
-        <rule>
-            <name>ExceptionAsFlowControl</name>
-            <ruleset>Strict Exceptions</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidCatchingNPE</name>
-            <ruleset>Strict Exceptions</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidThrowingRawExceptionTypes</name>
-            <ruleset>Strict Exceptions</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidThrowingNullPointerException</name>
-            <ruleset>Strict Exceptions</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidRethrowingException</name>
-            <ruleset>Strict Exceptions</ruleset>
-        </rule>
-        <rule>
-            <name>DoNotExtendJavaLangError</name>
-            <ruleset>Strict Exceptions</ruleset>
-        </rule>
-        <rule>
-            <name>DoNotThrowExceptionInFinally</name>
-            <ruleset>Strict Exceptions</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidThrowingNewInstanceOfSameException</name>
-            <ruleset>Strict Exceptions</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidCatchingGenericException</name>
-            <ruleset>Strict Exceptions</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidLosingExceptionInformation</name>
-            <ruleset>Strict Exceptions</ruleset>
-        </rule>
-        <rule>
-            <name>UseCorrectExceptionLogging</name>
-            <ruleset>Jakarta Commons Logging</ruleset>
-        </rule>
-        <rule>
-            <name>ProperLogger</name>
-            <ruleset>Jakarta Commons Logging</ruleset>
-        </rule>
-        <rule>
-            <name>GuardDebugLogging</name>
-            <ruleset>Jakarta Commons Logging</ruleset>
-        </rule>
-        <rule>
-            <name>LocalVariableCouldBeFinal</name>
-            <ruleset>Optimization</ruleset>
-        </rule>
-        <rule>
-            <name>MethodArgumentCouldBeFinal</name>
-            <ruleset>Optimization</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidInstantiatingObjectsInLoops</name>
-            <ruleset>Optimization</ruleset>
-        </rule>
-        <rule>
-            <name>UseArrayListInsteadOfVector</name>
-            <ruleset>Optimization</ruleset>
-        </rule>
-        <rule>
-            <name>SimplifyStartsWith</name>
-            <ruleset>Optimization</ruleset>
-        </rule>
-        <rule>
-            <name>UseStringBufferForStringAppends</name>
-            <ruleset>Optimization</ruleset>
-        </rule>
-        <rule>
-            <name>UseArraysAsList</name>
-            <ruleset>Optimization</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidArrayLoops</name>
-            <ruleset>Optimization</ruleset>
-        </rule>
-        <rule>
-            <name>UnnecessaryWrapperObjectCreation</name>
-            <ruleset>Optimization</ruleset>
-        </rule>
-        <rule>
-            <name>AddEmptyString</name>
-            <ruleset>Optimization</ruleset>
-        </rule>
-        <rule>
-            <name>RedundantFieldInitializer</name>
-            <ruleset>Optimization</ruleset>
-        </rule>
-        <rule>
-            <name>PrematureDeclaration</name>
-            <ruleset>Optimization</ruleset>
-        </rule>
-        <rule>
-            <name>UseProperClassLoader</name>
-            <ruleset>J2EE</ruleset>
-        </rule>
-        <rule>
-            <name>MDBAndSessionBeanNamingConvention</name>
-            <ruleset>J2EE</ruleset>
-        </rule>
-        <rule>
-            <name>RemoteSessionInterfaceNamingConvention</name>
-            <ruleset>J2EE</ruleset>
-        </rule>
-        <rule>
-            <name>LocalInterfaceSessionNamingConvention</name>
-            <ruleset>J2EE</ruleset>
-        </rule>
-        <rule>
-            <name>LocalHomeNamingConvention</name>
-            <ruleset>J2EE</ruleset>
-        </rule>
-        <rule>
-            <name>RemoteInterfaceNamingConvention</name>
-            <ruleset>J2EE</ruleset>
-        </rule>
-        <rule>
-            <name>DoNotCallSystemExit</name>
-            <ruleset>J2EE</ruleset>
-        </rule>
-        <rule>
-            <name>StaticEJBFieldShouldBeFinal</name>
-            <ruleset>J2EE</ruleset>
-        </rule>
-        <rule>
-            <name>DoNotUseThreads</name>
-            <ruleset>J2EE</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidDuplicateLiterals</name>
-            <ruleset>String and StringBuffer</ruleset>
-        </rule>
-        <rule>
-            <name>StringInstantiation</name>
-            <ruleset>String and StringBuffer</ruleset>
-        </rule>
-        <rule>
-            <name>StringToString</name>
-            <ruleset>String and StringBuffer</ruleset>
-        </rule>
-        <rule>
-            <name>InefficientStringBuffering</name>
-            <ruleset>String and StringBuffer</ruleset>
-        </rule>
-        <rule>
-            <name>UnnecessaryCaseChange</name>
-            <ruleset>String and StringBuffer</ruleset>
-        </rule>
-        <rule>
-            <name>UseStringBufferLength</name>
-            <ruleset>String and StringBuffer</ruleset>
-        </rule>
-        <rule>
-            <name>AppendCharacterWithChar</name>
-            <ruleset>String and StringBuffer</ruleset>
-        </rule>
-        <rule>
-            <name>ConsecutiveLiteralAppends</name>
-            <ruleset>String and StringBuffer</ruleset>
-        </rule>
-        <rule>
-            <name>UseIndexOfChar</name>
-            <ruleset>String and StringBuffer</ruleset>
-        </rule>
-        <rule>
-            <name>InefficientEmptyStringCheck</name>
-            <ruleset>String and StringBuffer</ruleset>
-        </rule>
-        <rule>
-            <name>InsufficientStringBufferDeclaration</name>
-            <ruleset>String and StringBuffer</ruleset>
-        </rule>
-        <rule>
-            <name>UselessStringValueOf</name>
-            <ruleset>String and StringBuffer</ruleset>
-        </rule>
-        <rule>
-            <name>StringBufferInstantiationWithChar</name>
-            <ruleset>String and StringBuffer</ruleset>
-        </rule>
-        <rule>
-            <name>UseEqualsToCompareStrings</name>
-            <ruleset>String and StringBuffer</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidStringBufferField</name>
-            <ruleset>String and StringBuffer</ruleset>
-        </rule>
-        <rule>
-            <name>MoreThanOneLogger</name>
-            <ruleset>Java Logging</ruleset>
-        </rule>
-        <rule>
-            <name>LoggerIsNotStaticFinal</name>
-            <ruleset>Java Logging</ruleset>
-        </rule>
-        <rule>
-            <name>SystemPrintln</name>
-            <ruleset>Java Logging</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidPrintStackTrace</name>
-            <ruleset>Java Logging</ruleset>
-        </rule>
-        <rule>
-            <name>UseConcatOnce</name>
-            <ruleset>XPath in XSL</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidAxisNavigation</name>
-            <ruleset>XPath in XSL</ruleset>
-        </rule>
-        <rule>
-            <name>AssignmentInOperand</name>
-            <ruleset>Basic Ecmascript</ruleset>
-        </rule>
-        <rule>
-            <name>UnreachableCode</name>
-            <ruleset>Basic Ecmascript</ruleset>
-        </rule>
-        <rule>
-            <name>InnaccurateNumericLiteral</name>
-            <ruleset>Basic Ecmascript</ruleset>
-        </rule>
-        <rule>
-            <name>ConsistentReturn</name>
-            <ruleset>Basic Ecmascript</ruleset>
-        </rule>
-        <rule>
-            <name>ScopeForInVariable</name>
-            <ruleset>Basic Ecmascript</ruleset>
-        </rule>
-        <rule>
-            <name>EqualComparison</name>
-            <ruleset>Basic Ecmascript</ruleset>
-        </rule>
-        <rule>
-            <name>GlobalVariable</name>
-            <ruleset>Basic Ecmascript</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidTrailingComma</name>
-            <ruleset>Basic Ecmascript</ruleset>
-        </rule>
-        <rule>
-            <name>IfStmtsMustUseBraces</name>
-            <ruleset>Braces</ruleset>
-        </rule>
-        <rule>
-            <name>WhileLoopsMustUseBraces</name>
-            <ruleset>Braces</ruleset>
-        </rule>
-        <rule>
-            <name>IfElseStmtsMustUseBraces</name>
-            <ruleset>Braces</ruleset>
-        </rule>
-        <rule>
-            <name>ForLoopsMustUseBraces</name>
-            <ruleset>Braces</ruleset>
-        </rule>
-        <rule>
-            <name>EmptyFinalizer</name>
-            <ruleset>Finalizer</ruleset>
-        </rule>
-        <rule>
-            <name>FinalizeOnlyCallsSuperFinalize</name>
-            <ruleset>Finalizer</ruleset>
-        </rule>
-        <rule>
-            <name>FinalizeOverloaded</name>
-            <ruleset>Finalizer</ruleset>
-        </rule>
-        <rule>
-            <name>FinalizeDoesNotCallSuperFinalize</name>
-            <ruleset>Finalizer</ruleset>
-        </rule>
-        <rule>
-            <name>FinalizeShouldBeProtected</name>
-            <ruleset>Finalizer</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidCallingFinalize</name>
-            <ruleset>Finalizer</ruleset>
-        </rule>
-        <rule>
-            <name>UseSingleton</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>SimplifyBooleanReturns</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>SimplifyBooleanExpressions</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>SwitchStmtsShouldHaveDefault</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidDeeplyNestedIfStmts</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidReassigningParameters</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>SwitchDensity</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>ConstructorCallsOverridableMethod</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>AccessorClassGeneration</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>FinalFieldCouldBeStatic</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>CloseResource</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>NonStaticInitializer</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>DefaultLabelNotLastInSwitchStmt</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>NonCaseLabelInSwitchStatement</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>OptimizableToArrayCall</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>BadComparison</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>EqualsNull</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>ConfusingTernary</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>InstantiationToGetClass</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>IdempotentOperations</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>SimpleDateFormatNeedsLocale</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>ImmutableField</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>UseLocaleWithCaseConversions</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidProtectedFieldInFinalClass</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>AssignmentToNonFinalStatic</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>MissingStaticMethodInNonInstantiatableClass</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidSynchronizedAtMethodLevel</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>MissingBreakInSwitch</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>UseNotifyAllInsteadOfNotify</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidInstanceofChecksInCatchClause</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>AbstractClassWithoutAbstractMethod</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>SimplifyConditional</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>CompareObjectsWithEquals</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>PositionLiteralsFirstInComparisons</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>UnnecessaryLocalBeforeReturn</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>NonThreadSafeSingleton</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>UncommentedEmptyMethod</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>UncommentedEmptyConstructor</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>AvoidConstantsInterface</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>UnsynchronizedStaticDateFormatter</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>PreserveStackTrace</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>UseCollectionIsEmpty</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>ClassWithOnlyPrivateConstructorsShouldBeFinal</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>EmptyMethodInAbstractClassShouldBeAbstract</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>SingularField</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>ReturnEmptyArrayRatherThanNull</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>AbstractClassWithoutAnyMethod</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>TooFewBranchesForASwitchStatement</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>LogicInversion</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>UseVarargs</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>FieldDeclarationsShouldBeAtStartOfClass</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>GodClass</name>
-            <ruleset>Design</ruleset>
-        </rule>
-        <rule>
-            <name>NPathComplexity</name>
-            <ruleset>Code Size</ruleset>
-        </rule>
-        <rule>
-            <name>ExcessiveMethodLength</name>
-            <ruleset>Code Size</ruleset>
-        </rule>
-        <rule>
-            <name>ExcessiveParameterList</name>
-            <ruleset>Code Size</ruleset>
-        </rule>
-        <rule>
-            <name>ExcessiveClassLength</name>
-            <ruleset>Code Size</ruleset>
-        </rule>
-        <rule>
-            <name>CyclomaticComplexity</name>
-            <ruleset>Code Size</ruleset>
-        </rule>
-        <rule>
-            <name>ExcessivePublicCount</name>
-            <ruleset>Code Size</ruleset>
-        </rule>
-        <rule>
-            <name>TooManyFields</name>
-            <ruleset>Code Size</ruleset>
-        </rule>
-        <rule>
-            <name>NcssMethodCount</name>
-            <ruleset>Code Size</ruleset>
-        </rule>
-        <rule>
-            <name>NcssTypeCount</name>
-            <ruleset>Code Size</ruleset>
-        </rule>
-        <rule>
-            <name>NcssConstructorCount</name>
-            <ruleset>Code Size</ruleset>
-        </rule>
-        <rule>
-            <name>TooManyMethods</name>
-            <ruleset>Code Size</ruleset>
-        </rule>
-        <rule>
-            <name>BeanMembersShouldSerialize</name>
-            <ruleset>JavaBeans</ruleset>
-        </rule>
-        <rule>
-            <name>MissingSerialVersionUID</name>
-            <ruleset>JavaBeans</ruleset>
-        </rule>
-    </rules>
-    <includeDerivedFiles>false</includeDerivedFiles>
-    <violationsAsErrors>true</violationsAsErrors>
-    <fullBuildEnabled>true</fullBuildEnabled>
-</pmd>

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a919cc19/opensoc-streaming/OpenSOC-PCAP_Reconstruction/service/README.txt
----------------------------------------------------------------------
diff --git a/opensoc-streaming/OpenSOC-PCAP_Reconstruction/service/README.txt b/opensoc-streaming/OpenSOC-PCAP_Reconstruction/service/README.txt
deleted file mode 100644
index f4203f9..0000000
--- a/opensoc-streaming/OpenSOC-PCAP_Reconstruction/service/README.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-'rest' module contains the web layer configuration for REST API which communicates with HBase and fetches pcaps.
-Spring frameworks 'org.springframework.web.servlet.DispatcherServlet' is configured to intercept all requests (/*) and the 
-application context is built using the configuration file 'ipcap-config.xml'.
-
-REST APIs :
-1. http://{hostname:port}//cisco-rest/pcapGetter/getPcapsByKeys?<query params here. Refer documentation below>
-2. http://mon.hw.com:8090/cisco-rest-0.0.5-SNAPSHOT/pcapGetter/getPcapsByKeyRange?<query params here. Refer documentation below>
-3. http://mon.hw.com:8090/cisco-rest-0.0.5-SNAPSHOT/pcapGetter/getPcapsByIdentifiers?<query params here. Refer documentation below>
-
-Refer the wiki documentation for further details : https://hwcsco.atlassian.net/wiki/pages/viewpage.action?pageId=5242892	

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a919cc19/opensoc-streaming/OpenSOC-PCAP_Reconstruction/service/pom.xml
----------------------------------------------------------------------
diff --git a/opensoc-streaming/OpenSOC-PCAP_Reconstruction/service/pom.xml b/opensoc-streaming/OpenSOC-PCAP_Reconstruction/service/pom.xml
deleted file mode 100644
index bf5f5db..0000000
--- a/opensoc-streaming/OpenSOC-PCAP_Reconstruction/service/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>com.cisco.opensoc</groupId>
-		<artifactId>opensoc</artifactId>
-		<version>0.1.3-SNAPSHOT</version>
-		<relativePath>../../../pom.xml</relativePath>
-	</parent>
-	<artifactId>opensoc-rest-service</artifactId>
-	<packaging>war</packaging>
-
-
-	<dependencies>
-		<dependency>
-			<groupId>com.cisco.opensoc</groupId>
-			<artifactId>opensoc-hbase</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-	
-		<dependency>
-			<groupId>org.springframework.integration</groupId>
-			<artifactId>spring-integration-http</artifactId>
-			<version>${spring.integration.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-		
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>${logger.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>com.sun.jmx</groupId>
-					<artifactId>jmxri</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jdmk</groupId>
-					<artifactId>jmxtools</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.jms</groupId>
-					<artifactId>jms</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file