metron-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ceste...@apache.org
Subject [78/89] [abbrv] incubator-metron git commit: Rename com.apache to org.apache
Date Tue, 26 Jan 2016 14:18:56 GMT
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/pom.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/pom.xml b/metron-streaming/Metron-MessageParsers/pom.xml
index c3acc3e..d36021f 100644
--- a/metron-streaming/Metron-MessageParsers/pom.xml
+++ b/metron-streaming/Metron-MessageParsers/pom.xml
@@ -13,7 +13,7 @@
 	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.apache.metron</groupId>
+		<groupId>org.apache.metron</groupId>
 		<artifactId>Metron-Streaming</artifactId>
 		<version>0.6BETA</version>
 	</parent>
@@ -24,7 +24,7 @@
     </properties>
 	<dependencies>
 		<dependency>
-			<groupId>com.apache.metron</groupId>
+			<groupId>org.apache.metron</groupId>
 			<artifactId>Metron-Common</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/readme.md
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/readme.md b/metron-streaming/Metron-MessageParsers/readme.md
index bb674e5..509f02e 100644
--- a/metron-streaming/Metron-MessageParsers/readme.md
+++ b/metron-streaming/Metron-MessageParsers/readme.md
@@ -67,15 +67,15 @@ Parser adapters are loaded dynamically in each Metron topology.  They are define
 ###Java Parser Adapters
 Java parser adapters are indended for higher-velocity topologies and are not easily changed or extended.  As the adoption of Metron continues we plan on extending our library of Java adapters to process more log formats.  As of this moment the Java adapters included with Metron are:
 
-* com.apache.metron.parsing.parsers.BasicIseParser : Parse ISE messages
-* com.apache.metron.parsing.parsers.BasicBroParser : Parse Bro messages
-* com.apache.metron.parsing.parsers.BasicSourcefireParser : Parse Sourcefire messages
-* com.apache.metron.parsing.parsers.BasicLancopeParser : Parse Lancope messages
+* org.apache.metron.parsing.parsers.BasicIseParser : Parse ISE messages
+* org.apache.metron.parsing.parsers.BasicBroParser : Parse Bro messages
+* org.apache.metron.parsing.parsers.BasicSourcefireParser : Parse Sourcefire messages
+* org.apache.metron.parsing.parsers.BasicLancopeParser : Parse Lancope messages
 
 ###Grok Parser Adapters
 Grok parser adapters are designed primarly for someone who is not a Java coder for quickly standing up a parser adapter for lower velocity topologies.  Grok relies on Regex for message parsing, which is much slower than purpose-built Java parsers, but is more extensible.  Grok parsers are defined via a config file and the topplogy does not need to be recombiled in order to make changes to them.  An example of a Grok perser is:
 
-* com.apache.metron.parsing.parsers.GrokSourcefireParser
+* org.apache.metron.parsing.parsers.GrokSourcefireParser
 
 For more information on the Grok project please refer to the following link:
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/filters/BroMessageFilter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/filters/BroMessageFilter.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/filters/BroMessageFilter.java
index 9022291..3a86957 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/filters/BroMessageFilter.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/filters/BroMessageFilter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.filters;
+package org.apache.metron.filters;
 
 import java.io.Serializable;
 import java.util.HashSet;
@@ -8,7 +8,7 @@ import java.util.Set;
 import org.apache.commons.configuration.Configuration;
 import org.json.simple.JSONObject;
 
-import com.apache.metron.parser.interfaces.MessageFilter;
+import org.apache.metron.parser.interfaces.MessageFilter;
 
 public class BroMessageFilter implements MessageFilter,Serializable {
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/filters/GenericMessageFilter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/filters/GenericMessageFilter.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/filters/GenericMessageFilter.java
index 19c7b62..f136b2b 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/filters/GenericMessageFilter.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/filters/GenericMessageFilter.java
@@ -1,9 +1,9 @@
-package com.apache.metron.filters;
+package org.apache.metron.filters;
 import java.io.Serializable;
 
 import org.json.simple.JSONObject;
 
-import com.apache.metron.parser.interfaces.MessageFilter;
+import org.apache.metron.parser.interfaces.MessageFilter;
 
 public class GenericMessageFilter implements MessageFilter,Serializable {
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/AbstractParserBolt.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/AbstractParserBolt.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/AbstractParserBolt.java
index ccda8cf..5bec434 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/AbstractParserBolt.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/AbstractParserBolt.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apache.metron.parsing;
+package org.apache.metron.parsing;
 
 import java.io.IOException;
 import java.util.Map;
@@ -29,9 +29,9 @@ import backtype.storm.task.TopologyContext;
 import backtype.storm.topology.base.BaseRichBolt;
 
 import com.codahale.metrics.Counter;
-import com.apache.metron.metrics.MetricReporter;
-import com.apache.metron.parser.interfaces.MessageFilter;
-import com.apache.metron.parser.interfaces.MessageParser;
+import org.apache.metron.metrics.MetricReporter;
+import org.apache.metron.parser.interfaces.MessageFilter;
+import org.apache.metron.parser.interfaces.MessageParser;
 
 @SuppressWarnings("rawtypes")
 public abstract class AbstractParserBolt extends BaseRichBolt {

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/PcapParserBolt.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/PcapParserBolt.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/PcapParserBolt.java
index ba274eb..6f692d6 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/PcapParserBolt.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/PcapParserBolt.java
@@ -1,4 +1,4 @@
-package com.apache.metron.parsing;
+package org.apache.metron.parsing;
 
 import java.util.List;
 import java.util.Map;
@@ -7,9 +7,9 @@ import org.apache.log4j.Logger;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
 
-import com.apache.metron.helpers.topology.ErrorGenerator;
-import com.apache.metron.parsing.parsers.PcapParser;
-import com.apache.metron.pcap.PacketInfo;
+import org.apache.metron.helpers.topology.ErrorGenerator;
+import org.apache.metron.parsing.parsers.PcapParser;
+import org.apache.metron.pcap.PacketInfo;
 
 import backtype.storm.generated.Grouping;
 import backtype.storm.task.OutputCollector;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/TelemetryParserBolt.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/TelemetryParserBolt.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/TelemetryParserBolt.java
index 0a73c59..8865d89 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/TelemetryParserBolt.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/TelemetryParserBolt.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.apache.metron.parsing;
+package org.apache.metron.parsing;
 
 import java.io.IOException;
 import java.util.Map;
@@ -30,16 +30,16 @@ import backtype.storm.tuple.Fields;
 import backtype.storm.tuple.Tuple;
 import backtype.storm.tuple.Values;
 
-import com.apache.metron.helpers.topology.ErrorGenerator;
-import com.apache.metron.json.serialization.JSONEncoderHelper;
-import com.apache.metron.metrics.MetricReporter;
-import com.apache.metron.parser.interfaces.MessageFilter;
-import com.apache.metron.parser.interfaces.MessageParser;
+import org.apache.metron.helpers.topology.ErrorGenerator;
+import org.apache.metron.json.serialization.JSONEncoderHelper;
+import org.apache.metron.metrics.MetricReporter;
+import org.apache.metron.parser.interfaces.MessageFilter;
+import org.apache.metron.parser.interfaces.MessageParser;
 
 /**
  * Uses an adapter to parse a telemetry message from its native format into a
  * standard JSON. For a list of available adapter please check
- * com.apache.metron.parser.parsers. The input is a raw byte array and the output is a
+ * org.apache.metron.parser.parsers. The input is a raw byte array and the output is a
  * JSONObject
  * <p>
  * The parsing conventions are as follows:
@@ -106,7 +106,7 @@ public class TelemetryParserBolt extends AbstractParserBolt {
 
 	public TelemetryParserBolt withMetricConfig(Configuration config) {
 		this.metricConfiguration = JSONEncoderHelper.getJSON(config
-				.subset("com.apache.metron.metrics"));
+				.subset("org.apache.metron.metrics"));
 		return this;
 	}
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/AbstractParser.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/AbstractParser.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/AbstractParser.java
index 0716b01..bf8c596 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/AbstractParser.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/AbstractParser.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.apache.metron.parsing.parsers;
+package org.apache.metron.parsing.parsers;
 
 import java.io.Serializable;
 
@@ -23,8 +23,8 @@ import org.json.simple.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.apache.metron.parser.interfaces.MessageParser;
-import com.apache.metron.parsing.AbstractParserBolt;
+import org.apache.metron.parser.interfaces.MessageParser;
+import org.apache.metron.parsing.AbstractParserBolt;
 
 @SuppressWarnings("serial")
 public abstract class AbstractParser implements MessageParser, Serializable {

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicBroParser.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicBroParser.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicBroParser.java
index 207c0ba..cf6070a 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicBroParser.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicBroParser.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package com.apache.metron.parsing.parsers;
+package org.apache.metron.parsing.parsers;
 
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.apache.metron.tldextractor.BasicTldExtractor;
+import org.apache.metron.tldextractor.BasicTldExtractor;
 
 @SuppressWarnings("serial")
 public class BasicBroParser extends AbstractParser {

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicFireEyeParser.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicFireEyeParser.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicFireEyeParser.java
index bdd93ac..dbced1c 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicFireEyeParser.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicFireEyeParser.java
@@ -1,4 +1,4 @@
-package com.apache.metron.parsing.parsers;
+package org.apache.metron.parsing.parsers;
 
 import java.io.File;
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicIseParser.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicIseParser.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicIseParser.java
index a6ce23e..416491d 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicIseParser.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicIseParser.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.apache.metron.parsing.parsers;
+package org.apache.metron.parsing.parsers;
 
 import java.io.StringReader;
 
@@ -24,7 +24,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.esotericsoftware.minlog.Log;
-import com.apache.metron.ise.parser.ISEParser;
+import org.apache.metron.ise.parser.ISEParser;
 
 @SuppressWarnings("serial")
 public class BasicIseParser extends AbstractParser {

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicLancopeParser.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicLancopeParser.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicLancopeParser.java
index 33b273b..ab2a508 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicLancopeParser.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicLancopeParser.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.apache.metron.parsing.parsers;
+package org.apache.metron.parsing.parsers;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicLogstashParser.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicLogstashParser.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicLogstashParser.java
index 112eb02..39fe207 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicLogstashParser.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicLogstashParser.java
@@ -1,4 +1,4 @@
-package com.apache.metron.parsing.parsers;
+package org.apache.metron.parsing.parsers;
 
 import java.io.UnsupportedEncodingException;
 import java.text.SimpleDateFormat;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicPaloAltoFirewallParser.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicPaloAltoFirewallParser.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicPaloAltoFirewallParser.java
index b12d3eb..dd87130 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicPaloAltoFirewallParser.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicPaloAltoFirewallParser.java
@@ -1,4 +1,4 @@
-package com.apache.metron.parsing.parsers;
+package org.apache.metron.parsing.parsers;
 
 
 import org.json.simple.JSONObject;
@@ -6,7 +6,7 @@ import org.json.simple.JSONObject;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import com.apache.metron.parser.interfaces.MessageParser;
+import org.apache.metron.parser.interfaces.MessageParser;
 
 public class BasicPaloAltoFirewallParser extends AbstractParser implements MessageParser{
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicSourcefireParser.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicSourcefireParser.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicSourcefireParser.java
index 90c752f..3beed77 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicSourcefireParser.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/BasicSourcefireParser.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package com.apache.metron.parsing.parsers;
+package org.apache.metron.parsing.parsers;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.json.simple.JSONObject;
 
-import com.apache.metron.parser.interfaces.MessageParser;
+import org.apache.metron.parser.interfaces.MessageParser;
 
 @SuppressWarnings("serial")
 public class BasicSourcefireParser extends AbstractParser implements MessageParser{

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/GrokAsaParser.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/GrokAsaParser.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/GrokAsaParser.java
index f91d4db..1238899 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/GrokAsaParser.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/GrokAsaParser.java
@@ -1,4 +1,4 @@
-package com.apache.metron.parsing.parsers;
+package org.apache.metron.parsing.parsers;
 
 import java.io.File;
 import java.io.FileOutputStream;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/GrokSourcefireParser.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/GrokSourcefireParser.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/GrokSourcefireParser.java
index 12c0b62..98dcffa 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/GrokSourcefireParser.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/GrokSourcefireParser.java
@@ -1,4 +1,4 @@
-package com.apache.metron.parsing.parsers;
+package org.apache.metron.parsing.parsers;
 
 import java.net.URL;
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/GrokUtils.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/GrokUtils.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/GrokUtils.java
index b712795..b8a6f6b 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/GrokUtils.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/GrokUtils.java
@@ -1,4 +1,4 @@
-package com.apache.metron.parsing.parsers;
+package org.apache.metron.parsing.parsers;
 import java.io.Serializable;
 
 import com.google.code.regexp.Pattern;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/JSONCleaner.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/JSONCleaner.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/JSONCleaner.java
index 5de2ad7..1ab12bc 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/JSONCleaner.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/JSONCleaner.java
@@ -1,4 +1,4 @@
-package com.apache.metron.parsing.parsers;
+package org.apache.metron.parsing.parsers;
 
 import java.io.Serializable;
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/MetronConverter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/MetronConverter.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/MetronConverter.java
index e81a299..909a24a 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/MetronConverter.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/MetronConverter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.parsing.parsers;
+package org.apache.metron.parsing.parsers;
 
 import java.io.Serializable;
 import java.text.DateFormat;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/MetronGarbage.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/MetronGarbage.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/MetronGarbage.java
index f05a128..bb38a9b 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/MetronGarbage.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/MetronGarbage.java
@@ -1,4 +1,4 @@
-package com.apache.metron.parsing.parsers;
+package org.apache.metron.parsing.parsers;
 
 import java.io.Serializable;
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/MetronGrok.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/MetronGrok.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/MetronGrok.java
index 3830e6b..44d9312 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/MetronGrok.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/MetronGrok.java
@@ -1,4 +1,4 @@
-package com.apache.metron.parsing.parsers;
+package org.apache.metron.parsing.parsers;
 
 import java.io.BufferedReader;
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/MetronMatch.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/MetronMatch.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/MetronMatch.java
index 0360f8a..fc37465 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/MetronMatch.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/MetronMatch.java
@@ -1,4 +1,4 @@
-package com.apache.metron.parsing.parsers;
+package org.apache.metron.parsing.parsers;
 
 import java.io.Serializable;
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/ParserUtils.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/ParserUtils.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/ParserUtils.java
index e2d9780..a63889d 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/ParserUtils.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/ParserUtils.java
@@ -1,4 +1,4 @@
-package com.apache.metron.parsing.parsers;
+package org.apache.metron.parsing.parsers;
 
 import java.io.File;
 import java.io.FileOutputStream;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/PcapParser.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/PcapParser.java b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/PcapParser.java
index a3cdbda..a0cb8c8 100644
--- a/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/PcapParser.java
+++ b/metron-streaming/Metron-MessageParsers/src/main/java/org/apache/metron/parsing/parsers/PcapParser.java
@@ -1,4 +1,4 @@
-package com.apache.metron.parsing.parsers;
+package org.apache.metron.parsing.parsers;
 
 import java.io.EOFException;
 import java.io.File;
@@ -19,10 +19,10 @@ import org.krakenapps.pcap.packet.PacketHeader;
 import org.krakenapps.pcap.packet.PcapPacket;
 import org.krakenapps.pcap.util.Buffer;
 
-import com.apache.metron.pcap.Constants;
-import com.apache.metron.pcap.MetronEthernetDecoder;
-import com.apache.metron.pcap.PacketInfo;
-import com.apache.metron.pcap.PcapByteInputStream;
+import org.apache.metron.pcap.Constants;
+import org.apache.metron.pcap.MetronEthernetDecoder;
+import org.apache.metron.pcap.PacketInfo;
+import org.apache.metron.pcap.PcapByteInputStream;
 
 /**
  * The Class PcapParser.

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicBroParserTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicBroParserTest.java b/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicBroParserTest.java
index 50b50e2..7b05adf 100644
--- a/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicBroParserTest.java
+++ b/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicBroParserTest.java
@@ -1,4 +1,4 @@
-package com.apache.metron.parsing.test;
+package org.apache.metron.parsing.test;
 
 import java.util.Map;
 
@@ -9,7 +9,7 @@ import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
-import com.apache.metron.parsing.parsers.BasicBroParser;
+import org.apache.metron.parsing.parsers.BasicBroParser;
 
 public class BasicBroParserTest extends TestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicFireEyeParserTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicFireEyeParserTest.java b/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicFireEyeParserTest.java
index 7d72714..535093b 100644
--- a/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicFireEyeParserTest.java
+++ b/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicFireEyeParserTest.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.apache.metron.parsing.test;
+package org.apache.metron.parsing.test;
 
 
 
@@ -12,8 +12,8 @@ import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
-import com.apache.metron.parsing.parsers.BasicFireEyeParser;
-import com.apache.metron.test.AbstractConfigTest;
+import org.apache.metron.parsing.parsers.BasicFireEyeParser;
+import org.apache.metron.test.AbstractConfigTest;
 
 /**
  * <ul>
@@ -61,7 +61,7 @@ public class BasicFireEyeParserTest extends AbstractConfigTest
 	 * @throws java.lang.Exception
 	 */
 	public void setUp() throws Exception {
-        super.setUp("com.apache.metron.parsing.test.BasicFireEyeParserTest");
+        super.setUp("org.apache.metron.parsing.test.BasicFireEyeParserTest");
         setInputStrings(super.readTestDataFromFile(this.getConfig().getString("logFile")));
         parser = new BasicFireEyeParser();  
 	}
@@ -77,7 +77,7 @@ public class BasicFireEyeParserTest extends AbstractConfigTest
 	}
 
 	/**
-	 * Test method for {@link com.apache.metron.parsing.parsers.BasicFireEyeParser#parse(java.lang.String)}.
+	 * Test method for {@link org.apache.metron.parsing.parsers.BasicFireEyeParser#parse(java.lang.String)}.
 	 */
 	@SuppressWarnings({ "rawtypes"})
 	public void testParse() {

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicIseParserTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicIseParserTest.java b/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicIseParserTest.java
index 7343ad7..1f34875 100644
--- a/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicIseParserTest.java
+++ b/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicIseParserTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apache.metron.parsing.test;
+package org.apache.metron.parsing.test;
 
 import java.io.IOException;
 import java.net.URL;
@@ -24,8 +24,8 @@ import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
-import com.apache.metron.parsing.parsers.BasicIseParser;
-import com.apache.metron.test.AbstractSchemaTest;
+import org.apache.metron.parsing.parsers.BasicIseParser;
+import org.apache.metron.test.AbstractSchemaTest;
 
 
 /**
@@ -81,7 +81,7 @@ public class BasicIseParserTest extends AbstractSchemaTest {
 	 */
 
 	protected void setUp() throws Exception {
-        super.setUp("com.apache.metron.parsing.test.BasicLancopeParserTest");
+        super.setUp("org.apache.metron.parsing.test.BasicLancopeParserTest");
         setInputStrings(super.readTestDataFromFile(this.getConfig().getString("logFile")));
         BasicIseParserTest.setIseParser(new BasicIseParser());
 		
@@ -102,7 +102,7 @@ public class BasicIseParserTest extends AbstractSchemaTest {
 
 	/**
 	 * Test method for
-	 * {@link com.apache.metron.parsing.parsers.BasicIseParser#parse(byte[])}.
+	 * {@link org.apache.metron.parsing.parsers.BasicIseParser#parse(byte[])}.
 	 * 
 	 * @throws IOException
 	 * @throws Exception

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicLancopeParserTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicLancopeParserTest.java b/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicLancopeParserTest.java
index 93b6d25..dcab342 100644
--- a/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicLancopeParserTest.java
+++ b/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicLancopeParserTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apache.metron.parsing.test;
+package org.apache.metron.parsing.test;
 
 import java.io.IOException;
 import java.net.URL;
@@ -24,8 +24,8 @@ import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
-import com.apache.metron.parsing.parsers.BasicLancopeParser;
-import com.apache.metron.test.AbstractSchemaTest;
+import org.apache.metron.parsing.parsers.BasicLancopeParser;
+import org.apache.metron.test.AbstractSchemaTest;
 
  /**
  * <ul>
@@ -77,7 +77,7 @@ public class BasicLancopeParserTest extends AbstractSchemaTest {
      */
 
     protected void setUp() throws Exception {
-        super.setUp("com.apache.metron.parsing.test.BasicLancopeParserTest");
+        super.setUp("org.apache.metron.parsing.test.BasicLancopeParserTest");
         setInputStrings(super.readTestDataFromFile(this.getConfig().getString("logFile")));
         BasicLancopeParserTest.setParser(new BasicLancopeParser());   
         
@@ -96,7 +96,7 @@ public class BasicLancopeParserTest extends AbstractSchemaTest {
     }
 
     /**
-     * Test method for {@link com.apache.metron.parsing.parsers.BasicLancopeParser#parse(byte[])}.
+     * Test method for {@link org.apache.metron.parsing.parsers.BasicLancopeParser#parse(byte[])}.
      * @throws Exception 
      * @throws IOException 
      */

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicPaloAltoFirewallParserTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicPaloAltoFirewallParserTest.java b/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicPaloAltoFirewallParserTest.java
index 7ed17ee..e04e2a6 100644
--- a/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicPaloAltoFirewallParserTest.java
+++ b/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicPaloAltoFirewallParserTest.java
@@ -1,4 +1,4 @@
-package com.apache.metron.parsing.test;
+package org.apache.metron.parsing.test;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -7,8 +7,8 @@ import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
-import com.apache.metron.parsing.parsers.BasicPaloAltoFirewallParser;
-import com.apache.metron.test.AbstractConfigTest;
+import org.apache.metron.parsing.parsers.BasicPaloAltoFirewallParser;
+import org.apache.metron.test.AbstractConfigTest;
 
 public class BasicPaloAltoFirewallParserTest extends AbstractConfigTest {
     /**
@@ -56,7 +56,7 @@ public class BasicPaloAltoFirewallParserTest extends AbstractConfigTest {
 		 * @throws java.lang.Exception
 		 */
 		public void setUp() throws Exception {
-	          super.setUp("com.apache.metron.parsing.test.BasicPaloAltoFirewallParserTest");
+	          super.setUp("org.apache.metron.parsing.test.BasicPaloAltoFirewallParserTest");
 	          setPAStrings(super.readTestDataFromFile(this.getConfig().getString("logFile")));
 	          paParser = new BasicPaloAltoFirewallParser();           
 		}
@@ -71,7 +71,7 @@ public class BasicPaloAltoFirewallParserTest extends AbstractConfigTest {
 		}
 
 		/**
-		 * Test method for {@link com.apache.metron.parsing.parsers.BasicSourcefireParser#parse(java.lang.String)}.
+		 * Test method for {@link org.apache.metron.parsing.parsers.BasicSourcefireParser#parse(java.lang.String)}.
 		 */
 		@SuppressWarnings({ "rawtypes" })
 		public void testParse() {

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicSourcefireParserTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicSourcefireParserTest.java b/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicSourcefireParserTest.java
index 3e7deff..c9d1614 100644
--- a/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicSourcefireParserTest.java
+++ b/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BasicSourcefireParserTest.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.apache.metron.parsing.test;
+package org.apache.metron.parsing.test;
 
 
 
@@ -12,8 +12,8 @@ import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
-import com.apache.metron.parsing.parsers.BasicSourcefireParser;
-import com.apache.metron.test.AbstractConfigTest;
+import org.apache.metron.parsing.parsers.BasicSourcefireParser;
+import org.apache.metron.test.AbstractConfigTest;
 
 /**
  * <ul>
@@ -62,7 +62,7 @@ public class BasicSourcefireParserTest extends AbstractConfigTest
 	 * @throws java.lang.Exception
 	 */
 	public void setUp() throws Exception {
-        super.setUp("com.apache.metron.parsing.test.BasicSoureceFireParserTest");
+        super.setUp("org.apache.metron.parsing.test.BasicSoureceFireParserTest");
         setSourceFireStrings(super.readTestDataFromFile(this.getConfig().getString("logFile")));
         sourceFireParser = new BasicSourcefireParser();
 	}
@@ -77,7 +77,7 @@ public class BasicSourcefireParserTest extends AbstractConfigTest
 	}
 
 	/**
-	 * Test method for {@link com.apache.metron.parsing.parsers.BasicSourcefireParser#parse(java.lang.String)}.
+	 * Test method for {@link org.apache.metron.parsing.parsers.BasicSourcefireParser#parse(java.lang.String)}.
 	 */
 	@SuppressWarnings({ "rawtypes", "unused" })
 	public void testParse() {

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BroParserTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BroParserTest.java b/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BroParserTest.java
index 05a9380..a99f705 100644
--- a/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BroParserTest.java
+++ b/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/BroParserTest.java
@@ -1,4 +1,4 @@
-package com.apache.metron.parsing.test;
+package org.apache.metron.parsing.test;
 
 
 import java.util.HashMap;
@@ -11,8 +11,8 @@ import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
-import com.apache.metron.parsing.parsers.BasicBroParser;
-import com.apache.metron.test.AbstractConfigTest;
+import org.apache.metron.parsing.parsers.BasicBroParser;
+import org.apache.metron.test.AbstractConfigTest;
 
 /**
  * <ul>
@@ -70,7 +70,7 @@ public class BroParserTest extends AbstractConfigTest {
 	 * @throws java.lang.Exception
 	 */
 	public void setUp() throws Exception {
-        super.setUp("com.apache.metron.parsing.test.BroParserTest");
+        super.setUp("org.apache.metron.parsing.test.BroParserTest");
         setInputStrings(super.readTestDataFromFile(this.getConfig().getString("logFile")));
         parser = new BasicBroParser();  
 	}

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/GrokAsaParserTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/GrokAsaParserTest.java b/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/GrokAsaParserTest.java
index d6a31af..72bb819 100644
--- a/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/GrokAsaParserTest.java
+++ b/metron-streaming/Metron-MessageParsers/src/test/java/org/apache/metron/parsing/test/GrokAsaParserTest.java
@@ -1,4 +1,4 @@
-package com.apache.metron.parsing.test;
+package org.apache.metron.parsing.test;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -7,8 +7,8 @@ import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
-import com.apache.metron.parsing.parsers.GrokAsaParser;
-import com.apache.metron.test.AbstractConfigTest;
+import org.apache.metron.parsing.parsers.GrokAsaParser;
+import org.apache.metron.test.AbstractConfigTest;
 
 
  /**
@@ -59,7 +59,7 @@ public class GrokAsaParserTest extends AbstractConfigTest{
      * @see junit.framework.TestCase#setUp()
      */
 	public void setUp() throws Exception {
-          super.setUp("com.apache.metron.parsing.test.GrokAsaParserTest");
+          super.setUp("org.apache.metron.parsing.test.GrokAsaParserTest");
           setGrokAsaStrings(super.readTestDataFromFile(this.getConfig().getString("logFile")));
           grokAsaParser = new GrokAsaParser();		
 	}
@@ -74,7 +74,7 @@ public class GrokAsaParserTest extends AbstractConfigTest{
 		}
 
 		/**
-		 * Test method for {@link com.apache.metron.parsing.parsers.BasicSourcefireParser#parse(java.lang.String)}.
+		 * Test method for {@link org.apache.metron.parsing.parsers.BasicSourcefireParser#parse(java.lang.String)}.
 		 */
 		@SuppressWarnings({ "rawtypes" })
 		public void testParse() {

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/pom.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/pom.xml b/metron-streaming/Metron-Pcap_Service/pom.xml
index 40498be..40a9dea 100644
--- a/metron-streaming/Metron-Pcap_Service/pom.xml
+++ b/metron-streaming/Metron-Pcap_Service/pom.xml
@@ -2,7 +2,7 @@
 	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.apache.metron</groupId>
+		<groupId>org.apache.metron</groupId>
 		<artifactId>Metron-Streaming</artifactId>
 		<version>0.6BETA</version>
 	</parent>
@@ -47,7 +47,7 @@
 			<version>3.0.4.Final</version>
 		</dependency>
 		<dependency>
-			<groupId>com.apache.metron</groupId>
+			<groupId>org.apache.metron</groupId>
 			<artifactId>Metron-Common</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
@@ -245,7 +245,7 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>com.apache.metron.pcapservice.rest.PcapService</mainClass>
+							<mainClass>org.apache.metron.pcapservice.rest.PcapService</mainClass>
 						</manifest>
 					</archive>
 					<descriptorRefs>

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/CellTimestampComparator.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/CellTimestampComparator.java b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/CellTimestampComparator.java
index 43a4f28..060a1c2 100644
--- a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/CellTimestampComparator.java
+++ b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/CellTimestampComparator.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcapservice;
+package org.apache.metron.pcapservice;
 
 import java.util.Comparator;
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/ConfigurationUtil.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/ConfigurationUtil.java b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/ConfigurationUtil.java
index 51f85fe..fa5568c 100644
--- a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/ConfigurationUtil.java
+++ b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/ConfigurationUtil.java
@@ -1,10 +1,10 @@
-package com.apache.metron.pcapservice;
+package org.apache.metron.pcapservice;
 
 import org.apache.commons.configuration.Configuration;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.springframework.util.Assert;
 
-import com.apache.metron.configuration.ConfigurationManager;
+import org.apache.metron.configuration.ConfigurationManager;
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/HBaseConfigConstants.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/HBaseConfigConstants.java b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/HBaseConfigConstants.java
index bd3eecb..8028143 100644
--- a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/HBaseConfigConstants.java
+++ b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/HBaseConfigConstants.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcapservice;
+package org.apache.metron.pcapservice;
 
 /**
  * HBase configuration properties.

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/HBaseConfigurationUtil.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/HBaseConfigurationUtil.java b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/HBaseConfigurationUtil.java
index 6061a5d..783dc07 100644
--- a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/HBaseConfigurationUtil.java
+++ b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/HBaseConfigurationUtil.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.apache.metron.pcapservice;
+package org.apache.metron.pcapservice;
 
 import java.io.IOException;
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/IPcapGetter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/IPcapGetter.java b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/IPcapGetter.java
index 3bb10c2..5907f9b 100644
--- a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/IPcapGetter.java
+++ b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/IPcapGetter.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.apache.metron.pcapservice;
+package org.apache.metron.pcapservice;
 
 import java.io.IOException;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/IPcapScanner.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/IPcapScanner.java b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/IPcapScanner.java
index 195c5d6..4af838e 100644
--- a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/IPcapScanner.java
+++ b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/IPcapScanner.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcapservice;
+package org.apache.metron.pcapservice;
 
 import java.io.IOException;
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapGetterHBaseImpl.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapGetterHBaseImpl.java b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapGetterHBaseImpl.java
index d45a7e9..91272f5 100644
--- a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapGetterHBaseImpl.java
+++ b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapGetterHBaseImpl.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcapservice;
+package org.apache.metron.pcapservice;
 
 import java.io.File;
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapHelper.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapHelper.java b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapHelper.java
index 6018065..c87b9e0 100644
--- a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapHelper.java
+++ b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapHelper.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcapservice;
+package org.apache.metron.pcapservice;
 
 import java.util.ArrayList;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapReceiverImplRestEasy.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapReceiverImplRestEasy.java b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapReceiverImplRestEasy.java
index 3eaeb20..a6f9e7a 100644
--- a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapReceiverImplRestEasy.java
+++ b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapReceiverImplRestEasy.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcapservice;
+package org.apache.metron.pcapservice;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -18,7 +18,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.apache.metron.pcap.PcapUtils;
+import org.apache.metron.pcap.PcapUtils;
 
 @Path("/")
 public class PcapReceiverImplRestEasy {

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapScannerHBaseImpl.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapScannerHBaseImpl.java b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapScannerHBaseImpl.java
index e32b80e..5c04adf 100644
--- a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapScannerHBaseImpl.java
+++ b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapScannerHBaseImpl.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcapservice;
+package org.apache.metron.pcapservice;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -20,7 +20,7 @@ import org.apache.log4j.Logger;
 import org.springframework.util.Assert;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.apache.metron.pcap.PcapMerger;
+import org.apache.metron.pcap.PcapMerger;
 
 /**
  * Singleton class which integrates with HBase table and returns sorted pcaps

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapsResponse.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapsResponse.java b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapsResponse.java
index ea004e9..d0538a3 100644
--- a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapsResponse.java
+++ b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/PcapsResponse.java
@@ -1,14 +1,14 @@
 /**
  * 
  */
-package com.apache.metron.pcapservice;
+package org.apache.metron.pcapservice;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.apache.metron.pcap.PcapMerger;
+import org.apache.metron.pcap.PcapMerger;
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/RestTestingUtil.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/RestTestingUtil.java b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/RestTestingUtil.java
index baf6285..4dba86b 100644
--- a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/RestTestingUtil.java
+++ b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/RestTestingUtil.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcapservice;
+package org.apache.metron.pcapservice;
 
 import java.util.HashMap;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/rest/JettyServiceRunner.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/rest/JettyServiceRunner.java b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/rest/JettyServiceRunner.java
index 83709ea..c690cac 100644
--- a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/rest/JettyServiceRunner.java
+++ b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/rest/JettyServiceRunner.java
@@ -1,11 +1,11 @@
-package com.apache.metron.pcapservice.rest;
+package org.apache.metron.pcapservice.rest;
 
 import java.util.HashSet;
 import java.util.Set;
 
 import javax.ws.rs.core.Application;
 
-import com.apache.metron.pcapservice.PcapReceiverImplRestEasy;
+import org.apache.metron.pcapservice.PcapReceiverImplRestEasy;
 
 public class JettyServiceRunner extends Application  {
 	

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/rest/PcapService.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/rest/PcapService.java b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/rest/PcapService.java
index c8f4a20..5bca9ed 100644
--- a/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/rest/PcapService.java
+++ b/metron-streaming/Metron-Pcap_Service/src/main/java/org/apache/metron/pcapservice/rest/PcapService.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcapservice.rest;
+package org.apache.metron.pcapservice.rest;
 
 import java.io.IOException;
 
@@ -7,7 +7,7 @@ import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher;
 
-import com.apache.metron.helpers.services.PcapServiceCli;
+import org.apache.metron.helpers.services.PcapServiceCli;
 
 
 public class PcapService {
@@ -21,7 +21,7 @@ public class PcapService {
 		ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
 		context.setContextPath("/");
 		ServletHolder h = new ServletHolder(new HttpServletDispatcher());
-		h.setInitParameter("javax.ws.rs.Application", "com.apache.metron.pcapservice.rest.JettyServiceRunner");
+		h.setInitParameter("javax.ws.rs.Application", "org.apache.metron.pcapservice.rest.JettyServiceRunner");
 		context.addServlet(h, "/*");
 		server.setHandler(context);
 		try {

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/CellTimestampComparatorTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/CellTimestampComparatorTest.java b/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/CellTimestampComparatorTest.java
index db38f7c..19ad755 100644
--- a/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/CellTimestampComparatorTest.java
+++ b/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/CellTimestampComparatorTest.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcapservice;
+package org.apache.metron.pcapservice;
 
 import junit.framework.Assert;
 
@@ -8,7 +8,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import com.apache.metron.pcapservice.CellTimestampComparator;
+import org.apache.metron.pcapservice.CellTimestampComparator;
 
 /**
  * The Class CellTimestampComparatorTest.

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/ConfigurationUtilTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/ConfigurationUtilTest.java b/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/ConfigurationUtilTest.java
index 4577cb4..f995e3f 100644
--- a/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/ConfigurationUtilTest.java
+++ b/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/ConfigurationUtilTest.java
@@ -1,10 +1,10 @@
-package com.apache.metron.pcapservice;
+package org.apache.metron.pcapservice;
 
 import org.eclipse.jdt.internal.core.Assert;
 import org.junit.Test;
 
-import com.apache.metron.pcapservice.ConfigurationUtil;
-import com.apache.metron.pcapservice.ConfigurationUtil.SizeUnit;
+import org.apache.metron.pcapservice.ConfigurationUtil;
+import org.apache.metron.pcapservice.ConfigurationUtil.SizeUnit;
 
 /**
  * The Class ConfigurationUtilTest.

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/HBaseConfigurationUtilTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/HBaseConfigurationUtilTest.java b/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/HBaseConfigurationUtilTest.java
index 38c2c90..8adb5f3 100644
--- a/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/HBaseConfigurationUtilTest.java
+++ b/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/HBaseConfigurationUtilTest.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcapservice;
+package org.apache.metron.pcapservice;
 
 import java.io.IOException;
 
@@ -8,7 +8,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.util.Assert;
 
-import com.apache.metron.pcapservice.HBaseConfigurationUtil;
+import org.apache.metron.pcapservice.HBaseConfigurationUtil;
 
 /**
  * The Class HBaseConfigurationUtilTest.

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/HBaseIntegrationTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/HBaseIntegrationTest.java b/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/HBaseIntegrationTest.java
index acf9ae8..6a25599 100644
--- a/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/HBaseIntegrationTest.java
+++ b/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/HBaseIntegrationTest.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.apache.metron.pcapservice;
+package org.apache.metron.pcapservice;
 
 import java.io.IOException;
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/PcapGetterHBaseImplTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/PcapGetterHBaseImplTest.java b/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/PcapGetterHBaseImplTest.java
index 4456bcf..38a3759 100644
--- a/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/PcapGetterHBaseImplTest.java
+++ b/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/PcapGetterHBaseImplTest.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcapservice;
+package org.apache.metron.pcapservice;
 
 import java.io.File;
 import java.io.IOException;
@@ -19,8 +19,8 @@ import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.util.Assert;
 
-import com.apache.metron.pcapservice.PcapGetterHBaseImpl;
-import com.apache.metron.pcapservice.PcapsResponse;
+import org.apache.metron.pcapservice.PcapGetterHBaseImpl;
+import org.apache.metron.pcapservice.PcapsResponse;
 
 /**
  * The Class PcapGetterHBaseImplTest.

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/PcapHelperTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/PcapHelperTest.java b/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/PcapHelperTest.java
index c013abe..354a3a7 100644
--- a/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/PcapHelperTest.java
+++ b/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/PcapHelperTest.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.apache.metron.pcapservice;
+package org.apache.metron.pcapservice;
 
 import java.util.Arrays;
 import java.util.List;
@@ -15,8 +15,8 @@ import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import com.apache.metron.pcapservice.PcapHelper;
-import com.apache.metron.pcapservice.PcapHelper.TimeUnit;
+import org.apache.metron.pcapservice.PcapHelper;
+import org.apache.metron.pcapservice.PcapHelper.TimeUnit;
 
 // TODO: Auto-generated Javadoc
 /**

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/PcapScannerHBaseImplTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/PcapScannerHBaseImplTest.java b/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/PcapScannerHBaseImplTest.java
index 8c473f6..c2defa8 100644
--- a/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/PcapScannerHBaseImplTest.java
+++ b/metron-streaming/Metron-Pcap_Service/src/test/java/org/apache/metron/pcapservice/PcapScannerHBaseImplTest.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcapservice;
+package org.apache.metron.pcapservice;
 
 import java.io.File;
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/pom.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/pom.xml b/metron-streaming/Metron-Topologies/pom.xml
index e917f94..9437fc6 100644
--- a/metron-streaming/Metron-Topologies/pom.xml
+++ b/metron-streaming/Metron-Topologies/pom.xml
@@ -13,7 +13,7 @@
 	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.apache.metron</groupId>
+		<groupId>org.apache.metron</groupId>
 		<artifactId>Metron-Streaming</artifactId>
 		<version>0.6BETA</version>
 	</parent>
@@ -33,27 +33,27 @@
 	</repositories>
 	<dependencies>
 		<dependency>
-			<groupId>com.apache.metron</groupId>
+			<groupId>org.apache.metron</groupId>
 			<artifactId>Metron-Common</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.apache.metron</groupId>
+			<groupId>org.apache.metron</groupId>
 			<artifactId>Metron-Alerts</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.apache.metron</groupId>
+			<groupId>org.apache.metron</groupId>
 			<artifactId>Metron-EnrichmentAdapters</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.apache.metron</groupId>
+			<groupId>org.apache.metron</groupId>
 			<artifactId>Metron-MessageParsers</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.apache.metron</groupId>
+			<groupId>org.apache.metron</groupId>
 			<artifactId>Metron-Indexing</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/readme.md
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/readme.md b/metron-streaming/Metron-Topologies/readme.md
index f3641b8..586c166 100644
--- a/metron-streaming/Metron-Topologies/readme.md
+++ b/metron-streaming/Metron-Topologies/readme.md
@@ -9,10 +9,10 @@ This module provides example topologies that show how to drive Metron modules an
 
 ```
 
-storm jar Metron-Topologies-0.6BETA.jar com.apache.metron.topology.Pcap
-storm jar Metron-Topologies-0.6BETA.jar com.apache.metron.topology.Sourcefire
-storm jar Metron-Topologies-0.6BETA.jar com.apache.metron.topology.Lancope
-storm jar Metron-Topologies-0.6BETA.jar com.apache.metron.topology.Ise
+storm jar Metron-Topologies-0.6BETA.jar org.apache.metron.topology.Pcap
+storm jar Metron-Topologies-0.6BETA.jar org.apache.metron.topology.Sourcefire
+storm jar Metron-Topologies-0.6BETA.jar org.apache.metron.topology.Lancope
+storm jar Metron-Topologies-0.6BETA.jar org.apache.metron.topology.Ise
 
 Topology Options:
 -config_path <arg>       OPTIONAL ARGUMENT [/path/to/configs] Path to

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/test/bolts/PrintingBolt.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/test/bolts/PrintingBolt.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/test/bolts/PrintingBolt.java
index 4938585..6d08823 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/test/bolts/PrintingBolt.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/test/bolts/PrintingBolt.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.apache.metron.test.bolts;
+package org.apache.metron.test.bolts;
 
 import java.util.Map;
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/test/filereaders/FileReader.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/test/filereaders/FileReader.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/test/filereaders/FileReader.java
index 886baca..998e8c9 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/test/filereaders/FileReader.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/test/filereaders/FileReader.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.apache.metron.test.filereaders;
+package org.apache.metron.test.filereaders;
 
 import java.io.BufferedReader;
 import java.io.DataInputStream;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/test/spouts/GenericInternalTestSpout.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/test/spouts/GenericInternalTestSpout.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/test/spouts/GenericInternalTestSpout.java
index 0f52e26..c5233b5 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/test/spouts/GenericInternalTestSpout.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/test/spouts/GenericInternalTestSpout.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package com.apache.metron.test.spouts;
+package org.apache.metron.test.spouts;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
-import com.apache.metron.test.filereaders.FileReader;
+import org.apache.metron.test.filereaders.FileReader;
 
 import backtype.storm.spout.SpoutOutputCollector;
 import backtype.storm.task.TopologyContext;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/test/spouts/PcapSimulatorSpout.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/test/spouts/PcapSimulatorSpout.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/test/spouts/PcapSimulatorSpout.java
index 6e47b95..29f9ec3 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/test/spouts/PcapSimulatorSpout.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/test/spouts/PcapSimulatorSpout.java
@@ -1,4 +1,4 @@
-package com.apache.metron.test.spouts;
+package org.apache.metron.test.spouts;
 
 import java.util.Map;
 import java.util.Random;
@@ -9,7 +9,7 @@ import backtype.storm.topology.OutputFieldsDeclarer;
 import backtype.storm.topology.base.BaseRichSpout;
 import backtype.storm.tuple.Fields;
 import backtype.storm.tuple.Values;
-import com.apache.metron.pcap.PcapUtils;
+import org.apache.metron.pcap.PcapUtils;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Asa.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Asa.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Asa.java
index ed27764..4163f53 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Asa.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Asa.java
@@ -15,14 +15,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apache.metron.topology;
+package org.apache.metron.topology;
 
 import org.apache.commons.configuration.ConfigurationException;
 
 import backtype.storm.generated.InvalidTopologyException;
 
-import com.apache.metron.topology.runner.AsaRunner;
-import com.apache.metron.topology.runner.TopologyRunner;
+import org.apache.metron.topology.runner.AsaRunner;
+import org.apache.metron.topology.runner.TopologyRunner;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Bro.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Bro.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Bro.java
index f246adb..5021f8a 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Bro.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Bro.java
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-package com.apache.metron.topology;
+package org.apache.metron.topology;
 
 import org.apache.commons.configuration.ConfigurationException;
 
 import backtype.storm.generated.InvalidTopologyException;
 
-import com.apache.metron.topology.runner.BroRunner;
-import com.apache.metron.topology.runner.TopologyRunner;
+import org.apache.metron.topology.runner.BroRunner;
+import org.apache.metron.topology.runner.TopologyRunner;
 
 public class Bro{
 	

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/FireEye.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/FireEye.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/FireEye.java
index 2a7a294..9524205 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/FireEye.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/FireEye.java
@@ -1,9 +1,9 @@
-package com.apache.metron.topology;
+package org.apache.metron.topology;
 
 import org.apache.commons.configuration.ConfigurationException;
 import backtype.storm.generated.InvalidTopologyException;
-import com.apache.metron.topology.runner.FireEyeRunner;
-import com.apache.metron.topology.runner.TopologyRunner;
+import org.apache.metron.topology.runner.FireEyeRunner;
+import org.apache.metron.topology.runner.TopologyRunner;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Ise.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Ise.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Ise.java
index 85099a8..3970e3c 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Ise.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Ise.java
@@ -15,14 +15,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apache.metron.topology;
+package org.apache.metron.topology;
 
 import org.apache.commons.configuration.ConfigurationException;
 
 import backtype.storm.generated.InvalidTopologyException;
 
-import com.apache.metron.topology.runner.ISERunner;
-import com.apache.metron.topology.runner.TopologyRunner;
+import org.apache.metron.topology.runner.ISERunner;
+import org.apache.metron.topology.runner.TopologyRunner;
 
 /**
  * Topology for processing Ise messages

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Lancope.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Lancope.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Lancope.java
index 39cd646..4e68487 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Lancope.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Lancope.java
@@ -15,14 +15,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apache.metron.topology;
+package org.apache.metron.topology;
 
 import org.apache.commons.configuration.ConfigurationException;
 
 import backtype.storm.generated.InvalidTopologyException;
 
-import com.apache.metron.topology.runner.LancopeRunner;
-import com.apache.metron.topology.runner.TopologyRunner;
+import org.apache.metron.topology.runner.LancopeRunner;
+import org.apache.metron.topology.runner.TopologyRunner;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/PaloAltoFirewall.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/PaloAltoFirewall.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/PaloAltoFirewall.java
index 822bd60..7df0e0a 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/PaloAltoFirewall.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/PaloAltoFirewall.java
@@ -15,15 +15,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apache.metron.topology;
+package org.apache.metron.topology;
 
 import org.apache.commons.configuration.ConfigurationException;
 
 import backtype.storm.generated.InvalidTopologyException;
 
-import com.apache.metron.topology.runner.AsaRunner;
-import com.apache.metron.topology.runner.PaloAltoFirewallRunner;
-import com.apache.metron.topology.runner.TopologyRunner;
+import org.apache.metron.topology.runner.AsaRunner;
+import org.apache.metron.topology.runner.PaloAltoFirewallRunner;
+import org.apache.metron.topology.runner.TopologyRunner;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Pcap.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Pcap.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Pcap.java
index e01009c..bae475c 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Pcap.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Pcap.java
@@ -15,14 +15,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apache.metron.topology;
+package org.apache.metron.topology;
 
 import org.apache.commons.configuration.ConfigurationException;
 
 import backtype.storm.generated.InvalidTopologyException;
 
-import com.apache.metron.topology.runner.PcapRunner;
-import com.apache.metron.topology.runner.TopologyRunner;
+import org.apache.metron.topology.runner.PcapRunner;
+import org.apache.metron.topology.runner.TopologyRunner;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Sourcefire.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Sourcefire.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Sourcefire.java
index b8530a6..da45b08 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Sourcefire.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/Sourcefire.java
@@ -15,12 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apache.metron.topology;
+package org.apache.metron.topology;
 
 import org.apache.commons.configuration.ConfigurationException;
 
-import com.apache.metron.topology.runner.SourcefireRunner;
-import com.apache.metron.topology.runner.TopologyRunner;
+import org.apache.metron.topology.runner.SourcefireRunner;
+import org.apache.metron.topology.runner.TopologyRunner;
 
 import backtype.storm.generated.InvalidTopologyException;
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/AsaRunner.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/AsaRunner.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/AsaRunner.java
index 4c4dcb5..138d4e3 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/AsaRunner.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/AsaRunner.java
@@ -15,13 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apache.metron.topology.runner;
+package org.apache.metron.topology.runner;
 
-import com.apache.metron.filters.GenericMessageFilter;
-import com.apache.metron.parser.interfaces.MessageParser;
-import com.apache.metron.parsing.AbstractParserBolt;
-import com.apache.metron.parsing.TelemetryParserBolt;
-import com.apache.metron.test.spouts.GenericInternalTestSpout;
+import org.apache.metron.filters.GenericMessageFilter;
+import org.apache.metron.parser.interfaces.MessageParser;
+import org.apache.metron.parsing.AbstractParserBolt;
+import org.apache.metron.parsing.TelemetryParserBolt;
+import org.apache.metron.test.spouts.GenericInternalTestSpout;
 
 public class AsaRunner extends TopologyRunner{
 	

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/BroRunner.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/BroRunner.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/BroRunner.java
index fee72cd..ea26d0d 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/BroRunner.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/BroRunner.java
@@ -15,13 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apache.metron.topology.runner;
+package org.apache.metron.topology.runner;
 
-import com.apache.metron.filters.GenericMessageFilter;
-import com.apache.metron.parser.interfaces.MessageParser;
-import com.apache.metron.parsing.AbstractParserBolt;
-import com.apache.metron.parsing.TelemetryParserBolt;
-import com.apache.metron.test.spouts.GenericInternalTestSpout;
+import org.apache.metron.filters.GenericMessageFilter;
+import org.apache.metron.parser.interfaces.MessageParser;
+import org.apache.metron.parsing.AbstractParserBolt;
+import org.apache.metron.parsing.TelemetryParserBolt;
+import org.apache.metron.test.spouts.GenericInternalTestSpout;
 
 public class BroRunner extends TopologyRunner{
 	



Mime
View raw message