You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ce...@apache.org on 2016/01/26 15:18:55 UTC
[77/89] [abbrv] incubator-metron git commit: Rename com.apache to
org.apache
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/FireEyeRunner.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/FireEyeRunner.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/FireEyeRunner.java
index db59415..d6bd29c 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/FireEyeRunner.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/FireEyeRunner.java
@@ -1,10 +1,10 @@
-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 FireEyeRunner 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/ISERunner.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/ISERunner.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/ISERunner.java
index 3d3d663..f34034d 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/ISERunner.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/ISERunner.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 ISERunner 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/LancopeRunner.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/LancopeRunner.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/LancopeRunner.java
index 6f19920..977ebb4 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/LancopeRunner.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/LancopeRunner.java
@@ -15,14 +15,14 @@
* 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.parsing.parsers.BasicLancopeParser;
-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.parsing.parsers.BasicLancopeParser;
+import org.apache.metron.test.spouts.GenericInternalTestSpout;
public class LancopeRunner 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/PaloAltoFirewallRunner.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/PaloAltoFirewallRunner.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/PaloAltoFirewallRunner.java
index 65634da..317dc07 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/PaloAltoFirewallRunner.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/PaloAltoFirewallRunner.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 PaloAltoFirewallRunner 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/PcapRunner.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/PcapRunner.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/PcapRunner.java
index c588017..1d601cb 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/PcapRunner.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/PcapRunner.java
@@ -15,10 +15,10 @@
* 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.parsing.PcapParserBolt;
-import com.apache.metron.test.spouts.GenericInternalTestSpout;
+import org.apache.metron.parsing.PcapParserBolt;
+import org.apache.metron.test.spouts.GenericInternalTestSpout;
public class PcapRunner 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/SourcefireRunner.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/SourcefireRunner.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/SourcefireRunner.java
index f0ec83a..ab42e5f 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/SourcefireRunner.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/SourcefireRunner.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 SourcefireRunner 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/TopologyRunner.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/TopologyRunner.java b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/TopologyRunner.java
index da32025..9ae0918 100644
--- a/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/TopologyRunner.java
+++ b/metron-streaming/Metron-Topologies/src/main/java/org/apache/metron/topology/runner/TopologyRunner.java
@@ -15,7 +15,7 @@
* 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 java.lang.reflect.Constructor;
import java.util.ArrayList;
@@ -63,24 +63,24 @@ import com.esotericsoftware.kryo.serializers.MapSerializer;
-import com.apache.metron.alerts.TelemetryAlertsBolt;
-import com.apache.metron.alerts.adapters.HbaseWhiteAndBlacklistAdapter;
-import com.apache.metron.alerts.interfaces.AlertsAdapter;
-import com.apache.metron.enrichment.adapters.cif.CIFHbaseAdapter;
-import com.apache.metron.enrichment.adapters.geo.GeoMysqlAdapter;
-import com.apache.metron.enrichment.adapters.host.HostFromPropertiesFileAdapter;
-import com.apache.metron.enrichment.adapters.whois.WhoisHBaseAdapter;
-import com.apache.metron.enrichment.adapters.threat.ThreatHbaseAdapter;
-import com.apache.metron.enrichment.common.GenericEnrichmentBolt;
-import com.apache.metron.enrichment.interfaces.EnrichmentAdapter;
-import com.apache.metron.hbase.HBaseBolt;
-import com.apache.metron.hbase.HBaseStreamPartitioner;
-import com.apache.metron.hbase.TupleTableConfig;
-import com.apache.metron.helpers.topology.Cli;
-import com.apache.metron.helpers.topology.SettingsLoader;
-import com.apache.metron.index.interfaces.IndexAdapter;
-import com.apache.metron.indexing.TelemetryIndexingBolt;
-import com.apache.metron.json.serialization.JSONKryoSerializer;
+import org.apache.metron.alerts.TelemetryAlertsBolt;
+import org.apache.metron.alerts.adapters.HbaseWhiteAndBlacklistAdapter;
+import org.apache.metron.alerts.interfaces.AlertsAdapter;
+import org.apache.metron.enrichment.adapters.cif.CIFHbaseAdapter;
+import org.apache.metron.enrichment.adapters.geo.GeoMysqlAdapter;
+import org.apache.metron.enrichment.adapters.host.HostFromPropertiesFileAdapter;
+import org.apache.metron.enrichment.adapters.whois.WhoisHBaseAdapter;
+import org.apache.metron.enrichment.adapters.threat.ThreatHbaseAdapter;
+import org.apache.metron.enrichment.common.GenericEnrichmentBolt;
+import org.apache.metron.enrichment.interfaces.EnrichmentAdapter;
+import org.apache.metron.hbase.HBaseBolt;
+import org.apache.metron.hbase.HBaseStreamPartitioner;
+import org.apache.metron.hbase.TupleTableConfig;
+import org.apache.metron.helpers.topology.Cli;
+import org.apache.metron.helpers.topology.SettingsLoader;
+import org.apache.metron.index.interfaces.IndexAdapter;
+import org.apache.metron.indexing.TelemetryIndexingBolt;
+import org.apache.metron.json.serialization.JSONKryoSerializer;
public abstract class TopologyRunner {
@@ -774,7 +774,7 @@ public abstract class TopologyRunner {
config.getString("kafka.br"));
kafka_broker_properties.put("serializer.class",
- "com.apache.metron.json.serialization.JSONKafkaSerializer");
+ "org.apache.metron.json.serialization.JSONKafkaSerializer");
kafka_broker_properties.put("key.serializer.class",
"kafka.serializer.StringEncoder");
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/asa/metrics.conf
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/asa/metrics.conf b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/asa/metrics.conf
index 0036e15..aa7a6e0 100644
--- a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/asa/metrics.conf
+++ b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/asa/metrics.conf
@@ -1,26 +1,26 @@
#reporters
-com.apache.metron.metrics.reporter.graphite=true
-com.apache.metron.metrics.reporter.console=false
-com.apache.metron.metrics.reporter.jmx=false
+org.apache.metron.metrics.reporter.graphite=true
+org.apache.metron.metrics.reporter.console=false
+org.apache.metron.metrics.reporter.jmx=false
#Graphite Addresses
-com.apache.metron.metrics.graphite.address=localhost
-com.apache.metron.metrics.graphite.port=2023
+org.apache.metron.metrics.graphite.address=localhost
+org.apache.metron.metrics.graphite.port=2023
#TelemetryParserBolt
-com.apache.metron.metrics.TelemetryParserBolt.acks=true
-com.apache.metron.metrics.TelemetryParserBolt.emits=true
-com.apache.metron.metrics.TelemetryParserBolt.fails=true
+org.apache.metron.metrics.TelemetryParserBolt.acks=true
+org.apache.metron.metrics.TelemetryParserBolt.emits=true
+org.apache.metron.metrics.TelemetryParserBolt.fails=true
#GenericEnrichmentBolt
-com.apache.metron.metrics.GenericEnrichmentBolt.acks=true
-com.apache.metron.metrics.GenericEnrichmentBolt.emits=true
-com.apache.metron.metrics.GenericEnrichmentBolt.fails=true
+org.apache.metron.metrics.GenericEnrichmentBolt.acks=true
+org.apache.metron.metrics.GenericEnrichmentBolt.emits=true
+org.apache.metron.metrics.GenericEnrichmentBolt.fails=true
#TelemetryIndexingBolt
-com.apache.metron.metrics.TelemetryIndexingBolt.acks=true
-com.apache.metron.metrics.TelemetryIndexingBolt.emits=true
-com.apache.metron.metrics.TelemetryIndexingBolt.fails=true
+org.apache.metron.metrics.TelemetryIndexingBolt.acks=true
+org.apache.metron.metrics.TelemetryIndexingBolt.emits=true
+org.apache.metron.metrics.TelemetryIndexingBolt.fails=true
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/asa/topology.conf
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/asa/topology.conf b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/asa/topology.conf
index 19a4c77..e9bab9f 100644
--- a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/asa/topology.conf
+++ b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/asa/topology.conf
@@ -26,7 +26,7 @@ spout.test.parallelism.repeat=false
spout.kafka.topic=asa_raw
#Parser Bolt
-bolt.parser.adapter=com.apache.metron.parsing.parsers.GrokAsaParser
+bolt.parser.adapter=org.apache.metron.parsing.parsers.GrokAsaParser
#Host Enrichment
@@ -72,30 +72,30 @@ bolt.indexing.indexname=asa_index
bolt.indexing.timestamp=yyyy.MM.ww
bolt.indexing.documentname=asa_doc
bolt.indexing.bulk=1
-bolt.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#Alerts Indexing Bolt
bolt.alerts.indexing.indexname=alert
bolt.alerts.indexing.timestamp.yyyy.MM.ww
bolt.alerts.indexing.documentname=asa_alert
bolt.alerts.indexing.bulk=1
-bolt.alerts.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.alerts.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#Error Indexing Bolt
bolt.error.indexing.indexname=error
bolt.error.indexing.timestamp=yyyy.MM
bolt.error.indexing.documentname=asa_error
bolt.error.indexing.bulk=1
-bolt.error.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.error.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#Alerts Bolt
-bolt.alerts.adapter=com.apache.metron.alerts.adapters.CIFAlertsAdapter
-com.apache.metron.alerts.adapters.CIFAlertsAdapter.whitelist_table_name = ip_whitelist
-com.apache.metron.alerts.adapters.CIFAlertsAdapter.blacklist_table_name = ip_blacklist
-com.apache.metron.alerts.adapters.CIFAlertsAdapter.quorum=zkpr1,zkpr2,zkpr3
-com.apache.metron.alerts.adapters.CIFAlertsAdapter.port=2181
-com.apache.metron.alerts.adapters.CIFAlertsAdapter._MAX_CACHE_SIZE_OBJECTS_NUM=3600
-com.apache.metron.alerts.adapters.CIFAlertsAdapter._MAX_TIME_RETAIN_MINUTES=1000
+bolt.alerts.adapter=org.apache.metron.alerts.adapters.CIFAlertsAdapter
+org.apache.metron.alerts.adapters.CIFAlertsAdapter.whitelist_table_name = ip_whitelist
+org.apache.metron.alerts.adapters.CIFAlertsAdapter.blacklist_table_name = ip_blacklist
+org.apache.metron.alerts.adapters.CIFAlertsAdapter.quorum=zkpr1,zkpr2,zkpr3
+org.apache.metron.alerts.adapters.CIFAlertsAdapter.port=2181
+org.apache.metron.alerts.adapters.CIFAlertsAdapter._MAX_CACHE_SIZE_OBJECTS_NUM=3600
+org.apache.metron.alerts.adapters.CIFAlertsAdapter._MAX_TIME_RETAIN_MINUTES=1000
#HDFS Bolt
bolt.hdfs.batch.size=5000
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/bro/metrics.conf
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/bro/metrics.conf b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/bro/metrics.conf
index 0036e15..aa7a6e0 100644
--- a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/bro/metrics.conf
+++ b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/bro/metrics.conf
@@ -1,26 +1,26 @@
#reporters
-com.apache.metron.metrics.reporter.graphite=true
-com.apache.metron.metrics.reporter.console=false
-com.apache.metron.metrics.reporter.jmx=false
+org.apache.metron.metrics.reporter.graphite=true
+org.apache.metron.metrics.reporter.console=false
+org.apache.metron.metrics.reporter.jmx=false
#Graphite Addresses
-com.apache.metron.metrics.graphite.address=localhost
-com.apache.metron.metrics.graphite.port=2023
+org.apache.metron.metrics.graphite.address=localhost
+org.apache.metron.metrics.graphite.port=2023
#TelemetryParserBolt
-com.apache.metron.metrics.TelemetryParserBolt.acks=true
-com.apache.metron.metrics.TelemetryParserBolt.emits=true
-com.apache.metron.metrics.TelemetryParserBolt.fails=true
+org.apache.metron.metrics.TelemetryParserBolt.acks=true
+org.apache.metron.metrics.TelemetryParserBolt.emits=true
+org.apache.metron.metrics.TelemetryParserBolt.fails=true
#GenericEnrichmentBolt
-com.apache.metron.metrics.GenericEnrichmentBolt.acks=true
-com.apache.metron.metrics.GenericEnrichmentBolt.emits=true
-com.apache.metron.metrics.GenericEnrichmentBolt.fails=true
+org.apache.metron.metrics.GenericEnrichmentBolt.acks=true
+org.apache.metron.metrics.GenericEnrichmentBolt.emits=true
+org.apache.metron.metrics.GenericEnrichmentBolt.fails=true
#TelemetryIndexingBolt
-com.apache.metron.metrics.TelemetryIndexingBolt.acks=true
-com.apache.metron.metrics.TelemetryIndexingBolt.emits=true
-com.apache.metron.metrics.TelemetryIndexingBolt.fails=true
+org.apache.metron.metrics.TelemetryIndexingBolt.acks=true
+org.apache.metron.metrics.TelemetryIndexingBolt.emits=true
+org.apache.metron.metrics.TelemetryIndexingBolt.fails=true
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/bro/topology.conf
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/bro/topology.conf b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/bro/topology.conf
index 8104f69..b0eeb5a 100644
--- a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/bro/topology.conf
+++ b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/bro/topology.conf
@@ -26,7 +26,7 @@ spout.test.parallelism.repeat=false
spout.kafka.topic=bro_raw
#Parsing Bolt
-bolt.parser.adapter=com.apache.metron.parsing.parsers.BasicBroParser
+bolt.parser.adapter=org.apache.metron.parsing.parsers.BasicBroParser
source.include.protocols=snmp,http,ftp,ssh,ssl,dns,socks,dnp3,smtp,dhcp,modbus,radius,irc
source.exclude.protocols=x509,files,app_stats
@@ -74,51 +74,51 @@ bolt.indexing.indexname=bro_index
bolt.indexing.timestamp=yyyy.MM.ww
bolt.indexing.documentname=bro_doc
bolt.indexing.bulk=200
-bolt.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#Alerts Indexing Bolt
bolt.alerts.indexing.indexname=alert
bolt.alerts.indexing.documentname=bro_alert
bolt.alerts.indexing.timestamp=yyyy.MM.ww
bolt.alerts.indexing.bulk=1
-bolt.alerts.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.alerts.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#Error Indexing Bolt
bolt.error.indexing.indexname=error
bolt.error.indexing.timestamp=yyyy.MM
bolt.error.indexing.documentname=bro_error
bolt.error.indexing.bulk=1
-bolt.error.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.error.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#Alerts Bolt
-bolt.alerts.adapter=com.apache.metron.alerts.adapters.ThreatAlertsAdapter
-com.apache.metron.alerts.adapters.ThreatAlertsAdapter.enrichment_tag=Threat_Enrichment
-com.apache.metron.alerts.adapters.ThreatAlertsAdapter.whitelist_table_name = ip_whitelist
-com.apache.metron.alerts.adapters.ThreatAlertsAdapter.blacklist_table_name = ip_blacklist
-com.apache.metron.alerts.adapters.ThreatAlertsAdapter.quorum=zkpr1,zkpr2,zkpr3
-com.apache.metron.alerts.adapters.ThreatAlertsAdapter.port=2181
-com.apache.metron.alerts.adapters.ThreatAlertsAdapter._MAX_CACHE_SIZE_OBJECTS_NUM=3600
-com.apache.metron.alerts.adapters.ThreatAlertsAdapter._MAX_TIME_RETAIN_MINUTES=1000
-
-
-#bolt.alerts.adapter=com.apache.metron.alerts.adapters.CIFAlertsAdapter
-#com.apache.metron.alerts.adapters.CIFAlertsAdapter.enrichment_tag=CIF_Enrichment
-#com.apache.metron.alerts.adapters.CIFAlertsAdapter.whitelist_table_name = ip_whitelist
-#com.apache.metron.alerts.adapters.CIFAlertsAdapter.blacklist_table_name = ip_blacklist
-#com.apache.metron.alerts.adapters.CIFAlertsAdapter.quorum=zkpr1,zkpr2,zkpr3
-#com.apache.metron.alerts.adapters.CIFAlertsAdapter.port=2181
-#com.apache.metron.alerts.adapters.CIFAlertsAdapter._MAX_CACHE_SIZE_OBJECTS_NUM=3600
-#com.apache.metron.alerts.adapters.CIFAlertsAdapter._MAX_TIME_RETAIN_MINUTES=1000
-
-#bolt.alerts.adapter=com.apache.metron.alerts.adapters.HbaseWhiteAndBlacklistAdapter
-#com.apache.metron.alerts.adapters.HbaseWhiteAndBlacklistAdapter.whitelist_table_name = ip_whitelist
-#com.apache.metron.alerts.adapters.HbaseWhiteAndBlacklistAdapter.blacklist_table_name = ip_blacklist
-#com.apache.metron.alerts.adapters.HbaseWhiteAndBlacklistAdapter.quorum=zkpr1,zkpr2,zkpr3
-#com.apache.metron.alerts.adapters.HbaseWhiteAndBlacklistAdapter.port=2181
-#com.apache.metron.alerts.adapters.HbaseWhiteAndBlacklistAdapter._MAX_CACHE_SIZE_OBJECTS_NUM=3600
-#com.apache.metron.alerts.adapters.HbaseWhiteAndBlacklistAdapter._MAX_TIME_RETAIN_MINUTES=1000
+bolt.alerts.adapter=org.apache.metron.alerts.adapters.ThreatAlertsAdapter
+org.apache.metron.alerts.adapters.ThreatAlertsAdapter.enrichment_tag=Threat_Enrichment
+org.apache.metron.alerts.adapters.ThreatAlertsAdapter.whitelist_table_name = ip_whitelist
+org.apache.metron.alerts.adapters.ThreatAlertsAdapter.blacklist_table_name = ip_blacklist
+org.apache.metron.alerts.adapters.ThreatAlertsAdapter.quorum=zkpr1,zkpr2,zkpr3
+org.apache.metron.alerts.adapters.ThreatAlertsAdapter.port=2181
+org.apache.metron.alerts.adapters.ThreatAlertsAdapter._MAX_CACHE_SIZE_OBJECTS_NUM=3600
+org.apache.metron.alerts.adapters.ThreatAlertsAdapter._MAX_TIME_RETAIN_MINUTES=1000
+
+
+#bolt.alerts.adapter=org.apache.metron.alerts.adapters.CIFAlertsAdapter
+#org.apache.metron.alerts.adapters.CIFAlertsAdapter.enrichment_tag=CIF_Enrichment
+#org.apache.metron.alerts.adapters.CIFAlertsAdapter.whitelist_table_name = ip_whitelist
+#org.apache.metron.alerts.adapters.CIFAlertsAdapter.blacklist_table_name = ip_blacklist
+#org.apache.metron.alerts.adapters.CIFAlertsAdapter.quorum=zkpr1,zkpr2,zkpr3
+#org.apache.metron.alerts.adapters.CIFAlertsAdapter.port=2181
+#org.apache.metron.alerts.adapters.CIFAlertsAdapter._MAX_CACHE_SIZE_OBJECTS_NUM=3600
+#org.apache.metron.alerts.adapters.CIFAlertsAdapter._MAX_TIME_RETAIN_MINUTES=1000
+
+#bolt.alerts.adapter=org.apache.metron.alerts.adapters.HbaseWhiteAndBlacklistAdapter
+#org.apache.metron.alerts.adapters.HbaseWhiteAndBlacklistAdapter.whitelist_table_name = ip_whitelist
+#org.apache.metron.alerts.adapters.HbaseWhiteAndBlacklistAdapter.blacklist_table_name = ip_blacklist
+#org.apache.metron.alerts.adapters.HbaseWhiteAndBlacklistAdapter.quorum=zkpr1,zkpr2,zkpr3
+#org.apache.metron.alerts.adapters.HbaseWhiteAndBlacklistAdapter.port=2181
+#org.apache.metron.alerts.adapters.HbaseWhiteAndBlacklistAdapter._MAX_CACHE_SIZE_OBJECTS_NUM=3600
+#org.apache.metron.alerts.adapters.HbaseWhiteAndBlacklistAdapter._MAX_TIME_RETAIN_MINUTES=1000
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/fireeye/metrics.conf
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/fireeye/metrics.conf b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/fireeye/metrics.conf
index 0036e15..aa7a6e0 100644
--- a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/fireeye/metrics.conf
+++ b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/fireeye/metrics.conf
@@ -1,26 +1,26 @@
#reporters
-com.apache.metron.metrics.reporter.graphite=true
-com.apache.metron.metrics.reporter.console=false
-com.apache.metron.metrics.reporter.jmx=false
+org.apache.metron.metrics.reporter.graphite=true
+org.apache.metron.metrics.reporter.console=false
+org.apache.metron.metrics.reporter.jmx=false
#Graphite Addresses
-com.apache.metron.metrics.graphite.address=localhost
-com.apache.metron.metrics.graphite.port=2023
+org.apache.metron.metrics.graphite.address=localhost
+org.apache.metron.metrics.graphite.port=2023
#TelemetryParserBolt
-com.apache.metron.metrics.TelemetryParserBolt.acks=true
-com.apache.metron.metrics.TelemetryParserBolt.emits=true
-com.apache.metron.metrics.TelemetryParserBolt.fails=true
+org.apache.metron.metrics.TelemetryParserBolt.acks=true
+org.apache.metron.metrics.TelemetryParserBolt.emits=true
+org.apache.metron.metrics.TelemetryParserBolt.fails=true
#GenericEnrichmentBolt
-com.apache.metron.metrics.GenericEnrichmentBolt.acks=true
-com.apache.metron.metrics.GenericEnrichmentBolt.emits=true
-com.apache.metron.metrics.GenericEnrichmentBolt.fails=true
+org.apache.metron.metrics.GenericEnrichmentBolt.acks=true
+org.apache.metron.metrics.GenericEnrichmentBolt.emits=true
+org.apache.metron.metrics.GenericEnrichmentBolt.fails=true
#TelemetryIndexingBolt
-com.apache.metron.metrics.TelemetryIndexingBolt.acks=true
-com.apache.metron.metrics.TelemetryIndexingBolt.emits=true
-com.apache.metron.metrics.TelemetryIndexingBolt.fails=true
+org.apache.metron.metrics.TelemetryIndexingBolt.acks=true
+org.apache.metron.metrics.TelemetryIndexingBolt.emits=true
+org.apache.metron.metrics.TelemetryIndexingBolt.fails=true
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/fireeye/topology.conf
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/fireeye/topology.conf b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/fireeye/topology.conf
index a1a2690..068b366 100644
--- a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/fireeye/topology.conf
+++ b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/fireeye/topology.conf
@@ -26,7 +26,7 @@ spout.test.parallelism.repeat=false
spout.kafka.topic=fireeye_raw
#Parser Bolt
-bolt.parser.adapter=com.apache.metron.parsing.parsers.BasicFireEyeParser
+bolt.parser.adapter=org.apache.metron.parsing.parsers.BasicFireEyeParser
#Host Enrichment
@@ -72,30 +72,30 @@ bolt.indexing.indexname=fireeye_index
bolt.indexing.timestamp=yyyy.MM.ww
bolt.indexing.documentname=fireeye_doc
bolt.indexing.bulk=1
-bolt.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#Alerts Indexing Bolt
bolt.alerts.indexing.indexname=alert
bolt.alerts.indexing.timestamp=yyyy.MM.ww
bolt.alerts.indexing.documentname=fireeye_alert
bolt.alerts.indexing.bulk=1
-bolt.alerts.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.alerts.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#Error Indexing Bolt
bolt.error.indexing.indexname=error
bolt.error.indexing.timestamp=yyyy.MM
bolt.error.indexing.documentname=fireeye_error
bolt.error.indexing.bulk=1
-bolt.error.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.error.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#Alerts Bolt
-bolt.alerts.adapter=com.apache.metron.alerts.adapters.CIFAlertsAdapter
-com.apache.metron.alerts.adapters.CIFAlertsAdapter.whitelist_table_name = ip_whitelist
-com.apache.metron.alerts.adapters.CIFAlertsAdapter.blacklist_table_name = ip_blacklist
-com.apache.metron.alerts.adapters.CIFAlertsAdapter.quorum=zkpr1,zkpr2,zkpr3
-com.apache.metron.alerts.adapters.CIFAlertsAdapter.port=2181
-com.apache.metron.alerts.adapters.CIFAlertsAdapter._MAX_CACHE_SIZE_OBJECTS_NUM=3600
-com.apache.metron.alerts.adapters.CIFAlertsAdapter._MAX_TIME_RETAIN_MINUTES=1000
+bolt.alerts.adapter=org.apache.metron.alerts.adapters.CIFAlertsAdapter
+org.apache.metron.alerts.adapters.CIFAlertsAdapter.whitelist_table_name = ip_whitelist
+org.apache.metron.alerts.adapters.CIFAlertsAdapter.blacklist_table_name = ip_blacklist
+org.apache.metron.alerts.adapters.CIFAlertsAdapter.quorum=zkpr1,zkpr2,zkpr3
+org.apache.metron.alerts.adapters.CIFAlertsAdapter.port=2181
+org.apache.metron.alerts.adapters.CIFAlertsAdapter._MAX_CACHE_SIZE_OBJECTS_NUM=3600
+org.apache.metron.alerts.adapters.CIFAlertsAdapter._MAX_TIME_RETAIN_MINUTES=1000
#HDFS Bolt
bolt.hdfs.batch.size=5000
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/ise/metrics.conf
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/ise/metrics.conf b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/ise/metrics.conf
index 0036e15..aa7a6e0 100644
--- a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/ise/metrics.conf
+++ b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/ise/metrics.conf
@@ -1,26 +1,26 @@
#reporters
-com.apache.metron.metrics.reporter.graphite=true
-com.apache.metron.metrics.reporter.console=false
-com.apache.metron.metrics.reporter.jmx=false
+org.apache.metron.metrics.reporter.graphite=true
+org.apache.metron.metrics.reporter.console=false
+org.apache.metron.metrics.reporter.jmx=false
#Graphite Addresses
-com.apache.metron.metrics.graphite.address=localhost
-com.apache.metron.metrics.graphite.port=2023
+org.apache.metron.metrics.graphite.address=localhost
+org.apache.metron.metrics.graphite.port=2023
#TelemetryParserBolt
-com.apache.metron.metrics.TelemetryParserBolt.acks=true
-com.apache.metron.metrics.TelemetryParserBolt.emits=true
-com.apache.metron.metrics.TelemetryParserBolt.fails=true
+org.apache.metron.metrics.TelemetryParserBolt.acks=true
+org.apache.metron.metrics.TelemetryParserBolt.emits=true
+org.apache.metron.metrics.TelemetryParserBolt.fails=true
#GenericEnrichmentBolt
-com.apache.metron.metrics.GenericEnrichmentBolt.acks=true
-com.apache.metron.metrics.GenericEnrichmentBolt.emits=true
-com.apache.metron.metrics.GenericEnrichmentBolt.fails=true
+org.apache.metron.metrics.GenericEnrichmentBolt.acks=true
+org.apache.metron.metrics.GenericEnrichmentBolt.emits=true
+org.apache.metron.metrics.GenericEnrichmentBolt.fails=true
#TelemetryIndexingBolt
-com.apache.metron.metrics.TelemetryIndexingBolt.acks=true
-com.apache.metron.metrics.TelemetryIndexingBolt.emits=true
-com.apache.metron.metrics.TelemetryIndexingBolt.fails=true
+org.apache.metron.metrics.TelemetryIndexingBolt.acks=true
+org.apache.metron.metrics.TelemetryIndexingBolt.emits=true
+org.apache.metron.metrics.TelemetryIndexingBolt.fails=true
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/ise/topology.conf
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/ise/topology.conf b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/ise/topology.conf
index a84612a..a563528 100644
--- a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/ise/topology.conf
+++ b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/ise/topology.conf
@@ -26,7 +26,7 @@ spout.test.parallelism.repeat=false
spout.kafka.topic=ise_raw
#Parser Bolt
-bolt.parser.adapter=com.apache.metron.parsing.parsers.BasicIseParser
+bolt.parser.adapter=org.apache.metron.parsing.parsers.BasicIseParser
#Host Enrichment
@@ -72,21 +72,21 @@ bolt.indexing.indexname=ise_index
bolt.indexing.timestamp=yyyy.MM.ww
bolt.indexing.documentname=ise_doc
bolt.indexing.bulk=200
-bolt.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#Alerts Indexing Bolt
bolt.alerts.indexing.indexname=alert
bolt.alerts.indexing.timestamp=yyyy.MM.ww
bolt.alerts.indexing.documentname=ise_alert
bolt.alerts.indexing.bulk=1
-bolt.alerts.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.alerts.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#Error Indexing Bolt
bolt.error.indexing.indexname=error
bolt.error.indexing.timesatmp=yyyy.MM
bolt.error.indexing.documentname=ise_error
bolt.error.indexing.bulk=1
-bolt.error.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.error.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#HDFS Bolt
bolt.hdfs.batch.size=5000
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/lancope/metrics.conf
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/lancope/metrics.conf b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/lancope/metrics.conf
index 0036e15..aa7a6e0 100644
--- a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/lancope/metrics.conf
+++ b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/lancope/metrics.conf
@@ -1,26 +1,26 @@
#reporters
-com.apache.metron.metrics.reporter.graphite=true
-com.apache.metron.metrics.reporter.console=false
-com.apache.metron.metrics.reporter.jmx=false
+org.apache.metron.metrics.reporter.graphite=true
+org.apache.metron.metrics.reporter.console=false
+org.apache.metron.metrics.reporter.jmx=false
#Graphite Addresses
-com.apache.metron.metrics.graphite.address=localhost
-com.apache.metron.metrics.graphite.port=2023
+org.apache.metron.metrics.graphite.address=localhost
+org.apache.metron.metrics.graphite.port=2023
#TelemetryParserBolt
-com.apache.metron.metrics.TelemetryParserBolt.acks=true
-com.apache.metron.metrics.TelemetryParserBolt.emits=true
-com.apache.metron.metrics.TelemetryParserBolt.fails=true
+org.apache.metron.metrics.TelemetryParserBolt.acks=true
+org.apache.metron.metrics.TelemetryParserBolt.emits=true
+org.apache.metron.metrics.TelemetryParserBolt.fails=true
#GenericEnrichmentBolt
-com.apache.metron.metrics.GenericEnrichmentBolt.acks=true
-com.apache.metron.metrics.GenericEnrichmentBolt.emits=true
-com.apache.metron.metrics.GenericEnrichmentBolt.fails=true
+org.apache.metron.metrics.GenericEnrichmentBolt.acks=true
+org.apache.metron.metrics.GenericEnrichmentBolt.emits=true
+org.apache.metron.metrics.GenericEnrichmentBolt.fails=true
#TelemetryIndexingBolt
-com.apache.metron.metrics.TelemetryIndexingBolt.acks=true
-com.apache.metron.metrics.TelemetryIndexingBolt.emits=true
-com.apache.metron.metrics.TelemetryIndexingBolt.fails=true
+org.apache.metron.metrics.TelemetryIndexingBolt.acks=true
+org.apache.metron.metrics.TelemetryIndexingBolt.emits=true
+org.apache.metron.metrics.TelemetryIndexingBolt.fails=true
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/lancope/topology.conf
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/lancope/topology.conf b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/lancope/topology.conf
index 9462e4a..6551c3f 100644
--- a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/lancope/topology.conf
+++ b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/lancope/topology.conf
@@ -26,7 +26,7 @@ spout.test.parallelism.repeat=false
spout.kafka.topic=lancope_raw
#Parser Bolt
-bolt.parser.adapter=com.apache.metron.parsing.parsers.BasicLancopeParser
+bolt.parser.adapter=org.apache.metron.parsing.parsers.BasicLancopeParser
#Host Enrichment
@@ -72,21 +72,21 @@ bolt.indexing.indexname=lancope_index
bolt.indexing.timestamp=yyyy.MM.ww
bolt.indexing.documentname=lancope_doc
bolt.indexing.bulk=200
-bolt.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#Alerts Indexing Bolt
bolt.alerts.indexing.indexname=alert
bolt.alerts.indexing.timestamp=yyyy.MM.ww
bolt.alerts.indexing.documentname=lancope_alert
bolt.alerts.indexing.bulk=1
-bolt.alerts.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.alerts.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#Error Indexing Bolt
bolt.error.indexing.indexname=error
bolt.error.indexing.timestamp=yyyy.MM
bolt.error.indexing.documentname=lancope_error
bolt.error.indexing.bulk=1
-bolt.error.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.error.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#HDFS Bolt
bolt.hdfs.batch.size=5000
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/paloalto/metrics.conf
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/paloalto/metrics.conf b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/paloalto/metrics.conf
index 0036e15..aa7a6e0 100644
--- a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/paloalto/metrics.conf
+++ b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/paloalto/metrics.conf
@@ -1,26 +1,26 @@
#reporters
-com.apache.metron.metrics.reporter.graphite=true
-com.apache.metron.metrics.reporter.console=false
-com.apache.metron.metrics.reporter.jmx=false
+org.apache.metron.metrics.reporter.graphite=true
+org.apache.metron.metrics.reporter.console=false
+org.apache.metron.metrics.reporter.jmx=false
#Graphite Addresses
-com.apache.metron.metrics.graphite.address=localhost
-com.apache.metron.metrics.graphite.port=2023
+org.apache.metron.metrics.graphite.address=localhost
+org.apache.metron.metrics.graphite.port=2023
#TelemetryParserBolt
-com.apache.metron.metrics.TelemetryParserBolt.acks=true
-com.apache.metron.metrics.TelemetryParserBolt.emits=true
-com.apache.metron.metrics.TelemetryParserBolt.fails=true
+org.apache.metron.metrics.TelemetryParserBolt.acks=true
+org.apache.metron.metrics.TelemetryParserBolt.emits=true
+org.apache.metron.metrics.TelemetryParserBolt.fails=true
#GenericEnrichmentBolt
-com.apache.metron.metrics.GenericEnrichmentBolt.acks=true
-com.apache.metron.metrics.GenericEnrichmentBolt.emits=true
-com.apache.metron.metrics.GenericEnrichmentBolt.fails=true
+org.apache.metron.metrics.GenericEnrichmentBolt.acks=true
+org.apache.metron.metrics.GenericEnrichmentBolt.emits=true
+org.apache.metron.metrics.GenericEnrichmentBolt.fails=true
#TelemetryIndexingBolt
-com.apache.metron.metrics.TelemetryIndexingBolt.acks=true
-com.apache.metron.metrics.TelemetryIndexingBolt.emits=true
-com.apache.metron.metrics.TelemetryIndexingBolt.fails=true
+org.apache.metron.metrics.TelemetryIndexingBolt.acks=true
+org.apache.metron.metrics.TelemetryIndexingBolt.emits=true
+org.apache.metron.metrics.TelemetryIndexingBolt.fails=true
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/paloalto/topology.conf
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/paloalto/topology.conf b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/paloalto/topology.conf
index b61c7cc..6ccfed8 100644
--- a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/paloalto/topology.conf
+++ b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/paloalto/topology.conf
@@ -26,7 +26,7 @@ spout.test.parallelism.repeat=false
spout.kafka.topic=paloalto_raw
#Parser Bolt
-bolt.parser.adapter=com.apache.metron.parsing.parsers.BasicPaloAltoFirewallParser
+bolt.parser.adapter=org.apache.metron.parsing.parsers.BasicPaloAltoFirewallParser
#Host Enrichment
@@ -75,30 +75,30 @@ bolt.indexing.indexname=paloalto_index
bolt.indexing.timestamp=yyyy.MM.ww
bolt.indexing.documentname=paloalto_doc
bolt.indexing.bulk=1
-bolt.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#Alerts Indexing Bolt
bolt.alerts.indexing.indexname=alert
bolt.alerts.indexing.timestamp=yyyy.MM.ww
bolt.alerts.indexing.documentname=paloalto_alert
bolt.alerts.indexing.bulk=1
-bolt.alerts.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.alerts.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#Error Indexing Bolt
bolt.error.indexing.indexname=error
bolt.error.indexing.timestamp.yyyy.MM
bolt.error.indexing.documentname=paloalto_error
bolt.error.indexing.bulk=1
-bolt.error.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.error.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#Alerts Bolt
-bolt.alerts.adapter=com.apache.metron.alerts.adapters.CIFAlertsAdapter
-com.apache.metron.alerts.adapters.CIFAlertsAdapter.whitelist_table_name = ip_whitelist
-com.apache.metron.alerts.adapters.CIFAlertsAdapter.blacklist_table_name = ip_blacklist
-com.apache.metron.alerts.adapters.CIFAlertsAdapter.quorum=zkpr1,zkpr2,zkpr3
-com.apache.metron.alerts.adapters.CIFAlertsAdapter.port=2181
-com.apache.metron.alerts.adapters.CIFAlertsAdapter._MAX_CACHE_SIZE_OBJECTS_NUM=3600
-com.apache.metron.alerts.adapters.CIFAlertsAdapter._MAX_TIME_RETAIN_MINUTES=1000
+bolt.alerts.adapter=org.apache.metron.alerts.adapters.CIFAlertsAdapter
+org.apache.metron.alerts.adapters.CIFAlertsAdapter.whitelist_table_name = ip_whitelist
+org.apache.metron.alerts.adapters.CIFAlertsAdapter.blacklist_table_name = ip_blacklist
+org.apache.metron.alerts.adapters.CIFAlertsAdapter.quorum=zkpr1,zkpr2,zkpr3
+org.apache.metron.alerts.adapters.CIFAlertsAdapter.port=2181
+org.apache.metron.alerts.adapters.CIFAlertsAdapter._MAX_CACHE_SIZE_OBJECTS_NUM=3600
+org.apache.metron.alerts.adapters.CIFAlertsAdapter._MAX_TIME_RETAIN_MINUTES=1000
#HDFS Bolt
bolt.hdfs.batch.size=5000
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/pcap/metrics.conf
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/pcap/metrics.conf b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/pcap/metrics.conf
index 0036e15..aa7a6e0 100644
--- a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/pcap/metrics.conf
+++ b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/pcap/metrics.conf
@@ -1,26 +1,26 @@
#reporters
-com.apache.metron.metrics.reporter.graphite=true
-com.apache.metron.metrics.reporter.console=false
-com.apache.metron.metrics.reporter.jmx=false
+org.apache.metron.metrics.reporter.graphite=true
+org.apache.metron.metrics.reporter.console=false
+org.apache.metron.metrics.reporter.jmx=false
#Graphite Addresses
-com.apache.metron.metrics.graphite.address=localhost
-com.apache.metron.metrics.graphite.port=2023
+org.apache.metron.metrics.graphite.address=localhost
+org.apache.metron.metrics.graphite.port=2023
#TelemetryParserBolt
-com.apache.metron.metrics.TelemetryParserBolt.acks=true
-com.apache.metron.metrics.TelemetryParserBolt.emits=true
-com.apache.metron.metrics.TelemetryParserBolt.fails=true
+org.apache.metron.metrics.TelemetryParserBolt.acks=true
+org.apache.metron.metrics.TelemetryParserBolt.emits=true
+org.apache.metron.metrics.TelemetryParserBolt.fails=true
#GenericEnrichmentBolt
-com.apache.metron.metrics.GenericEnrichmentBolt.acks=true
-com.apache.metron.metrics.GenericEnrichmentBolt.emits=true
-com.apache.metron.metrics.GenericEnrichmentBolt.fails=true
+org.apache.metron.metrics.GenericEnrichmentBolt.acks=true
+org.apache.metron.metrics.GenericEnrichmentBolt.emits=true
+org.apache.metron.metrics.GenericEnrichmentBolt.fails=true
#TelemetryIndexingBolt
-com.apache.metron.metrics.TelemetryIndexingBolt.acks=true
-com.apache.metron.metrics.TelemetryIndexingBolt.emits=true
-com.apache.metron.metrics.TelemetryIndexingBolt.fails=true
+org.apache.metron.metrics.TelemetryIndexingBolt.acks=true
+org.apache.metron.metrics.TelemetryIndexingBolt.emits=true
+org.apache.metron.metrics.TelemetryIndexingBolt.fails=true
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/pcap/topology.conf
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/pcap/topology.conf b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/pcap/topology.conf
index 2743820..bf6d0bb 100644
--- a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/pcap/topology.conf
+++ b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/pcap/topology.conf
@@ -86,20 +86,20 @@ bolt.indexing.indexname=pcap_index
bolt.indexing.timestamp=yyyy.MM.dd.hh
bolt.indexing.documentname=pcap_doc
bolt.indexing.bulk=1
-bolt.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#Alerts Indexing Bolt
bolt.alerts.indexing.indexname=pcap_alert_test
bolt.alerts.indexing.documentname=pcap_alert
bolt.alerts.indexing.bulk=1
-bolt.alerts.indexing.adapter=com.apache.metron.indexing.adapters.ESBaseBulkAdapter
+bolt.alerts.indexing.adapter=org.apache.metron.indexing.adapters.ESBaseBulkAdapter
#Error Indexing Bolt
bolt.error.indexing.indexname=error
bolt.error.indexing.timestamp=yyyy.MM
bolt.error.indexing.documentname=pcap_error
bolt.error.indexing.bulk=1
-bolt.error.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.error.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#HDFS Bolt
bolt.hdfs.batch.size=5000
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/sourcefire/metrics.conf
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/sourcefire/metrics.conf b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/sourcefire/metrics.conf
index 0036e15..aa7a6e0 100644
--- a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/sourcefire/metrics.conf
+++ b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/sourcefire/metrics.conf
@@ -1,26 +1,26 @@
#reporters
-com.apache.metron.metrics.reporter.graphite=true
-com.apache.metron.metrics.reporter.console=false
-com.apache.metron.metrics.reporter.jmx=false
+org.apache.metron.metrics.reporter.graphite=true
+org.apache.metron.metrics.reporter.console=false
+org.apache.metron.metrics.reporter.jmx=false
#Graphite Addresses
-com.apache.metron.metrics.graphite.address=localhost
-com.apache.metron.metrics.graphite.port=2023
+org.apache.metron.metrics.graphite.address=localhost
+org.apache.metron.metrics.graphite.port=2023
#TelemetryParserBolt
-com.apache.metron.metrics.TelemetryParserBolt.acks=true
-com.apache.metron.metrics.TelemetryParserBolt.emits=true
-com.apache.metron.metrics.TelemetryParserBolt.fails=true
+org.apache.metron.metrics.TelemetryParserBolt.acks=true
+org.apache.metron.metrics.TelemetryParserBolt.emits=true
+org.apache.metron.metrics.TelemetryParserBolt.fails=true
#GenericEnrichmentBolt
-com.apache.metron.metrics.GenericEnrichmentBolt.acks=true
-com.apache.metron.metrics.GenericEnrichmentBolt.emits=true
-com.apache.metron.metrics.GenericEnrichmentBolt.fails=true
+org.apache.metron.metrics.GenericEnrichmentBolt.acks=true
+org.apache.metron.metrics.GenericEnrichmentBolt.emits=true
+org.apache.metron.metrics.GenericEnrichmentBolt.fails=true
#TelemetryIndexingBolt
-com.apache.metron.metrics.TelemetryIndexingBolt.acks=true
-com.apache.metron.metrics.TelemetryIndexingBolt.emits=true
-com.apache.metron.metrics.TelemetryIndexingBolt.fails=true
+org.apache.metron.metrics.TelemetryIndexingBolt.acks=true
+org.apache.metron.metrics.TelemetryIndexingBolt.emits=true
+org.apache.metron.metrics.TelemetryIndexingBolt.fails=true
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/sourcefire/topology.conf
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/sourcefire/topology.conf b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/sourcefire/topology.conf
index ec7ec76..c3c04db 100644
--- a/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/sourcefire/topology.conf
+++ b/metron-streaming/Metron-Topologies/src/main/resources/Metron_Configs/topologies/sourcefire/topology.conf
@@ -26,7 +26,7 @@ spout.test.parallelism.repeat=false
spout.kafka.topic=sourcefire_raw
#Parser Bolt
-bolt.parser.adapter=com.apache.metron.parsing.parsers.BasicSourcefireParser
+bolt.parser.adapter=org.apache.metron.parsing.parsers.BasicSourcefireParser
#Host Enrichment
@@ -72,30 +72,30 @@ bolt.indexing.indexname=sourcefire_index
bolt.indexing.timestamp=yyyy.MM.ww
bolt.indexing.documentname=sourcefire_doc
bolt.indexing.bulk=1
-bolt.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#Alerts Indexing Bolt
bolt.alerts.indexing.indexname=alert
bolt.alerts.indexing.timestamp=yyyy.MM.ww
bolt.alerts.indexing.documentname=sourcefire_alert
bolt.alerts.indexing.bulk=1
-bolt.alerts.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.alerts.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#Error Indexing Bolt
bolt.error.indexing.indexname=error
bolt.error.indexing.timestamp=yyyy.MM
bolt.error.indexing.documentname=sourcefire_error
bolt.error.indexing.bulk=1
-bolt.error.indexing.adapter=com.apache.metron.indexing.adapters.ESTimedRotatingAdapter
+bolt.error.indexing.adapter=org.apache.metron.indexing.adapters.ESTimedRotatingAdapter
#Alerts Bolt
-bolt.alerts.adapter=com.apache.metron.alerts.adapters.AllAlertAdapter
-com.apache.metron.alerts.adapters.AllAlertAdapter.whitelist_table_name = ip_whitelist
-com.apache.metron.alerts.adapters.AllAlertAdapter.blacklist_table_name = ip_blacklist
-com.apache.metron.alerts.adapters.AllAlertAdapter.quorum=zkpr1,zkpr2,zkpr3
-com.apache.metron.alerts.adapters.AllAlertAdapter.port=2181
-com.apache.metron.alerts.adapters.AllAlertAdapter._MAX_CACHE_SIZE_OBJECTS_NUM=3600
-com.apache.metron.alerts.adapters.AllAlertAdapter._MAX_TIME_RETAIN_MINUTES=1000
+bolt.alerts.adapter=org.apache.metron.alerts.adapters.AllAlertAdapter
+org.apache.metron.alerts.adapters.AllAlertAdapter.whitelist_table_name = ip_whitelist
+org.apache.metron.alerts.adapters.AllAlertAdapter.blacklist_table_name = ip_blacklist
+org.apache.metron.alerts.adapters.AllAlertAdapter.quorum=zkpr1,zkpr2,zkpr3
+org.apache.metron.alerts.adapters.AllAlertAdapter.port=2181
+org.apache.metron.alerts.adapters.AllAlertAdapter._MAX_CACHE_SIZE_OBJECTS_NUM=3600
+org.apache.metron.alerts.adapters.AllAlertAdapter._MAX_TIME_RETAIN_MINUTES=1000
#HDFS Bolt
bolt.hdfs.batch.size=5000
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/pom.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/pom.xml b/metron-streaming/pom.xml
index f46ec98..9d4d79b 100644
--- a/metron-streaming/pom.xml
+++ b/metron-streaming/pom.xml
@@ -12,7 +12,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>com.apache.metron</groupId>
+ <groupId>org.apache.metron</groupId>
<artifactId>Metron-Streaming</artifactId>
<version>0.6BETA</version>
<packaging>pom</packaging>