metron-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ceste...@apache.org
Subject [79/89] [abbrv] incubator-metron git commit: Rename com.apache to org.apache
Date Tue, 26 Jan 2016 14:18:57 GMT
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataLoads/src/main/java/org/apache/metron/dataloads/ThreatIntelLoader.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataLoads/src/main/java/org/apache/metron/dataloads/ThreatIntelLoader.java b/metron-streaming/Metron-DataLoads/src/main/java/org/apache/metron/dataloads/ThreatIntelLoader.java
index 3e08b30..cc04a5d 100644
--- a/metron-streaming/Metron-DataLoads/src/main/java/org/apache/metron/dataloads/ThreatIntelLoader.java
+++ b/metron-streaming/Metron-DataLoads/src/main/java/org/apache/metron/dataloads/ThreatIntelLoader.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataloads;
+package org.apache.metron.dataloads;
 
 
 import java.io.File;
@@ -22,7 +22,7 @@ import org.apache.log4j.Logger;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONArray;
 
-import com.apache.metron.dataloads.interfaces.ThreatIntelSource;
+import org.apache.metron.dataloads.interfaces.ThreatIntelSource;
 
 public class ThreatIntelLoader {
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataLoads/src/main/java/org/apache/metron/dataloads/cif/HBaseTableLoad.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataLoads/src/main/java/org/apache/metron/dataloads/cif/HBaseTableLoad.java b/metron-streaming/Metron-DataLoads/src/main/java/org/apache/metron/dataloads/cif/HBaseTableLoad.java
index 9fb06b1..0af0e6a 100644
--- a/metron-streaming/Metron-DataLoads/src/main/java/org/apache/metron/dataloads/cif/HBaseTableLoad.java
+++ b/metron-streaming/Metron-DataLoads/src/main/java/org/apache/metron/dataloads/cif/HBaseTableLoad.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataloads.cif;
+package org.apache.metron.dataloads.cif;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -161,7 +161,7 @@ public class HBaseTableLoad {
 
 	private void printUsage() {
 		System.out
-				.println("Usage: java -cp JarFile com.apache.metron.dataloads.cif.HBaseTableLoad -d <directory> -t <tablename> -f <optional file-list>");
+				.println("Usage: java -cp JarFile org.apache.metron.dataloads.cif.HBaseTableLoad -d <directory> -t <tablename> -f <optional file-list>");
 	}
 
 	private void parse(String[] args) {

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/pom.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/pom.xml b/metron-streaming/Metron-DataServices/pom.xml
index f8ed750..b96e6dd 100644
--- a/metron-streaming/Metron-DataServices/pom.xml
+++ b/metron-streaming/Metron-DataServices/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">
 
 	<parent>
-		<groupId>com.apache.metron</groupId>
+		<groupId>org.apache.metron</groupId>
 		<artifactId>Metron-Streaming</artifactId>
 		<version>0.6BETA</version>
 	</parent>
@@ -42,7 +42,7 @@
 		</dependency>
 
 		<dependency>
-			<groupId>com.apache.metron</groupId>
+			<groupId>org.apache.metron</groupId>
 			<artifactId>Metron-Common</artifactId>
 			<version>${parent.version}</version>
 		</dependency>
@@ -461,7 +461,7 @@
 					<archive>
 						<manifest>
 							<addClasspath>true</addClasspath>
-							<mainClass>com.apache.metron.dataservices.Main</mainClass>
+							<mainClass>org.apache.metron.dataservices.Main</mainClass>
 						</manifest>
 					</archive>
 				</configuration>
@@ -472,7 +472,7 @@
 				<configuration>
 					<archive>
 						<manifest>
-							<mainClass>com.apache.metron.dataservices.Main</mainClass>
+							<mainClass>org.apache.metron.dataservices.Main</mainClass>
 						</manifest>
 					</archive>
 					<descriptorRefs>
@@ -494,7 +494,7 @@
 				<artifactId>exec-maven-plugin</artifactId>
 				<version>1.2.1</version>
 				<configuration>
-					<mainClass>com.apache.metron.dataservices.Main</mainClass>
+					<mainClass>org.apache.metron.dataservices.Main</mainClass>
 				</configuration>
 			</plugin>
 		</plugins>

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/alerts/server/AlertsCacheReaper.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/alerts/server/AlertsCacheReaper.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/alerts/server/AlertsCacheReaper.java
index 64423a6..42dc913 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/alerts/server/AlertsCacheReaper.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/alerts/server/AlertsCacheReaper.java
@@ -1,4 +1,4 @@
-package com.apache.metron.alerts.server;
+package org.apache.metron.alerts.server;
 
 import java.util.ArrayList;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/alerts/server/AlertsFilterCacheEntry.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/alerts/server/AlertsFilterCacheEntry.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/alerts/server/AlertsFilterCacheEntry.java
index 68fbd28..f161ad3 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/alerts/server/AlertsFilterCacheEntry.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/alerts/server/AlertsFilterCacheEntry.java
@@ -1,4 +1,4 @@
-package com.apache.metron.alerts.server;
+package org.apache.metron.alerts.server;
 
 public class AlertsFilterCacheEntry {
 	

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/alerts/server/AlertsProcessingServer.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/alerts/server/AlertsProcessingServer.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/alerts/server/AlertsProcessingServer.java
index 1b4a121..50c3d30 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/alerts/server/AlertsProcessingServer.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/alerts/server/AlertsProcessingServer.java
@@ -1,4 +1,4 @@
-package com.apache.metron.alerts.server;
+package org.apache.metron.alerts.server;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/alerts/server/AlertsSearcher.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/alerts/server/AlertsSearcher.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/alerts/server/AlertsSearcher.java
index 0fe4ad2..9850c41 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/alerts/server/AlertsSearcher.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/alerts/server/AlertsSearcher.java
@@ -1,4 +1,4 @@
-package com.apache.metron.alerts.server;
+package org.apache.metron.alerts.server;
 
 import java.io.File;
 import java.io.FileInputStream;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/Main.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/Main.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/Main.java
index 11d88fa..c80c6f6 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/Main.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/Main.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices;
+package org.apache.metron.dataservices;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -46,10 +46,10 @@ import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.servlet.GuiceFilter;
-import com.apache.metron.alerts.server.AlertsProcessingServer;
-import com.apache.metron.dataservices.modules.guice.AlertsServerModule;
-import com.apache.metron.dataservices.modules.guice.DefaultServletModule;
-import com.apache.metron.dataservices.modules.guice.DefaultShiroWebModule;
+import org.apache.metron.alerts.server.AlertsProcessingServer;
+import org.apache.metron.dataservices.modules.guice.AlertsServerModule;
+import org.apache.metron.dataservices.modules.guice.DefaultServletModule;
+import org.apache.metron.dataservices.modules.guice.DefaultShiroWebModule;
 
 public class Main {
 	
@@ -270,7 +270,7 @@ public class Main {
 
         context.setResourceBase(baseUri.toASCIIString());
         
-        context.setInitParameter("resteasy.guice.modules", "com.apache.metron.dataservices.modules.guice.RestEasyModule");
+        context.setInitParameter("resteasy.guice.modules", "org.apache.metron.dataservices.modules.guice.RestEasyModule");
         context.setInitParameter("resteasy.servlet.mapping.prefix", "/rest");
         
         context.addEventListener(injector.getInstance(GuiceResteasyBootstrapServletContextListener.class));

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/auth/AuthToken.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/auth/AuthToken.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/auth/AuthToken.java
index 8add2ec..8e0e59c 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/auth/AuthToken.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/auth/AuthToken.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices.auth;
+package org.apache.metron.dataservices.auth;
 
 import java.io.FileInputStream;
 import java.security.KeyStore;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/auth/AuthTokenFilter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/auth/AuthTokenFilter.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/auth/AuthTokenFilter.java
index aab3449..e68fdc6 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/auth/AuthTokenFilter.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/auth/AuthTokenFilter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices.auth;
+package org.apache.metron.dataservices.auth;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/auth/CustomDomainADRealm.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/auth/CustomDomainADRealm.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/auth/CustomDomainADRealm.java
index 1ea5b0f..cc86ec7 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/auth/CustomDomainADRealm.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/auth/CustomDomainADRealm.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices.auth;
+package org.apache.metron.dataservices.auth;
 
 import javax.naming.NamingException;
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/auth/RestSecurityInterceptor.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/auth/RestSecurityInterceptor.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/auth/RestSecurityInterceptor.java
index 682a9e5..aee019d 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/auth/RestSecurityInterceptor.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/auth/RestSecurityInterceptor.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices.auth;
+package org.apache.metron.dataservices.auth;
 
 import java.io.IOException;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/common/MetronService.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/common/MetronService.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/common/MetronService.java
index ae296d4..1c812ed 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/common/MetronService.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/common/MetronService.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices.common;
+package org.apache.metron.dataservices.common;
 
 public interface MetronService {
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/kafkaclient/KafkaClient.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/kafkaclient/KafkaClient.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/kafkaclient/KafkaClient.java
index f142d31..ffc5e13 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/kafkaclient/KafkaClient.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/kafkaclient/KafkaClient.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices.kafkaclient;
+package org.apache.metron.dataservices.kafkaclient;
 
 import java.util.HashMap;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/kafkaclient/KafkaConsumer.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/kafkaclient/KafkaConsumer.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/kafkaclient/KafkaConsumer.java
index dd09dee..633350c 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/kafkaclient/KafkaConsumer.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/kafkaclient/KafkaConsumer.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices.kafkaclient;
+package org.apache.metron.dataservices.kafkaclient;
 
 import java.io.IOException;
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/kafkaclient/poll/PollingKafkaClient.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/kafkaclient/poll/PollingKafkaClient.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/kafkaclient/poll/PollingKafkaClient.java
index 0b7acc8..9e0ae15 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/kafkaclient/poll/PollingKafkaClient.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/kafkaclient/poll/PollingKafkaClient.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices.kafkaclient.poll;
+package org.apache.metron.dataservices.kafkaclient.poll;
 
 import java.util.ArrayList;
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/kafkaclient/poll/PollingKafkaConsumer.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/kafkaclient/poll/PollingKafkaConsumer.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/kafkaclient/poll/PollingKafkaConsumer.java
index 0c513d3..0d40607 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/kafkaclient/poll/PollingKafkaConsumer.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/kafkaclient/poll/PollingKafkaConsumer.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices.kafkaclient.poll;
+package org.apache.metron.dataservices.kafkaclient.poll;
 
 import java.util.List;
 import java.util.concurrent.CountDownLatch;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/AlertsServerModule.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/AlertsServerModule.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/AlertsServerModule.java
index 6396a6c..2f1e9bf 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/AlertsServerModule.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/AlertsServerModule.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices.modules.guice;
+package org.apache.metron.dataservices.modules.guice;
 
 import java.util.Properties;
 
@@ -8,9 +8,9 @@ import org.slf4j.LoggerFactory;
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
-import com.apache.metron.alerts.server.AlertsCacheReaper;
-import com.apache.metron.alerts.server.AlertsProcessingServer;
-import com.apache.metron.alerts.server.AlertsSearcher;
+import org.apache.metron.alerts.server.AlertsCacheReaper;
+import org.apache.metron.alerts.server.AlertsProcessingServer;
+import org.apache.metron.alerts.server.AlertsSearcher;
 
 public class AlertsServerModule extends AbstractModule {
 	

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/DefaultServletModule.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/DefaultServletModule.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/DefaultServletModule.java
index 184769b..571e3c2 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/DefaultServletModule.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/DefaultServletModule.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices.modules.guice;
+package org.apache.metron.dataservices.modules.guice;
 
 import java.util.Properties;
 
@@ -9,10 +9,10 @@ import org.slf4j.LoggerFactory;
 
 import com.google.inject.Singleton;
 import com.google.inject.servlet.ServletModule;
-import com.apache.metron.dataservices.servlet.LoginServlet;
-import com.apache.metron.dataservices.servlet.LogoutServlet;
-import com.apache.metron.dataservices.websocket.KafkaMessageSenderServlet;
-import com.apache.metron.dataservices.websocket.KafkaWebSocketCreator;
+import org.apache.metron.dataservices.servlet.LoginServlet;
+import org.apache.metron.dataservices.servlet.LogoutServlet;
+import org.apache.metron.dataservices.websocket.KafkaMessageSenderServlet;
+import org.apache.metron.dataservices.websocket.KafkaWebSocketCreator;
 
 public class DefaultServletModule extends ServletModule {
     

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/DefaultShiroWebModule.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/DefaultShiroWebModule.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/DefaultShiroWebModule.java
index 6c0c8da..22e9ad9 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/DefaultShiroWebModule.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/DefaultShiroWebModule.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices.modules.guice;
+package org.apache.metron.dataservices.modules.guice;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory;
 
 import com.google.inject.Provides;
 import com.google.inject.name.Names;
-import com.apache.metron.dataservices.auth.CustomDomainADRealm;
+import org.apache.metron.dataservices.auth.CustomDomainADRealm;
 
 public class DefaultShiroWebModule extends ShiroWebModule {
     

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/RestEasyModule.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/RestEasyModule.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/RestEasyModule.java
index e58e694..833fb1a 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/RestEasyModule.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/RestEasyModule.java
@@ -1,12 +1,12 @@
-package com.apache.metron.dataservices.modules.guice;
+package org.apache.metron.dataservices.modules.guice;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.inject.AbstractModule;
-import com.apache.metron.dataservices.auth.RestSecurityInterceptor;
-import com.apache.metron.dataservices.rest.Index;
-import com.apache.metron.pcapservice.PcapReceiverImplRestEasy;
+import org.apache.metron.dataservices.auth.RestSecurityInterceptor;
+import org.apache.metron.dataservices.rest.Index;
+import org.apache.metron.pcapservice.PcapReceiverImplRestEasy;
 
 public class RestEasyModule extends AbstractModule {
 	

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/ServiceModule.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/ServiceModule.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/ServiceModule.java
index 1185a47..6ae8596 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/ServiceModule.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/modules/guice/ServiceModule.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices.modules.guice;
+package org.apache.metron.dataservices.modules.guice;
 
 import javax.inject.Singleton;
 
@@ -7,9 +7,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.inject.Provides;
-import com.apache.metron.dataservices.common.MetronService;
-import com.apache.metron.services.alerts.ElasticSearch_KafkaAlertsService;
-import com.apache.metron.services.alerts.Solr_KafkaAlertsService;
+import org.apache.metron.dataservices.common.MetronService;
+import org.apache.metron.services.alerts.ElasticSearch_KafkaAlertsService;
+import org.apache.metron.services.alerts.Solr_KafkaAlertsService;
 
 public class ServiceModule extends RequestScopeModule {
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/rest/Index.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/rest/Index.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/rest/Index.java
index 72a9c58..79e6a41 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/rest/Index.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/rest/Index.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices.rest;
+package org.apache.metron.dataservices.rest;
 
 import java.util.List;
 import java.util.Properties;
@@ -12,8 +12,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.inject.Inject;
-import com.apache.metron.dataservices.auth.AuthTokenFilter;
-import com.apache.metron.dataservices.kafkaclient.poll.PollingKafkaClient;
+import org.apache.metron.dataservices.auth.AuthTokenFilter;
+import org.apache.metron.dataservices.kafkaclient.poll.PollingKafkaClient;
 
 @Path("/")
 public class Index 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/rest/RestServices.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/rest/RestServices.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/rest/RestServices.java
index 5c84d72..ab6b172 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/rest/RestServices.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/rest/RestServices.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices.rest;
+package org.apache.metron.dataservices.rest;
 
 import java.util.HashSet;
 import java.util.Set;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/servlet/LoginServlet.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/servlet/LoginServlet.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/servlet/LoginServlet.java
index 0411545..0a6fd8a 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/servlet/LoginServlet.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/servlet/LoginServlet.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices.servlet;
+package org.apache.metron.dataservices.servlet;
 
 import java.io.IOException;
 import java.util.Properties;
@@ -21,7 +21,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.inject.Inject;
-import com.apache.metron.dataservices.auth.AuthToken;
+import org.apache.metron.dataservices.auth.AuthToken;
 
 public class LoginServlet extends HttpServlet 
 {

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/servlet/LogoutServlet.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/servlet/LogoutServlet.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/servlet/LogoutServlet.java
index bd50340..488c25f 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/servlet/LogoutServlet.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/servlet/LogoutServlet.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices.servlet;
+package org.apache.metron.dataservices.servlet;
 
 import java.io.IOException;
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/websocket/KafkaMessageSenderServlet.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/websocket/KafkaMessageSenderServlet.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/websocket/KafkaMessageSenderServlet.java
index 9215e76..56a3ebf 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/websocket/KafkaMessageSenderServlet.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/websocket/KafkaMessageSenderServlet.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices.websocket;
+package org.apache.metron.dataservices.websocket;
 
 import javax.servlet.annotation.WebServlet;
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/websocket/KafkaMessageSenderSocket.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/websocket/KafkaMessageSenderSocket.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/websocket/KafkaMessageSenderSocket.java
index 47db439..4548701 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/websocket/KafkaMessageSenderSocket.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/websocket/KafkaMessageSenderSocket.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices.websocket;
+package org.apache.metron.dataservices.websocket;
 
 
 import java.io.IOException;
@@ -13,7 +13,7 @@ import org.eclipse.jetty.websocket.api.annotations.WebSocket;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.apache.metron.dataservices.kafkaclient.KafkaClient;
+import org.apache.metron.dataservices.kafkaclient.KafkaClient;
 
 @WebSocket(maxTextMessageSize = 64 * 1024)
 public class KafkaMessageSenderSocket 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/websocket/KafkaWebSocketCreator.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/websocket/KafkaWebSocketCreator.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/websocket/KafkaWebSocketCreator.java
index 37cb156..5864e6f 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/websocket/KafkaWebSocketCreator.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/dataservices/websocket/KafkaWebSocketCreator.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataservices.websocket;
+package org.apache.metron.dataservices.websocket;
 
 import java.net.HttpCookie;
 import java.util.List;
@@ -11,7 +11,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.inject.Inject;
-import com.apache.metron.dataservices.auth.AuthToken;
+import org.apache.metron.dataservices.auth.AuthToken;
 
 public class KafkaWebSocketCreator implements WebSocketCreator
 {

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/CellTimestampComparator.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/CellTimestampComparator.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/CellTimestampComparator.java
index 43a4f28..060a1c2 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/CellTimestampComparator.java
+++ b/metron-streaming/Metron-DataServices/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-DataServices/src/main/java/org/apache/metron/pcapservice/ConfigurationUtil.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/ConfigurationUtil.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/ConfigurationUtil.java
index 51f85fe..fa5568c 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/ConfigurationUtil.java
+++ b/metron-streaming/Metron-DataServices/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-DataServices/src/main/java/org/apache/metron/pcapservice/HBaseConfigConstants.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/HBaseConfigConstants.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/HBaseConfigConstants.java
index bd3eecb..8028143 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/HBaseConfigConstants.java
+++ b/metron-streaming/Metron-DataServices/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-DataServices/src/main/java/org/apache/metron/pcapservice/HBaseConfigurationUtil.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/HBaseConfigurationUtil.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/HBaseConfigurationUtil.java
index 6061a5d..783dc07 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/HBaseConfigurationUtil.java
+++ b/metron-streaming/Metron-DataServices/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-DataServices/src/main/java/org/apache/metron/pcapservice/IPcapGetter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/IPcapGetter.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/IPcapGetter.java
index 3bb10c2..5907f9b 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/IPcapGetter.java
+++ b/metron-streaming/Metron-DataServices/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-DataServices/src/main/java/org/apache/metron/pcapservice/IPcapScanner.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/IPcapScanner.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/IPcapScanner.java
index 195c5d6..4af838e 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/IPcapScanner.java
+++ b/metron-streaming/Metron-DataServices/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-DataServices/src/main/java/org/apache/metron/pcapservice/PcapGetterHBaseImpl.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/PcapGetterHBaseImpl.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/PcapGetterHBaseImpl.java
index d45a7e9..91272f5 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/PcapGetterHBaseImpl.java
+++ b/metron-streaming/Metron-DataServices/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-DataServices/src/main/java/org/apache/metron/pcapservice/PcapHelper.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/PcapHelper.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/PcapHelper.java
index 6018065..c87b9e0 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/PcapHelper.java
+++ b/metron-streaming/Metron-DataServices/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-DataServices/src/main/java/org/apache/metron/pcapservice/PcapReceiverImplRestEasy.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/PcapReceiverImplRestEasy.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/PcapReceiverImplRestEasy.java
index 6d33824..80720dd 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/PcapReceiverImplRestEasy.java
+++ b/metron-streaming/Metron-DataServices/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,8 +18,8 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.apache.metron.dataservices.auth.AuthTokenFilter;
-import com.apache.metron.pcap.PcapUtils;
+import org.apache.metron.dataservices.auth.AuthTokenFilter;
+import org.apache.metron.pcap.PcapUtils;
 
 @Path("/pcap/")
 public class PcapReceiverImplRestEasy {

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/PcapScannerHBaseImpl.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/PcapScannerHBaseImpl.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/PcapScannerHBaseImpl.java
index e32b80e..5c04adf 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/PcapScannerHBaseImpl.java
+++ b/metron-streaming/Metron-DataServices/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-DataServices/src/main/java/org/apache/metron/pcapservice/PcapsResponse.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/PcapsResponse.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/PcapsResponse.java
index ea004e9..d0538a3 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/PcapsResponse.java
+++ b/metron-streaming/Metron-DataServices/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-DataServices/src/main/java/org/apache/metron/pcapservice/RestTestingUtil.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/RestTestingUtil.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/RestTestingUtil.java
index baf6285..4dba86b 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/RestTestingUtil.java
+++ b/metron-streaming/Metron-DataServices/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-DataServices/src/main/java/org/apache/metron/pcapservice/rest/JettyServiceRunner.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/rest/JettyServiceRunner.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/rest/JettyServiceRunner.java
index 83709ea..c690cac 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/rest/JettyServiceRunner.java
+++ b/metron-streaming/Metron-DataServices/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-DataServices/src/main/java/org/apache/metron/pcapservice/rest/PcapService.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/rest/PcapService.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/rest/PcapService.java
index c8f4a20..5bca9ed 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/pcapservice/rest/PcapService.java
+++ b/metron-streaming/Metron-DataServices/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-DataServices/src/main/java/org/apache/metron/services/alerts/ElasticSearch_KafkaAlertsService.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/services/alerts/ElasticSearch_KafkaAlertsService.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/services/alerts/ElasticSearch_KafkaAlertsService.java
index ee2cf2d..a448974 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/services/alerts/ElasticSearch_KafkaAlertsService.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/services/alerts/ElasticSearch_KafkaAlertsService.java
@@ -1,11 +1,11 @@
-package com.apache.metron.services.alerts;
+package org.apache.metron.services.alerts;
 
 import javax.inject.Singleton;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.apache.metron.dataservices.common.MetronService;
+import org.apache.metron.dataservices.common.MetronService;
 
 @Singleton
 public class ElasticSearch_KafkaAlertsService implements MetronService {

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/services/alerts/Solr_KafkaAlertsService.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/services/alerts/Solr_KafkaAlertsService.java b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/services/alerts/Solr_KafkaAlertsService.java
index e6f048f..068a81b 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/services/alerts/Solr_KafkaAlertsService.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/org/apache/metron/services/alerts/Solr_KafkaAlertsService.java
@@ -1,11 +1,11 @@
-package com.apache.metron.services.alerts;
+package org.apache.metron.services.alerts;
 
 import javax.inject.Singleton;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.apache.metron.dataservices.common.MetronService;
+import org.apache.metron.dataservices.common.MetronService;
 
 @Singleton
 public class Solr_KafkaAlertsService implements MetronService {

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataServices/src/test/java/org/apache/metron/pcapservice/CellTimestampComparatorTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/test/java/org/apache/metron/pcapservice/CellTimestampComparatorTest.java b/metron-streaming/Metron-DataServices/src/test/java/org/apache/metron/pcapservice/CellTimestampComparatorTest.java
index db38f7c..19ad755 100644
--- a/metron-streaming/Metron-DataServices/src/test/java/org/apache/metron/pcapservice/CellTimestampComparatorTest.java
+++ b/metron-streaming/Metron-DataServices/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-EnrichmentAdapters/pom.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-EnrichmentAdapters/pom.xml b/metron-streaming/Metron-EnrichmentAdapters/pom.xml
index 739f233..2a40f51 100644
--- a/metron-streaming/Metron-EnrichmentAdapters/pom.xml
+++ b/metron-streaming/Metron-EnrichmentAdapters/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>
@@ -30,7 +30,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-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/cif/AbstractCIFAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/cif/AbstractCIFAdapter.java b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/cif/AbstractCIFAdapter.java
index d6034f0..1eff2eb 100644
--- a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/cif/AbstractCIFAdapter.java
+++ b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/cif/AbstractCIFAdapter.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package com.apache.metron.enrichment.adapters.cif;
+package org.apache.metron.enrichment.adapters.cif;
 
 import java.io.Serializable;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.apache.metron.enrichment.interfaces.EnrichmentAdapter;
+import org.apache.metron.enrichment.interfaces.EnrichmentAdapter;
 
 public abstract class AbstractCIFAdapter implements EnrichmentAdapter,Serializable{
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/cif/CIFHbaseAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/cif/CIFHbaseAdapter.java b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/cif/CIFHbaseAdapter.java
index 5c31a3b..33b0350 100644
--- a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/cif/CIFHbaseAdapter.java
+++ b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/cif/CIFHbaseAdapter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.apache.metron.enrichment.adapters.cif;
+package org.apache.metron.enrichment.adapters.cif;
 
 import java.io.IOException;
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/geo/AbstractGeoAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/geo/AbstractGeoAdapter.java b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/geo/AbstractGeoAdapter.java
index 717bebb..e0ca1cd 100644
--- a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/geo/AbstractGeoAdapter.java
+++ b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/geo/AbstractGeoAdapter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.apache.metron.enrichment.adapters.geo;
+package org.apache.metron.enrichment.adapters.geo;
 
 import java.io.Serializable;
 import java.net.InetAddress;
@@ -24,8 +24,8 @@ import org.json.simple.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.apache.metron.enrichment.common.GenericEnrichmentBolt;
-import com.apache.metron.enrichment.interfaces.EnrichmentAdapter;
+import org.apache.metron.enrichment.common.GenericEnrichmentBolt;
+import org.apache.metron.enrichment.interfaces.EnrichmentAdapter;
 
 @SuppressWarnings("serial")
 public abstract class AbstractGeoAdapter implements EnrichmentAdapter,

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/geo/GeoMysqlAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/geo/GeoMysqlAdapter.java b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/geo/GeoMysqlAdapter.java
index da9b063..91f2fac 100644
--- a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/geo/GeoMysqlAdapter.java
+++ b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/geo/GeoMysqlAdapter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.apache.metron.enrichment.adapters.geo;
+package org.apache.metron.enrichment.adapters.geo;
 
 import java.net.InetAddress;
 import java.sql.Connection;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/host/AbstractHostAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/host/AbstractHostAdapter.java b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/host/AbstractHostAdapter.java
index e3c878d..f8f7257 100644
--- a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/host/AbstractHostAdapter.java
+++ b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/host/AbstractHostAdapter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.apache.metron.enrichment.adapters.host;
+package org.apache.metron.enrichment.adapters.host;
 
 import java.io.Serializable;
 
@@ -23,7 +23,7 @@ import org.json.simple.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.apache.metron.enrichment.interfaces.EnrichmentAdapter;
+import org.apache.metron.enrichment.interfaces.EnrichmentAdapter;
 
 public abstract class AbstractHostAdapter implements EnrichmentAdapter,Serializable{
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/host/HostFromPropertiesFileAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/host/HostFromPropertiesFileAdapter.java b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/host/HostFromPropertiesFileAdapter.java
index e5efdce..4e4586e 100644
--- a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/host/HostFromPropertiesFileAdapter.java
+++ b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/host/HostFromPropertiesFileAdapter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.apache.metron.enrichment.adapters.host;
+package org.apache.metron.enrichment.adapters.host;
 
 import java.util.Map;
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/threat/AbstractThreatAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/threat/AbstractThreatAdapter.java b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/threat/AbstractThreatAdapter.java
index b12cbb7..d66a7dc 100644
--- a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/threat/AbstractThreatAdapter.java
+++ b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/threat/AbstractThreatAdapter.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package com.apache.metron.enrichment.adapters.threat;
+package org.apache.metron.enrichment.adapters.threat;
 
 import java.io.Serializable;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.apache.metron.enrichment.interfaces.EnrichmentAdapter;
+import org.apache.metron.enrichment.interfaces.EnrichmentAdapter;
 
 public abstract class AbstractThreatAdapter implements EnrichmentAdapter,Serializable{
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/threat/ThreatHbaseAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/threat/ThreatHbaseAdapter.java b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/threat/ThreatHbaseAdapter.java
index c08b87b..b39cbe5 100644
--- a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/threat/ThreatHbaseAdapter.java
+++ b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/threat/ThreatHbaseAdapter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.apache.metron.enrichment.adapters.threat;
+package org.apache.metron.enrichment.adapters.threat;
 
 import java.io.IOException;
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/whois/AbstractWhoisAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/whois/AbstractWhoisAdapter.java b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/whois/AbstractWhoisAdapter.java
index 89b2e55..45cf5a0 100644
--- a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/whois/AbstractWhoisAdapter.java
+++ b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/whois/AbstractWhoisAdapter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.apache.metron.enrichment.adapters.whois;
+package org.apache.metron.enrichment.adapters.whois;
 
 import java.io.Serializable;
 
@@ -23,7 +23,7 @@ import org.json.simple.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.apache.metron.enrichment.interfaces.EnrichmentAdapter;
+import org.apache.metron.enrichment.interfaces.EnrichmentAdapter;
 
 public abstract class AbstractWhoisAdapter implements EnrichmentAdapter,Serializable{
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/whois/WhoisHBaseAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/whois/WhoisHBaseAdapter.java b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/whois/WhoisHBaseAdapter.java
index 88f2810..43f4149 100644
--- a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/whois/WhoisHBaseAdapter.java
+++ b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/adapters/whois/WhoisHBaseAdapter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.apache.metron.enrichment.adapters.whois;
+package org.apache.metron.enrichment.adapters.whois;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -31,7 +31,7 @@ import org.apache.hadoop.hbase.client.Result;
 import org.json.simple.JSONObject;
 
 import com.google.common.base.Joiner;
-import com.apache.metron.tldextractor.BasicTldExtractor;
+import org.apache.metron.tldextractor.BasicTldExtractor;
 
 public class WhoisHBaseAdapter extends AbstractWhoisAdapter {
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/common/AbstractEnrichmentBolt.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/common/AbstractEnrichmentBolt.java b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/common/AbstractEnrichmentBolt.java
index b301592..d3f2fb7 100644
--- a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/common/AbstractEnrichmentBolt.java
+++ b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/common/AbstractEnrichmentBolt.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apache.metron.enrichment.common;
+package org.apache.metron.enrichment.common;
 
 import java.io.IOException;
 import java.util.List;
@@ -34,8 +34,8 @@ import com.codahale.metrics.Counter;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
-import com.apache.metron.enrichment.interfaces.EnrichmentAdapter;
-import com.apache.metron.metrics.MetricReporter;
+import org.apache.metron.enrichment.interfaces.EnrichmentAdapter;
+import org.apache.metron.metrics.MetricReporter;
 
 @SuppressWarnings("rawtypes")
 public abstract class AbstractEnrichmentBolt extends BaseRichBolt {

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/common/GenericEnrichmentBolt.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/common/GenericEnrichmentBolt.java b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/common/GenericEnrichmentBolt.java
index 6e91e89..5915039 100644
--- a/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/common/GenericEnrichmentBolt.java
+++ b/metron-streaming/Metron-EnrichmentAdapters/src/main/java/org/apache/metron/enrichment/common/GenericEnrichmentBolt.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.apache.metron.enrichment.common;
+package org.apache.metron.enrichment.common;
 
 import java.io.IOException;
 import java.util.List;
@@ -33,15 +33,15 @@ import backtype.storm.tuple.Fields;
 import backtype.storm.tuple.Tuple;
 import backtype.storm.tuple.Values;
 
-import com.apache.metron.enrichment.interfaces.EnrichmentAdapter;
-import com.apache.metron.helpers.topology.ErrorGenerator;
-import com.apache.metron.json.serialization.JSONEncoderHelper;
-import com.apache.metron.metrics.MetricReporter;
+import org.apache.metron.enrichment.interfaces.EnrichmentAdapter;
+import org.apache.metron.helpers.topology.ErrorGenerator;
+import org.apache.metron.json.serialization.JSONEncoderHelper;
+import org.apache.metron.metrics.MetricReporter;
 
 /**
  * Uses an adapter to enrich telemetry messages with additional metadata
  * entries. For a list of available enrichment adapters see
- * com.apache.metron.enrichment.adapters.
+ * org.apache.metron.enrichment.adapters.
  * <p>
  * At the moment of release the following enrichment adapters are available:
  * <p>
@@ -140,7 +140,7 @@ public class GenericEnrichmentBolt extends AbstractEnrichmentBolt {
 
 	public GenericEnrichmentBolt withMetricConfiguration(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-EnrichmentAdapters/src/test/java/org/apache/metron/enrichment/adapters/cif/CIFHbaseAdapterTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-EnrichmentAdapters/src/test/java/org/apache/metron/enrichment/adapters/cif/CIFHbaseAdapterTest.java b/metron-streaming/Metron-EnrichmentAdapters/src/test/java/org/apache/metron/enrichment/adapters/cif/CIFHbaseAdapterTest.java
index 93921a4..82b4529 100644
--- a/metron-streaming/Metron-EnrichmentAdapters/src/test/java/org/apache/metron/enrichment/adapters/cif/CIFHbaseAdapterTest.java
+++ b/metron-streaming/Metron-EnrichmentAdapters/src/test/java/org/apache/metron/enrichment/adapters/cif/CIFHbaseAdapterTest.java
@@ -16,13 +16,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apache.metron.enrichment.adapters.cif;
+package org.apache.metron.enrichment.adapters.cif;
 
 import java.net.InetAddress;
 import java.util.Properties;
 
-import com.apache.metron.test.AbstractTestContext;
-import com.apache.metron.enrichment.adapters.cif.CIFHbaseAdapter;
+import org.apache.metron.test.AbstractTestContext;
+import org.apache.metron.enrichment.adapters.cif.CIFHbaseAdapter;
 
 
  /**
@@ -120,7 +120,7 @@ public class CIFHbaseAdapterTest extends AbstractTestContext {
     }
 
     /**
-     * Test method for {@link com.apache.metron.enrichment.adapters.cif.CIFHbaseAdapter#initializeAdapter()}.
+     * Test method for {@link org.apache.metron.enrichment.adapters.cif.CIFHbaseAdapter#initializeAdapter()}.
      */
     public void testInitializeAdapter() {
         if(skipTests(this.getMode())){
@@ -131,7 +131,7 @@ public class CIFHbaseAdapterTest extends AbstractTestContext {
     }
 
     /**
-     * Test method for {@link com.apache.metron.enrichment.adapters.cif.CIFHbaseAdapter#enrichByIP(java.lang.String)}.
+     * Test method for {@link org.apache.metron.enrichment.adapters.cif.CIFHbaseAdapter#enrichByIP(java.lang.String)}.
      */
     public void testEnrichByIP() {
         if(skipTests(this.getMode())){
@@ -142,7 +142,7 @@ public class CIFHbaseAdapterTest extends AbstractTestContext {
     }
 
     /**
-     * Test method for {@link com.apache.metron.enrichment.adapters.cif.CIFHbaseAdapter#enrichByDomain(java.lang.String)}.
+     * Test method for {@link org.apache.metron.enrichment.adapters.cif.CIFHbaseAdapter#enrichByDomain(java.lang.String)}.
      */
     public void testEnrichByDomain() {
         if(skipTests(this.getMode())){
@@ -153,7 +153,7 @@ public class CIFHbaseAdapterTest extends AbstractTestContext {
     }
 
     /**
-     * Test method for {@link com.apache.metron.enrichment.adapters.cif.CIFHbaseAdapter#enrichByEmail(java.lang.String)}.
+     * Test method for {@link org.apache.metron.enrichment.adapters.cif.CIFHbaseAdapter#enrichByEmail(java.lang.String)}.
      */
     public void testEnrichByEmail() {
         if(skipTests(this.getMode())){
@@ -164,7 +164,7 @@ public class CIFHbaseAdapterTest extends AbstractTestContext {
     }
 
     /**
-     * Test method for {@link com.apache.metron.enrichment.adapters.cif.CIFHbaseAdapter#CIFHbaseAdapter(java.lang.String, java.lang.String, java.lang.String)}.
+     * Test method for {@link org.apache.metron.enrichment.adapters.cif.CIFHbaseAdapter#CIFHbaseAdapter(java.lang.String, java.lang.String, java.lang.String)}.
      */
     public void testCIFHbaseAdapter() {
         if(skipTests(this.getMode())){
@@ -175,7 +175,7 @@ public class CIFHbaseAdapterTest extends AbstractTestContext {
     }
 
     /**
-     * Test method for {@link com.apache.metron.enrichment.adapters.cif.CIFHbaseAdapter#enrich(java.lang.String)}.
+     * Test method for {@link org.apache.metron.enrichment.adapters.cif.CIFHbaseAdapter#enrich(java.lang.String)}.
      */
     public void testEnrich() {
         if(skipTests(this.getMode())){
@@ -191,7 +191,7 @@ public class CIFHbaseAdapterTest extends AbstractTestContext {
     
 
     /**
-     * Test method for {@link com.apache.metron.enrichment.adapters.cif.CIFHbaseAdapter#getCIFObject(java.lang.String)}.
+     * Test method for {@link org.apache.metron.enrichment.adapters.cif.CIFHbaseAdapter#getCIFObject(java.lang.String)}.
      */
     public void testGetCIFObject() {
         if(skipTests(this.getMode())){

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-EnrichmentAdapters/src/test/java/org/apache/metron/enrichment/adapters/geo/GeoMysqlAdapterTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-EnrichmentAdapters/src/test/java/org/apache/metron/enrichment/adapters/geo/GeoMysqlAdapterTest.java b/metron-streaming/Metron-EnrichmentAdapters/src/test/java/org/apache/metron/enrichment/adapters/geo/GeoMysqlAdapterTest.java
index 3a36040..cf5c184 100644
--- a/metron-streaming/Metron-EnrichmentAdapters/src/test/java/org/apache/metron/enrichment/adapters/geo/GeoMysqlAdapterTest.java
+++ b/metron-streaming/Metron-EnrichmentAdapters/src/test/java/org/apache/metron/enrichment/adapters/geo/GeoMysqlAdapterTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apache.metron.enrichment.adapters.geo;
+package org.apache.metron.enrichment.adapters.geo;
 
 import java.net.URL;
 import java.util.Properties;
 
 import org.json.simple.JSONObject;
 
-import com.apache.metron.test.AbstractSchemaTest;
+import org.apache.metron.test.AbstractSchemaTest;
 
  /**
  * <ul>
@@ -93,7 +93,7 @@ public class GeoMysqlAdapterTest extends AbstractSchemaTest {
     }
 
     /**
-     * Test method for {@link com.apache.metron.enrichment.adapters.geo.GeoMysqlAdapter#enrich(java.lang.String)}.
+     * Test method for {@link org.apache.metron.enrichment.adapters.geo.GeoMysqlAdapter#enrich(java.lang.String)}.
      */
     public void testEnrich() {
         if(skipTests(this.getMode())){
@@ -121,7 +121,7 @@ public class GeoMysqlAdapterTest extends AbstractSchemaTest {
     }
 
     /**
-     * Test method for {@link com.apache.metron.enrichment.adapters.geo.GeoMysqlAdapter#initializeAdapter()}.
+     * Test method for {@link org.apache.metron.enrichment.adapters.geo.GeoMysqlAdapter#initializeAdapter()}.
      */
     public void testInitializeAdapter() {
         if(skipTests(this.getMode())){
@@ -133,7 +133,7 @@ public class GeoMysqlAdapterTest extends AbstractSchemaTest {
     }
  
     /**
-     * Test method for {@link com.apache.metron.enrichment.adapters.geo.GeoMysqlAdapter#GeoMysqlAdapter(java.lang.String, int, java.lang.String, java.lang.String, java.lang.String)}.
+     * Test method for {@link org.apache.metron.enrichment.adapters.geo.GeoMysqlAdapter#GeoMysqlAdapter(java.lang.String, int, java.lang.String, java.lang.String, java.lang.String)}.
      */
     public void testGeoMysqlAdapter() {
         if(skipTests(this.getMode())){

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-EnrichmentAdapters/src/test/java/org/apache/metron/enrichment/adapters/whois/WhoisHBaseAdapterTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-EnrichmentAdapters/src/test/java/org/apache/metron/enrichment/adapters/whois/WhoisHBaseAdapterTest.java b/metron-streaming/Metron-EnrichmentAdapters/src/test/java/org/apache/metron/enrichment/adapters/whois/WhoisHBaseAdapterTest.java
index 2dff3be..4518151 100644
--- a/metron-streaming/Metron-EnrichmentAdapters/src/test/java/org/apache/metron/enrichment/adapters/whois/WhoisHBaseAdapterTest.java
+++ b/metron-streaming/Metron-EnrichmentAdapters/src/test/java/org/apache/metron/enrichment/adapters/whois/WhoisHBaseAdapterTest.java
@@ -16,14 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apache.metron.enrichment.adapters.whois;
+package org.apache.metron.enrichment.adapters.whois;
 
 import java.net.InetAddress;
 import java.util.Properties;
 
 import org.json.simple.JSONObject;
 
-import com.apache.metron.test.AbstractTestContext;
+import org.apache.metron.test.AbstractTestContext;
 
  /**
  * <ul>
@@ -114,7 +114,7 @@ public class WhoisHBaseAdapterTest extends AbstractTestContext {
     }
 
     /**
-     * Test method for {@link com.apache.metron.enrichment.adapters.whois.WhoisHBaseAdapter#initializeAdapter()}.
+     * Test method for {@link org.apache.metron.enrichment.adapters.whois.WhoisHBaseAdapter#initializeAdapter()}.
      */
     public void testInitializeAdapter() {
         if(skipTests(this.getMode())){
@@ -125,7 +125,7 @@ public class WhoisHBaseAdapterTest extends AbstractTestContext {
     }
 
     /**
-     * Test method for {@link com.apache.metron.enrichment.adapters.whois.WhoisHBaseAdapter#enrich(java.lang.String)}.
+     * Test method for {@link org.apache.metron.enrichment.adapters.whois.WhoisHBaseAdapter#enrich(java.lang.String)}.
      */
     public void testEnrich() {
         if(skipTests(this.getMode())){

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Indexing/pom.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Indexing/pom.xml b/metron-streaming/Metron-Indexing/pom.xml
index 55a07be..3b11cad 100644
--- a/metron-streaming/Metron-Indexing/pom.xml
+++ b/metron-streaming/Metron-Indexing/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>
@@ -28,7 +28,7 @@
 	<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-Indexing/readme.md
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Indexing/readme.md b/metron-streaming/Metron-Indexing/readme.md
index 08bd16c..4e81abd 100644
--- a/metron-streaming/Metron-Indexing/readme.md
+++ b/metron-streaming/Metron-Indexing/readme.md
@@ -25,10 +25,10 @@ config.getString("bolt.error.indexing.documentname"))
 
 ###IndexAdapters
 
-*com.apache.metron.indexing.adapters.ESBaseBulkAdapter - bulk ingest messages into Elastic Search
-*com.apache.metron.indexing.adapters.ESBaseBulkRotatingAdapter - does everything adapter above does, but is able to rotate the index names based on size
-*com.apache.metron.indexing.adapters.ESTimedBulkRotatingAdapter - does everything adapter above does, but is able to rotate the index names based on size and time
-*com.apache.metron.indexing.adapters.SolrAdapter - currently under development
+*org.apache.metron.indexing.adapters.ESBaseBulkAdapter - bulk ingest messages into Elastic Search
+*org.apache.metron.indexing.adapters.ESBaseBulkRotatingAdapter - does everything adapter above does, but is able to rotate the index names based on size
+*org.apache.metron.indexing.adapters.ESTimedBulkRotatingAdapter - does everything adapter above does, but is able to rotate the index names based on size and time
+*org.apache.metron.indexing.adapters.SolrAdapter - currently under development
 
 /etc/ directory contains all environment-related configs
 

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/AbstractIndexingBolt.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/AbstractIndexingBolt.java b/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/AbstractIndexingBolt.java
index aa00959..b92b363 100644
--- a/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/AbstractIndexingBolt.java
+++ b/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/AbstractIndexingBolt.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.apache.metron.indexing;
+package org.apache.metron.indexing;
 
 import java.io.IOException;
 import java.util.Map;
@@ -29,8 +29,8 @@ import backtype.storm.topology.OutputFieldsDeclarer;
 import backtype.storm.topology.base.BaseRichBolt;
 
 import com.codahale.metrics.Counter;
-import com.apache.metron.index.interfaces.IndexAdapter;
-import com.apache.metron.metrics.MetricReporter;
+import org.apache.metron.index.interfaces.IndexAdapter;
+import org.apache.metron.metrics.MetricReporter;
 
 @SuppressWarnings("rawtypes")
 public abstract class AbstractIndexingBolt extends BaseRichBolt {

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/TelemetryIndexingBolt.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/TelemetryIndexingBolt.java b/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/TelemetryIndexingBolt.java
index fb126f3..2b10b68 100644
--- a/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/TelemetryIndexingBolt.java
+++ b/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/TelemetryIndexingBolt.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.apache.metron.indexing;
+package org.apache.metron.indexing;
 
 import java.io.IOException;
 import java.util.HashSet;
@@ -33,15 +33,15 @@ 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.index.interfaces.IndexAdapter;
-import com.apache.metron.json.serialization.JSONEncoderHelper;
-import com.apache.metron.metrics.MetricReporter;
+import org.apache.metron.helpers.topology.ErrorGenerator;
+import org.apache.metron.index.interfaces.IndexAdapter;
+import org.apache.metron.json.serialization.JSONEncoderHelper;
+import org.apache.metron.metrics.MetricReporter;
 
 /**
  * 
  * Bolt for indexing telemetry messages into Elastic Search, Solr, Druid, etc...
- * For a list of all adapters provided please see com.apache.metron.indexing.adapters
+ * For a list of all adapters provided please see org.apache.metron.indexing.adapters
  * 
  * As of release of this code the following adapters for indexing are provided:
  * <p>
@@ -162,7 +162,7 @@ public class TelemetryIndexingBolt extends AbstractIndexingBolt {
 	 */
 	public TelemetryIndexingBolt withMetricConfiguration(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-Indexing/src/main/java/org/apache/metron/indexing/adapters/AbstractIndexAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/AbstractIndexAdapter.java b/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/AbstractIndexAdapter.java
index 25124a2..606cf93 100644
--- a/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/AbstractIndexAdapter.java
+++ b/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/AbstractIndexAdapter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.indexing.adapters;
+package org.apache.metron.indexing.adapters;
 
 import java.io.Serializable;
 
@@ -6,8 +6,8 @@ import org.json.simple.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.apache.metron.index.interfaces.IndexAdapter;
-import com.apache.metron.indexing.AbstractIndexingBolt;
+import org.apache.metron.index.interfaces.IndexAdapter;
+import org.apache.metron.indexing.AbstractIndexingBolt;
 
 @SuppressWarnings("serial")
 public abstract class AbstractIndexAdapter implements IndexAdapter, Serializable{

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/ESBaseBulkAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/ESBaseBulkAdapter.java b/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/ESBaseBulkAdapter.java
index bfb10de..44bd46d 100644
--- a/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/ESBaseBulkAdapter.java
+++ b/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/ESBaseBulkAdapter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.indexing.adapters;
+package org.apache.metron.indexing.adapters;
 
 import java.io.Serializable;
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/ESBulkRotatingAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/ESBulkRotatingAdapter.java b/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/ESBulkRotatingAdapter.java
index 5a1b9e3..9444fce 100644
--- a/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/ESBulkRotatingAdapter.java
+++ b/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/ESBulkRotatingAdapter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.indexing.adapters;
+package org.apache.metron.indexing.adapters;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/ESTimedRotatingAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/ESTimedRotatingAdapter.java b/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/ESTimedRotatingAdapter.java
index 58c21d0..084d320 100644
--- a/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/ESTimedRotatingAdapter.java
+++ b/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/ESTimedRotatingAdapter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.indexing.adapters;
+package org.apache.metron.indexing.adapters;
 
 import java.io.Serializable;
 import java.text.DateFormat;

http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/SolrAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/SolrAdapter.java b/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/SolrAdapter.java
index 6e2d4d2..807ff28 100644
--- a/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/SolrAdapter.java
+++ b/metron-streaming/Metron-Indexing/src/main/java/org/apache/metron/indexing/adapters/SolrAdapter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.indexing.adapters;
+package org.apache.metron.indexing.adapters;
 
 public class SolrAdapter {
 



Mime
View raw message