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:58 UTC
[80/89] [abbrv] incubator-metron git commit: Rename com.apache to
org.apache
Rename com.apache to org.apache
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/d504487d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/d504487d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/d504487d
Branch: refs/heads/master
Commit: d504487d19c5f2a16e3f255945c8a3ee3c4b54f7
Parents: 3854e07
Author: Elana Hashman <el...@rackspace.com>
Authored: Wed Jan 13 22:29:13 2016 +0000
Committer: cstella <ce...@gmail.com>
Committed: Tue Jan 26 08:45:12 2016 -0500
----------------------------------------------------------------------
metron-streaming/Metron-Alerts/pom.xml | 4 +-
metron-streaming/Metron-Alerts/readme.md | 8 +--
.../apache/metron/alerts/AbstractAlertBolt.java | 6 +-
.../metron/alerts/TelemetryAlertsBolt.java | 14 ++---
.../alerts/adapters/AbstractAlertAdapter.java | 4 +-
.../metron/alerts/adapters/AllAlertAdapter.java | 4 +-
.../alerts/adapters/CIFAlertsAdapter.java | 4 +-
.../adapters/HbaseWhiteAndBlacklistAdapter.java | 4 +-
.../alerts/adapters/KeywordsAlertAdapter.java | 4 +-
.../metron/alerts/adapters/RangeChecker.java | 2 +-
.../alerts/adapters/ThreatAlertsAdapter.java | 4 +-
.../metron/tagging/AbstractTaggerBolt.java | 6 +-
.../metron/tagging/TelemetryTaggerBolt.java | 12 ++--
.../tagging/adapters/AbstractTaggerAdapter.java | 4 +-
.../metron/tagging/adapters/RegexTagger.java | 2 +-
.../tagging/adapters/StaticAllTagger.java | 2 +-
.../metron/tagging/adapters/TaggerAdapter.java | 2 +-
.../alerts/adapters/AllAlertAdapterTest.java | 14 ++---
.../resources/config/AllAlertAdapterTest.config | 14 ++---
metron-streaming/Metron-Common/pom.xml | 2 +-
.../metron/alerts/interfaces/AlertsAdapter.java | 2 +-
.../alerts/interfaces/AlertsInterface.java | 2 +-
.../metron/alerts/interfaces/TaggerAdapter.java | 2 +-
.../configuration/ConfigurationManager.java | 2 +-
.../dataloads/interfaces/ThreatIntelSource.java | 2 +-
.../interfaces/EnrichmentAdapter.java | 2 +-
.../java/org/apache/metron/hbase/HBaseBolt.java | 4 +-
.../metron/hbase/HBaseStreamPartitioner.java | 2 +-
.../apache/metron/hbase/HTableConnector.java | 2 +-
.../apache/metron/hbase/TupleTableConfig.java | 2 +-
.../metron/helpers/services/PcapServiceCli.java | 4 +-
.../org/apache/metron/helpers/topology/Cli.java | 4 +-
.../metron/helpers/topology/ErrorGenerator.java | 2 +-
.../metron/helpers/topology/SettingsLoader.java | 2 +-
.../metron/index/interfaces/IndexAdapter.java | 2 +-
.../org/apache/metron/ise/parser/ISEParser.java | 2 +-
.../org/apache/metron/ise/parser/ISEParser.jj | 2 +-
.../metron/ise/parser/ISEParserConstants.java | 2 +-
.../ise/parser/ISEParserTokenManager.java | 2 +-
.../metron/ise/parser/JavaCharStream.java | 2 +-
.../metron/ise/parser/ParseException.java | 2 +-
.../org/apache/metron/ise/parser/Token.java | 2 +-
.../apache/metron/ise/parser/TokenMgrError.java | 2 +-
.../json/serialization/JSONDecoderHelper.java | 2 +-
.../json/serialization/JSONEncoderHelper.java | 2 +-
.../json/serialization/JSONKafkaSerializer.java | 12 ++--
.../json/serialization/JSONKryoSerializer.java | 2 +-
.../apache/metron/metrics/MetricReporter.java | 2 +-
.../apache/metron/metrics/MyMetricReporter.java | 2 +-
.../org/apache/metron/metrics/NullReporter.java | 2 +-
.../metron/parser/interfaces/MessageFilter.java | 2 +-
.../metron/parser/interfaces/MessageParser.java | 2 +-
.../java/org/apache/metron/pcap/Constants.java | 2 +-
.../org/apache/metron/pcap/IEEE_802_1Q.java | 2 +-
.../metron/pcap/MetronEthernetDecoder.java | 2 +-
.../java/org/apache/metron/pcap/PacketInfo.java | 6 +-
.../apache/metron/pcap/PcapByteInputStream.java | 2 +-
.../metron/pcap/PcapByteOutputStream.java | 2 +-
.../java/org/apache/metron/pcap/PcapMerger.java | 2 +-
.../metron/pcap/PcapPacketComparator.java | 2 +-
.../java/org/apache/metron/pcap/PcapParser.java | 2 +-
.../java/org/apache/metron/pcap/PcapUtils.java | 2 +-
.../apache/metron/test/AbstractConfigTest.java | 4 +-
.../apache/metron/test/AbstractSchemaTest.java | 2 +-
.../apache/metron/test/AbstractTestContext.java | 2 +-
.../metron/tldextractor/BasicTldExtractor.java | 2 +-
.../test/BasicTldExtractorTest.java | 14 ++---
metron-streaming/Metron-DataLoads/pom.xml | 4 +-
.../metron/dataloads/ThreatIntelLoader.java | 4 +-
.../metron/dataloads/cif/HBaseTableLoad.java | 4 +-
metron-streaming/Metron-DataServices/pom.xml | 10 ++--
.../metron/alerts/server/AlertsCacheReaper.java | 2 +-
.../alerts/server/AlertsFilterCacheEntry.java | 2 +-
.../alerts/server/AlertsProcessingServer.java | 2 +-
.../metron/alerts/server/AlertsSearcher.java | 2 +-
.../org/apache/metron/dataservices/Main.java | 12 ++--
.../metron/dataservices/auth/AuthToken.java | 2 +-
.../dataservices/auth/AuthTokenFilter.java | 2 +-
.../dataservices/auth/CustomDomainADRealm.java | 2 +-
.../auth/RestSecurityInterceptor.java | 2 +-
.../dataservices/common/MetronService.java | 2 +-
.../dataservices/kafkaclient/KafkaClient.java | 2 +-
.../dataservices/kafkaclient/KafkaConsumer.java | 2 +-
.../kafkaclient/poll/PollingKafkaClient.java | 2 +-
.../kafkaclient/poll/PollingKafkaConsumer.java | 2 +-
.../modules/guice/AlertsServerModule.java | 8 +--
.../modules/guice/DefaultServletModule.java | 10 ++--
.../modules/guice/DefaultShiroWebModule.java | 4 +-
.../modules/guice/RestEasyModule.java | 8 +--
.../modules/guice/ServiceModule.java | 8 +--
.../apache/metron/dataservices/rest/Index.java | 6 +-
.../metron/dataservices/rest/RestServices.java | 2 +-
.../dataservices/servlet/LoginServlet.java | 4 +-
.../dataservices/servlet/LogoutServlet.java | 2 +-
.../websocket/KafkaMessageSenderServlet.java | 2 +-
.../websocket/KafkaMessageSenderSocket.java | 4 +-
.../websocket/KafkaWebSocketCreator.java | 4 +-
.../pcapservice/CellTimestampComparator.java | 2 +-
.../metron/pcapservice/ConfigurationUtil.java | 4 +-
.../pcapservice/HBaseConfigConstants.java | 2 +-
.../pcapservice/HBaseConfigurationUtil.java | 2 +-
.../apache/metron/pcapservice/IPcapGetter.java | 2 +-
.../apache/metron/pcapservice/IPcapScanner.java | 2 +-
.../metron/pcapservice/PcapGetterHBaseImpl.java | 2 +-
.../apache/metron/pcapservice/PcapHelper.java | 2 +-
.../pcapservice/PcapReceiverImplRestEasy.java | 6 +-
.../pcapservice/PcapScannerHBaseImpl.java | 4 +-
.../metron/pcapservice/PcapsResponse.java | 4 +-
.../metron/pcapservice/RestTestingUtil.java | 2 +-
.../pcapservice/rest/JettyServiceRunner.java | 4 +-
.../metron/pcapservice/rest/PcapService.java | 6 +-
.../ElasticSearch_KafkaAlertsService.java | 4 +-
.../alerts/Solr_KafkaAlertsService.java | 4 +-
.../CellTimestampComparatorTest.java | 4 +-
.../Metron-EnrichmentAdapters/pom.xml | 4 +-
.../adapters/cif/AbstractCIFAdapter.java | 4 +-
.../adapters/cif/CIFHbaseAdapter.java | 2 +-
.../adapters/geo/AbstractGeoAdapter.java | 6 +-
.../adapters/geo/GeoMysqlAdapter.java | 2 +-
.../adapters/host/AbstractHostAdapter.java | 4 +-
.../host/HostFromPropertiesFileAdapter.java | 2 +-
.../adapters/threat/AbstractThreatAdapter.java | 4 +-
.../adapters/threat/ThreatHbaseAdapter.java | 2 +-
.../adapters/whois/AbstractWhoisAdapter.java | 4 +-
.../adapters/whois/WhoisHBaseAdapter.java | 4 +-
.../common/AbstractEnrichmentBolt.java | 6 +-
.../common/GenericEnrichmentBolt.java | 14 ++---
.../adapters/cif/CIFHbaseAdapterTest.java | 20 +++----
.../adapters/geo/GeoMysqlAdapterTest.java | 10 ++--
.../adapters/whois/WhoisHBaseAdapterTest.java | 8 +--
metron-streaming/Metron-Indexing/pom.xml | 4 +-
metron-streaming/Metron-Indexing/readme.md | 8 +--
.../metron/indexing/AbstractIndexingBolt.java | 6 +-
.../metron/indexing/TelemetryIndexingBolt.java | 14 ++---
.../indexing/adapters/AbstractIndexAdapter.java | 6 +-
.../indexing/adapters/ESBaseBulkAdapter.java | 2 +-
.../adapters/ESBulkRotatingAdapter.java | 2 +-
.../adapters/ESTimedRotatingAdapter.java | 2 +-
.../metron/indexing/adapters/SolrAdapter.java | 2 +-
metron-streaming/Metron-MessageParsers/pom.xml | 4 +-
.../Metron-MessageParsers/readme.md | 10 ++--
.../apache/metron/filters/BroMessageFilter.java | 4 +-
.../metron/filters/GenericMessageFilter.java | 4 +-
.../metron/parsing/AbstractParserBolt.java | 8 +--
.../apache/metron/parsing/PcapParserBolt.java | 8 +--
.../metron/parsing/TelemetryParserBolt.java | 16 +++---
.../metron/parsing/parsers/AbstractParser.java | 6 +-
.../metron/parsing/parsers/BasicBroParser.java | 4 +-
.../parsing/parsers/BasicFireEyeParser.java | 2 +-
.../metron/parsing/parsers/BasicIseParser.java | 4 +-
.../parsing/parsers/BasicLancopeParser.java | 2 +-
.../parsing/parsers/BasicLogstashParser.java | 2 +-
.../parsers/BasicPaloAltoFirewallParser.java | 4 +-
.../parsing/parsers/BasicSourcefireParser.java | 4 +-
.../metron/parsing/parsers/GrokAsaParser.java | 2 +-
.../parsing/parsers/GrokSourcefireParser.java | 2 +-
.../metron/parsing/parsers/GrokUtils.java | 2 +-
.../metron/parsing/parsers/JSONCleaner.java | 2 +-
.../metron/parsing/parsers/MetronConverter.java | 2 +-
.../metron/parsing/parsers/MetronGarbage.java | 2 +-
.../metron/parsing/parsers/MetronGrok.java | 2 +-
.../metron/parsing/parsers/MetronMatch.java | 2 +-
.../metron/parsing/parsers/ParserUtils.java | 2 +-
.../metron/parsing/parsers/PcapParser.java | 10 ++--
.../metron/parsing/test/BasicBroParserTest.java | 4 +-
.../parsing/test/BasicFireEyeParserTest.java | 10 ++--
.../metron/parsing/test/BasicIseParserTest.java | 10 ++--
.../parsing/test/BasicLancopeParserTest.java | 10 ++--
.../test/BasicPaloAltoFirewallParserTest.java | 10 ++--
.../parsing/test/BasicSourcefireParserTest.java | 10 ++--
.../metron/parsing/test/BroParserTest.java | 8 +--
.../metron/parsing/test/GrokAsaParserTest.java | 10 ++--
metron-streaming/Metron-Pcap_Service/pom.xml | 6 +-
.../pcapservice/CellTimestampComparator.java | 2 +-
.../metron/pcapservice/ConfigurationUtil.java | 4 +-
.../pcapservice/HBaseConfigConstants.java | 2 +-
.../pcapservice/HBaseConfigurationUtil.java | 2 +-
.../apache/metron/pcapservice/IPcapGetter.java | 2 +-
.../apache/metron/pcapservice/IPcapScanner.java | 2 +-
.../metron/pcapservice/PcapGetterHBaseImpl.java | 2 +-
.../apache/metron/pcapservice/PcapHelper.java | 2 +-
.../pcapservice/PcapReceiverImplRestEasy.java | 4 +-
.../pcapservice/PcapScannerHBaseImpl.java | 4 +-
.../metron/pcapservice/PcapsResponse.java | 4 +-
.../metron/pcapservice/RestTestingUtil.java | 2 +-
.../pcapservice/rest/JettyServiceRunner.java | 4 +-
.../metron/pcapservice/rest/PcapService.java | 6 +-
.../CellTimestampComparatorTest.java | 4 +-
.../pcapservice/ConfigurationUtilTest.java | 6 +-
.../pcapservice/HBaseConfigurationUtilTest.java | 4 +-
.../pcapservice/HBaseIntegrationTest.java | 2 +-
.../pcapservice/PcapGetterHBaseImplTest.java | 6 +-
.../metron/pcapservice/PcapHelperTest.java | 6 +-
.../pcapservice/PcapScannerHBaseImplTest.java | 2 +-
metron-streaming/Metron-Topologies/pom.xml | 12 ++--
metron-streaming/Metron-Topologies/readme.md | 8 +--
.../apache/metron/test/bolts/PrintingBolt.java | 2 +-
.../metron/test/filereaders/FileReader.java | 2 +-
.../test/spouts/GenericInternalTestSpout.java | 4 +-
.../metron/test/spouts/PcapSimulatorSpout.java | 4 +-
.../java/org/apache/metron/topology/Asa.java | 6 +-
.../java/org/apache/metron/topology/Bro.java | 6 +-
.../org/apache/metron/topology/FireEye.java | 6 +-
.../java/org/apache/metron/topology/Ise.java | 6 +-
.../org/apache/metron/topology/Lancope.java | 6 +-
.../metron/topology/PaloAltoFirewall.java | 8 +--
.../java/org/apache/metron/topology/Pcap.java | 6 +-
.../org/apache/metron/topology/Sourcefire.java | 6 +-
.../metron/topology/runner/AsaRunner.java | 12 ++--
.../metron/topology/runner/BroRunner.java | 12 ++--
.../metron/topology/runner/FireEyeRunner.java | 12 ++--
.../metron/topology/runner/ISERunner.java | 12 ++--
.../metron/topology/runner/LancopeRunner.java | 14 ++---
.../topology/runner/PaloAltoFirewallRunner.java | 12 ++--
.../metron/topology/runner/PcapRunner.java | 6 +-
.../topology/runner/SourcefireRunner.java | 12 ++--
.../metron/topology/runner/TopologyRunner.java | 40 ++++++-------
.../Metron_Configs/topologies/asa/metrics.conf | 28 ++++-----
.../Metron_Configs/topologies/asa/topology.conf | 22 +++----
.../Metron_Configs/topologies/bro/metrics.conf | 28 ++++-----
.../Metron_Configs/topologies/bro/topology.conf | 60 ++++++++++----------
.../topologies/fireeye/metrics.conf | 28 ++++-----
.../topologies/fireeye/topology.conf | 22 +++----
.../Metron_Configs/topologies/ise/metrics.conf | 28 ++++-----
.../Metron_Configs/topologies/ise/topology.conf | 8 +--
.../topologies/lancope/metrics.conf | 28 ++++-----
.../topologies/lancope/topology.conf | 8 +--
.../topologies/paloalto/metrics.conf | 28 ++++-----
.../topologies/paloalto/topology.conf | 22 +++----
.../Metron_Configs/topologies/pcap/metrics.conf | 28 ++++-----
.../topologies/pcap/topology.conf | 6 +-
.../topologies/sourcefire/metrics.conf | 28 ++++-----
.../topologies/sourcefire/topology.conf | 22 +++----
metron-streaming/pom.xml | 2 +-
234 files changed, 717 insertions(+), 717 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Alerts/pom.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/pom.xml b/metron-streaming/Metron-Alerts/pom.xml
index 8dac217..971a4bb 100644
--- a/metron-streaming/Metron-Alerts/pom.xml
+++ b/metron-streaming/Metron-Alerts/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>
@@ -27,7 +27,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-Alerts/readme.md
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/readme.md b/metron-streaming/Metron-Alerts/readme.md
index 08b24ab..2b87d50 100644
--- a/metron-streaming/Metron-Alerts/readme.md
+++ b/metron-streaming/Metron-Alerts/readme.md
@@ -91,10 +91,10 @@ AlertsAdapter - pick the appropriate adapter for generating the alerts
Java adapters are designed for high volume topologies, but are not easily extensible. The adapters provided are:
-* com.apache.metron.alerts.adapters.AllAlertsAdapter - will tag every single message with the static alert (appropriate for topologies like Sourcefire, etc, where every single message is an alert)
-* com.apache.metron.alerts.adapters.HbaseWhiteAndBlacklistAdapter - will read white and blacklists from HBase and fire alerts if source or dest IP are not on the whitelist or if any IP is on the blacklist
-* com.apache.metron.alerts.adapters.CIFAlertsAdapter - will alert on messages that have results in enrichment.cif.
-* com.apache.metron.alerts.adpaters.KeywordsAlertAdapter - will alert on messages that contain any of a list of keywords
+* org.apache.metron.alerts.adapters.AllAlertsAdapter - will tag every single message with the static alert (appropriate for topologies like Sourcefire, etc, where every single message is an alert)
+* org.apache.metron.alerts.adapters.HbaseWhiteAndBlacklistAdapter - will read white and blacklists from HBase and fire alerts if source or dest IP are not on the whitelist or if any IP is on the blacklist
+* org.apache.metron.alerts.adapters.CIFAlertsAdapter - will alert on messages that have results in enrichment.cif.
+* org.apache.metron.alerts.adpaters.KeywordsAlertAdapter - will alert on messages that contain any of a list of keywords
###Grok Adapters
Grok alerts adapters for Metron are still under devleopment
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/AbstractAlertBolt.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/AbstractAlertBolt.java b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/AbstractAlertBolt.java
index 2d172d1..8d32795 100644
--- a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/AbstractAlertBolt.java
+++ b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/AbstractAlertBolt.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.apache.metron.alerts;
+package org.apache.metron.alerts;
import java.io.IOException;
import java.util.Map;
@@ -32,8 +32,8 @@ import backtype.storm.tuple.Fields;
import com.codahale.metrics.Counter;
import com.google.common.cache.Cache;
-import com.apache.metron.alerts.interfaces.AlertsAdapter;
-import com.apache.metron.metrics.MetricReporter;
+import org.apache.metron.alerts.interfaces.AlertsAdapter;
+import org.apache.metron.metrics.MetricReporter;
@SuppressWarnings("rawtypes")
public abstract class AbstractAlertBolt extends BaseRichBolt {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/TelemetryAlertsBolt.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/TelemetryAlertsBolt.java b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/TelemetryAlertsBolt.java
index 59c8784..1ad6d14 100644
--- a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/TelemetryAlertsBolt.java
+++ b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/TelemetryAlertsBolt.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.apache.metron.alerts;
+package org.apache.metron.alerts;
import java.io.IOException;
import java.util.Map;
@@ -32,10 +32,10 @@ import backtype.storm.tuple.Tuple;
import backtype.storm.tuple.Values;
import com.google.common.cache.CacheBuilder;
-import com.apache.metron.alerts.interfaces.AlertsAdapter;
-import com.apache.metron.helpers.topology.ErrorGenerator;
-import com.apache.metron.json.serialization.JSONEncoderHelper;
-import com.apache.metron.metrics.MetricReporter;
+import org.apache.metron.alerts.interfaces.AlertsAdapter;
+import org.apache.metron.helpers.topology.ErrorGenerator;
+import org.apache.metron.json.serialization.JSONEncoderHelper;
+import org.apache.metron.metrics.MetricReporter;
@SuppressWarnings("rawtypes")
public class TelemetryAlertsBolt extends AbstractAlertBolt {
@@ -43,7 +43,7 @@ public class TelemetryAlertsBolt extends AbstractAlertBolt {
/**
* Use an adapter to tag existing telemetry messages with alerts. The list
* of available tagger adapters is located under
- * com.apache.metron.tagging.adapters. At the time of the release the following
+ * org.apache.metron.tagging.adapters. At the time of the release the following
* adapters are available:
*
* <p>
@@ -114,7 +114,7 @@ public class TelemetryAlertsBolt extends AbstractAlertBolt {
public TelemetryAlertsBolt 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-Alerts/src/main/java/org/apache/metron/alerts/adapters/AbstractAlertAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/AbstractAlertAdapter.java b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/AbstractAlertAdapter.java
index a3ab42a..0e9ef4b 100644
--- a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/AbstractAlertAdapter.java
+++ b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/AbstractAlertAdapter.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.apache.metron.alerts.adapters;
+package org.apache.metron.alerts.adapters;
import java.io.Serializable;
import java.util.UUID;
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
-import com.apache.metron.alerts.interfaces.AlertsAdapter;
+import org.apache.metron.alerts.interfaces.AlertsAdapter;
@SuppressWarnings("serial")
public abstract class AbstractAlertAdapter implements AlertsAdapter, Serializable{
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/AllAlertAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/AllAlertAdapter.java b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/AllAlertAdapter.java
index 2a861ce..dc03834 100644
--- a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/AllAlertAdapter.java
+++ b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/AllAlertAdapter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.alerts.adapters;
+package org.apache.metron.alerts.adapters;
import java.io.Serializable;
import java.util.HashMap;
@@ -24,7 +24,7 @@ import org.json.simple.JSONObject;
import org.apache.log4j.Logger;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
-import com.apache.metron.alerts.interfaces.AlertsAdapter;
+import org.apache.metron.alerts.interfaces.AlertsAdapter;
@SuppressWarnings("serial")
public class AllAlertAdapter implements AlertsAdapter, Serializable {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/CIFAlertsAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/CIFAlertsAdapter.java b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/CIFAlertsAdapter.java
index 0ea313f..690944b 100644
--- a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/CIFAlertsAdapter.java
+++ b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/CIFAlertsAdapter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.alerts.adapters;
+package org.apache.metron.alerts.adapters;
import java.io.Serializable;
import java.util.HashMap;
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
-import com.apache.metron.alerts.interfaces.AlertsAdapter;
+import org.apache.metron.alerts.interfaces.AlertsAdapter;
@SuppressWarnings("serial")
public class CIFAlertsAdapter implements AlertsAdapter, Serializable {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/HbaseWhiteAndBlacklistAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/HbaseWhiteAndBlacklistAdapter.java b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/HbaseWhiteAndBlacklistAdapter.java
index d5ca414..68f2e3d 100644
--- a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/HbaseWhiteAndBlacklistAdapter.java
+++ b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/HbaseWhiteAndBlacklistAdapter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.alerts.adapters;
+package org.apache.metron.alerts.adapters;
import java.io.Serializable;
import java.util.HashMap;
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
-import com.apache.metron.alerts.interfaces.AlertsAdapter;
+import org.apache.metron.alerts.interfaces.AlertsAdapter;
public class HbaseWhiteAndBlacklistAdapter implements AlertsAdapter,
Serializable {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/KeywordsAlertAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/KeywordsAlertAdapter.java b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/KeywordsAlertAdapter.java
index 4db45f8..7922e1f 100644
--- a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/KeywordsAlertAdapter.java
+++ b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/KeywordsAlertAdapter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.alerts.adapters;
+package org.apache.metron.alerts.adapters;
import java.util.ArrayList;
import java.util.Arrays;
@@ -26,7 +26,7 @@ import org.apache.log4j.Logger;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
-import com.apache.metron.alerts.interfaces.AlertsAdapter;
+import org.apache.metron.alerts.interfaces.AlertsAdapter;
public class KeywordsAlertAdapter extends AbstractAlertAdapter {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/RangeChecker.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/RangeChecker.java b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/RangeChecker.java
index 2b37401..68d94bf 100644
--- a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/RangeChecker.java
+++ b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/RangeChecker.java
@@ -1,4 +1,4 @@
-package com.apache.metron.alerts.adapters;
+package org.apache.metron.alerts.adapters;
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/ThreatAlertsAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/ThreatAlertsAdapter.java b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/ThreatAlertsAdapter.java
index 48d773d..393269c 100644
--- a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/ThreatAlertsAdapter.java
+++ b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/alerts/adapters/ThreatAlertsAdapter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.alerts.adapters;
+package org.apache.metron.alerts.adapters;
import java.io.Serializable;
import java.util.HashMap;
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
-import com.apache.metron.alerts.interfaces.AlertsAdapter;
+import org.apache.metron.alerts.interfaces.AlertsAdapter;
@SuppressWarnings("serial")
public class ThreatAlertsAdapter implements AlertsAdapter, Serializable {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/AbstractTaggerBolt.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/AbstractTaggerBolt.java b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/AbstractTaggerBolt.java
index 72eaacd..be60508 100644
--- a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/AbstractTaggerBolt.java
+++ b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/AbstractTaggerBolt.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.apache.metron.tagging;
+package org.apache.metron.tagging;
import java.io.IOException;
import java.util.Map;
@@ -31,8 +31,8 @@ import backtype.storm.topology.base.BaseRichBolt;
import backtype.storm.tuple.Fields;
import com.codahale.metrics.Counter;
-import com.apache.metron.alerts.interfaces.TaggerAdapter;
-import com.apache.metron.metrics.MetricReporter;
+import org.apache.metron.alerts.interfaces.TaggerAdapter;
+import org.apache.metron.metrics.MetricReporter;
@SuppressWarnings("rawtypes")
public abstract class AbstractTaggerBolt extends BaseRichBolt {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/TelemetryTaggerBolt.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/TelemetryTaggerBolt.java b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/TelemetryTaggerBolt.java
index 69f87b1..c8d05d2 100644
--- a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/TelemetryTaggerBolt.java
+++ b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/TelemetryTaggerBolt.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.apache.metron.tagging;
+package org.apache.metron.tagging;
import java.io.IOException;
import java.util.Map;
@@ -32,9 +32,9 @@ import backtype.storm.tuple.Fields;
import backtype.storm.tuple.Tuple;
import backtype.storm.tuple.Values;
-import com.apache.metron.alerts.interfaces.TaggerAdapter;
-import com.apache.metron.json.serialization.JSONEncoderHelper;
-import com.apache.metron.metrics.MetricReporter;
+import org.apache.metron.alerts.interfaces.TaggerAdapter;
+import org.apache.metron.json.serialization.JSONEncoderHelper;
+import org.apache.metron.metrics.MetricReporter;
@SuppressWarnings("rawtypes")
public class TelemetryTaggerBolt extends AbstractTaggerBolt {
@@ -42,7 +42,7 @@ public class TelemetryTaggerBolt extends AbstractTaggerBolt {
/**
* Use an adapter to tag existing telemetry messages with alerts. The list
* of available tagger adapters is located under
- * com.apache.metron.tagging.adapters. At the time of the release the following
+ * org.apache.metron.tagging.adapters. At the time of the release the following
* adapters are available:
*
* <p>
@@ -111,7 +111,7 @@ public class TelemetryTaggerBolt extends AbstractTaggerBolt {
public TelemetryTaggerBolt 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-Alerts/src/main/java/org/apache/metron/tagging/adapters/AbstractTaggerAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/adapters/AbstractTaggerAdapter.java b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/adapters/AbstractTaggerAdapter.java
index 8d56e6f..acf81ef 100644
--- a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/adapters/AbstractTaggerAdapter.java
+++ b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/adapters/AbstractTaggerAdapter.java
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-package com.apache.metron.tagging.adapters;
+package org.apache.metron.tagging.adapters;
import java.io.Serializable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.apache.metron.alerts.interfaces.TaggerAdapter;
+import org.apache.metron.alerts.interfaces.TaggerAdapter;
@SuppressWarnings("serial")
public abstract class AbstractTaggerAdapter implements TaggerAdapter, Serializable{
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/adapters/RegexTagger.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/adapters/RegexTagger.java b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/adapters/RegexTagger.java
index 2854ae6..da40135 100644
--- a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/adapters/RegexTagger.java
+++ b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/adapters/RegexTagger.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.apache.metron.tagging.adapters;
+package org.apache.metron.tagging.adapters;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/adapters/StaticAllTagger.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/adapters/StaticAllTagger.java b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/adapters/StaticAllTagger.java
index 3962620..e5277fd 100644
--- a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/adapters/StaticAllTagger.java
+++ b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/adapters/StaticAllTagger.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.apache.metron.tagging.adapters;
+package org.apache.metron.tagging.adapters;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/adapters/TaggerAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/adapters/TaggerAdapter.java b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/adapters/TaggerAdapter.java
index b3ba635..7af15de 100644
--- a/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/adapters/TaggerAdapter.java
+++ b/metron-streaming/Metron-Alerts/src/main/java/org/apache/metron/tagging/adapters/TaggerAdapter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.tagging.adapters;
+package org.apache.metron.tagging.adapters;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Alerts/src/test/java/org/apache/metron/alerts/adapters/AllAlertAdapterTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/src/test/java/org/apache/metron/alerts/adapters/AllAlertAdapterTest.java b/metron-streaming/Metron-Alerts/src/test/java/org/apache/metron/alerts/adapters/AllAlertAdapterTest.java
index 4e3e0a5..6731536 100644
--- a/metron-streaming/Metron-Alerts/src/test/java/org/apache/metron/alerts/adapters/AllAlertAdapterTest.java
+++ b/metron-streaming/Metron-Alerts/src/test/java/org/apache/metron/alerts/adapters/AllAlertAdapterTest.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.apache.metron.alerts.adapters;
+package org.apache.metron.alerts.adapters;
import java.lang.reflect.Constructor;
import java.util.Map;
import java.util.Properties;
-import com.apache.metron.test.AbstractConfigTest;
-import com.apache.metron.alerts.adapters.AllAlertAdapter;
+import org.apache.metron.test.AbstractConfigTest;
+import org.apache.metron.alerts.adapters.AllAlertAdapter;
/**
* <ul>
@@ -70,7 +70,7 @@ public class AllAlertAdapterTest extends AbstractConfigTest {
@SuppressWarnings("unchecked")
protected void setUp() throws Exception {
- super.setUp("com.apache.metron.alerts.adapters.AllAlertAdapter");
+ super.setUp("org.apache.metron.alerts.adapters.AllAlertAdapter");
Properties prop = super.getTestProperties();
assertNotNull(prop);
// this.setMode("global");
@@ -80,7 +80,7 @@ public class AllAlertAdapterTest extends AbstractConfigTest {
}else{
Map<String, String> settings = super.getSettings();
@SuppressWarnings("rawtypes")
- Class loaded_class = Class.forName("com.apache.metron.alerts.adapters.AllAlertAdapter");
+ Class loaded_class = Class.forName("org.apache.metron.alerts.adapters.AllAlertAdapter");
@SuppressWarnings("rawtypes")
Constructor constructor = loaded_class.getConstructor(new Class[] { Map.class});
@@ -100,7 +100,7 @@ public class AllAlertAdapterTest extends AbstractConfigTest {
/**
- * Test method for {@link com.apache.metron.alerts.adapters.AlllterAdapter#initialize()}.
+ * Test method for {@link org.apache.metron.alerts.adapters.AlllterAdapter#initialize()}.
*/
public void testInitializeAdapter() {
if(skipTests(this.getMode())){
@@ -113,7 +113,7 @@ public class AllAlertAdapterTest extends AbstractConfigTest {
}
/**
- * Test method for containsAlertId(@link com.apache.metron.alerts.adapters.AlllterAdapter#containsAlertId()}.
+ * Test method for containsAlertId(@link org.apache.metron.alerts.adapters.AlllterAdapter#containsAlertId()}.
*/
public void testContainsAlertId(){
if(skipTests(this.getMode())){
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Alerts/src/test/resources/config/AllAlertAdapterTest.config
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Alerts/src/test/resources/config/AllAlertAdapterTest.config b/metron-streaming/Metron-Alerts/src/test/resources/config/AllAlertAdapterTest.config
index e945245..fe7d109 100644
--- a/metron-streaming/Metron-Alerts/src/test/resources/config/AllAlertAdapterTest.config
+++ b/metron-streaming/Metron-Alerts/src/test/resources/config/AllAlertAdapterTest.config
@@ -1,8 +1,8 @@
#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
\ No newline at end of file
+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
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/pom.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/pom.xml b/metron-streaming/Metron-Common/pom.xml
index 78d0abd..ec9ff79 100644
--- a/metron-streaming/Metron-Common/pom.xml
+++ b/metron-streaming/Metron-Common/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>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/alerts/interfaces/AlertsAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/alerts/interfaces/AlertsAdapter.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/alerts/interfaces/AlertsAdapter.java
index 9b5bfa9..ea305b4 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/alerts/interfaces/AlertsAdapter.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/alerts/interfaces/AlertsAdapter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.alerts.interfaces;
+package org.apache.metron.alerts.interfaces;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/alerts/interfaces/AlertsInterface.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/alerts/interfaces/AlertsInterface.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/alerts/interfaces/AlertsInterface.java
index b71e3e9..7a4ac36 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/alerts/interfaces/AlertsInterface.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/alerts/interfaces/AlertsInterface.java
@@ -1,4 +1,4 @@
-package com.apache.metron.alerts.interfaces;
+package org.apache.metron.alerts.interfaces;
import org.json.simple.JSONObject;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/alerts/interfaces/TaggerAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/alerts/interfaces/TaggerAdapter.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/alerts/interfaces/TaggerAdapter.java
index db57b5f..bc9a3bb 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/alerts/interfaces/TaggerAdapter.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/alerts/interfaces/TaggerAdapter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.alerts.interfaces;
+package org.apache.metron.alerts.interfaces;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/configuration/ConfigurationManager.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/configuration/ConfigurationManager.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/configuration/ConfigurationManager.java
index 2bd05b9..2b5c28d 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/configuration/ConfigurationManager.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/configuration/ConfigurationManager.java
@@ -1,4 +1,4 @@
-package com.apache.metron.configuration;
+package org.apache.metron.configuration;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/dataloads/interfaces/ThreatIntelSource.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/dataloads/interfaces/ThreatIntelSource.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/dataloads/interfaces/ThreatIntelSource.java
index d579264..3bccacc 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/dataloads/interfaces/ThreatIntelSource.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/dataloads/interfaces/ThreatIntelSource.java
@@ -1,4 +1,4 @@
-package com.apache.metron.dataloads.interfaces;
+package org.apache.metron.dataloads.interfaces;
import java.util.Iterator;
import org.apache.commons.configuration.Configuration;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/enrichment/interfaces/EnrichmentAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/enrichment/interfaces/EnrichmentAdapter.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/enrichment/interfaces/EnrichmentAdapter.java
index b1986a0..c0eb0e0 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/enrichment/interfaces/EnrichmentAdapter.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/enrichment/interfaces/EnrichmentAdapter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package com.apache.metron.enrichment.interfaces;
+package org.apache.metron.enrichment.interfaces;
import org.json.simple.JSONObject;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/hbase/HBaseBolt.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/hbase/HBaseBolt.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/hbase/HBaseBolt.java
index 3ff53d6..62e7d48 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/hbase/HBaseBolt.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/hbase/HBaseBolt.java
@@ -1,4 +1,4 @@
-package com.apache.metron.hbase;
+package org.apache.metron.hbase;
@@ -16,7 +16,7 @@ import backtype.storm.tuple.Fields;
import backtype.storm.tuple.Tuple;
import backtype.storm.tuple.Values;
-import com.apache.metron.helpers.topology.ErrorGenerator;
+import org.apache.metron.helpers.topology.ErrorGenerator;
/**
* A Storm bolt for putting data into HBase.
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/hbase/HBaseStreamPartitioner.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/hbase/HBaseStreamPartitioner.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/hbase/HBaseStreamPartitioner.java
index 19a9bfd..2e92e94 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/hbase/HBaseStreamPartitioner.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/hbase/HBaseStreamPartitioner.java
@@ -1,4 +1,4 @@
-package com.apache.metron.hbase;
+package org.apache.metron.hbase;
import java.io.IOException;
import java.util.Arrays;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/hbase/HTableConnector.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/hbase/HTableConnector.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/hbase/HTableConnector.java
index 9bacd71..296d0c2 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/hbase/HTableConnector.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/hbase/HTableConnector.java
@@ -1,4 +1,4 @@
-package com.apache.metron.hbase;
+package org.apache.metron.hbase;
import java.io.IOException;
import java.io.Serializable;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/hbase/TupleTableConfig.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/hbase/TupleTableConfig.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/hbase/TupleTableConfig.java
index 90681c7..035e9c3 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/hbase/TupleTableConfig.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/hbase/TupleTableConfig.java
@@ -1,4 +1,4 @@
-package com.apache.metron.hbase;
+package org.apache.metron.hbase;
import java.io.Serializable;
import java.util.HashMap;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/helpers/services/PcapServiceCli.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/helpers/services/PcapServiceCli.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/helpers/services/PcapServiceCli.java
index 5ff25ca..df3ee5c 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/helpers/services/PcapServiceCli.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/helpers/services/PcapServiceCli.java
@@ -1,4 +1,4 @@
-package com.apache.metron.helpers.services;
+package org.apache.metron.helpers.services;
import org.apache.commons.cli.BasicParser;
import org.apache.commons.cli.CommandLine;
@@ -103,7 +103,7 @@ public class PcapServiceCli {
formater.printHelp("Topology Options:", options);
// System.out
- // .println("[Metron] Example usage: \n storm jar Metron-Topologies-0.3BETA-SNAPSHOT.jar com.apache.metron.topology.Bro -local_mode true -config_path Metron_Configs/ -generator_spout true");
+ // .println("[Metron] Example usage: \n storm jar Metron-Topologies-0.3BETA-SNAPSHOT.jar org.apache.metron.topology.Bro -local_mode true -config_path Metron_Configs/ -generator_spout true");
System.exit(0);
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/helpers/topology/Cli.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/helpers/topology/Cli.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/helpers/topology/Cli.java
index a7560e1..f68bfb8 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/helpers/topology/Cli.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/helpers/topology/Cli.java
@@ -1,4 +1,4 @@
-package com.apache.metron.helpers.topology;
+package org.apache.metron.helpers.topology;
import java.io.File;
@@ -179,7 +179,7 @@ public class Cli {
formater.printHelp("Topology Options:", options);
System.out
- .println("[Metron] Example usage: \n storm jar Metron-Topologies-0.3BETA-SNAPSHOT.jar com.apache.metron.topology.Bro -local_mode true -config_path Metron_Configs/ -generator_spout true");
+ .println("[Metron] Example usage: \n storm jar Metron-Topologies-0.3BETA-SNAPSHOT.jar org.apache.metron.topology.Bro -local_mode true -config_path Metron_Configs/ -generator_spout true");
System.exit(0);
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/helpers/topology/ErrorGenerator.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/helpers/topology/ErrorGenerator.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/helpers/topology/ErrorGenerator.java
index 2201c09..2919bcf 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/helpers/topology/ErrorGenerator.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/helpers/topology/ErrorGenerator.java
@@ -1,4 +1,4 @@
-package com.apache.metron.helpers.topology;
+package org.apache.metron.helpers.topology;
import java.net.InetAddress;
import java.net.UnknownHostException;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/helpers/topology/SettingsLoader.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/helpers/topology/SettingsLoader.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/helpers/topology/SettingsLoader.java
index 971bf8b..e95f7fa 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/helpers/topology/SettingsLoader.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/helpers/topology/SettingsLoader.java
@@ -1,4 +1,4 @@
-package com.apache.metron.helpers.topology;
+package org.apache.metron.helpers.topology;
import java.util.HashMap;
import java.util.Iterator;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/index/interfaces/IndexAdapter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/index/interfaces/IndexAdapter.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/index/interfaces/IndexAdapter.java
index 4144ccf..dc7d0c5 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/index/interfaces/IndexAdapter.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/index/interfaces/IndexAdapter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.index.interfaces;
+package org.apache.metron.index.interfaces;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParser.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParser.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParser.java
index 9f89835..8cda37f 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParser.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParser.java
@@ -1,5 +1,5 @@
/* Generated By:JavaCC: Do not edit this line. ISEParser.java */
-package com.apache.metron.ise.parser;
+package org.apache.metron.ise.parser;
import java.io.*;
import java.util.*;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParser.jj
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParser.jj b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParser.jj
index 649cf65..86edd1f 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParser.jj
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParser.jj
@@ -2,7 +2,7 @@ options{ CHOICE_AMBIGUITY_CHECK = 3; OTHER_AMBIGUITY_CHECK = 2; //DEBUG_P
//DEBUG_LOOKAHEAD=true
//DEBUG_TOKEN_MANAGER=true
ERROR_REPORTING = true; JAVA_UNICODE_ESCAPE = true; UNICODE_INPUT = true; IGNORE_CASE = true; SUPPORT_CLASS_VISIBILITY_PUBLIC = false; FORCE_LA_CHECK = true; CACHE_TOKENS = true; SANITY_CHECK = true; STATIC = false; //KEEP_LINE_COLUMN=true;
-}PARSER_BEGIN(ISEParser)package com.apache.metron.ise.parser;import java.io.*;import java.util.*;import org.json.simple.*;/**
+}PARSER_BEGIN(ISEParser)package org.apache.metron.ise.parser;import java.io.*;import java.util.*;import org.json.simple.*;/**
* Basic ISE data parser generated by JavaCC.
*/public class ISEParser implements Serializable{ private boolean nativeNumbers = false; public ISEParser() { //do nothing
} public ISEParser(String input) { this (new StringReader(input)); } /**
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParserConstants.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParserConstants.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParserConstants.java
index ac5f59b..7a3a449 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParserConstants.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParserConstants.java
@@ -1,5 +1,5 @@
/* Generated By:JavaCC: Do not edit this line. ISEParserConstants.java */
-package com.apache.metron.ise.parser;
+package org.apache.metron.ise.parser;
/**
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParserTokenManager.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParserTokenManager.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParserTokenManager.java
index ab3b2f2..26722c5 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParserTokenManager.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ISEParserTokenManager.java
@@ -1,5 +1,5 @@
/* Generated By:JavaCC: Do not edit this line. ISEParserTokenManager.java */
-package com.apache.metron.ise.parser;
+package org.apache.metron.ise.parser;
/** Token Manager. */
class ISEParserTokenManager implements ISEParserConstants
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/JavaCharStream.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/JavaCharStream.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/JavaCharStream.java
index a1af9fb..9cd0db5 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/JavaCharStream.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/JavaCharStream.java
@@ -1,6 +1,6 @@
/* Generated By:JavaCC: Do not edit this line. JavaCharStream.java Version 5.0 */
/* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=false */
-package com.apache.metron.ise.parser;
+package org.apache.metron.ise.parser;
/**
* An implementation of interface CharStream, where the stream is assumed to
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ParseException.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ParseException.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ParseException.java
index c0ad0fd..70098a8 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ParseException.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/ParseException.java
@@ -1,6 +1,6 @@
/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 5.0 */
/* JavaCCOptions:KEEP_LINE_COL=null */
-package com.apache.metron.ise.parser;
+package org.apache.metron.ise.parser;
/**
* This exception is thrown when parse errors are encountered.
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/Token.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/Token.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/Token.java
index e19beae..3203583 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/Token.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/Token.java
@@ -1,6 +1,6 @@
/* Generated By:JavaCC: Do not edit this line. Token.java Version 5.0 */
/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null,SUPPORT_CLASS_VISIBILITY_PUBLIC=false */
-package com.apache.metron.ise.parser;
+package org.apache.metron.ise.parser;
/**
* Describes the input token stream.
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/TokenMgrError.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/TokenMgrError.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/TokenMgrError.java
index 3ee1bb9..add0deb 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/TokenMgrError.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/ise/parser/TokenMgrError.java
@@ -1,6 +1,6 @@
/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 5.0 */
/* JavaCCOptions: */
-package com.apache.metron.ise.parser;
+package org.apache.metron.ise.parser;
/** Token Manager Error. */
class TokenMgrError extends Error
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/json/serialization/JSONDecoderHelper.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/json/serialization/JSONDecoderHelper.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/json/serialization/JSONDecoderHelper.java
index 868c051..1a7c751 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/json/serialization/JSONDecoderHelper.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/json/serialization/JSONDecoderHelper.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.apache.metron.json.serialization;
+package org.apache.metron.json.serialization;
import java.io.DataInputStream;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/json/serialization/JSONEncoderHelper.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/json/serialization/JSONEncoderHelper.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/json/serialization/JSONEncoderHelper.java
index 7351cd7..2d31902 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/json/serialization/JSONEncoderHelper.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/json/serialization/JSONEncoderHelper.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.apache.metron.json.serialization;
+package org.apache.metron.json.serialization;
import java.io.DataOutputStream;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/json/serialization/JSONKafkaSerializer.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/json/serialization/JSONKafkaSerializer.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/json/serialization/JSONKafkaSerializer.java
index 4f9fddb..497337b 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/json/serialization/JSONKafkaSerializer.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/json/serialization/JSONKafkaSerializer.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package com.apache.metron.json.serialization;
+package org.apache.metron.json.serialization;
-import static com.apache.metron.json.serialization.JSONDecoderHelper.getObject;
-import static com.apache.metron.json.serialization.JSONEncoderHelper.putBoolean;
-import static com.apache.metron.json.serialization.JSONEncoderHelper.putNull;
-import static com.apache.metron.json.serialization.JSONEncoderHelper.putNumber;
-import static com.apache.metron.json.serialization.JSONEncoderHelper.putString;
+import static org.apache.metron.json.serialization.JSONDecoderHelper.getObject;
+import static org.apache.metron.json.serialization.JSONEncoderHelper.putBoolean;
+import static org.apache.metron.json.serialization.JSONEncoderHelper.putNull;
+import static org.apache.metron.json.serialization.JSONEncoderHelper.putNumber;
+import static org.apache.metron.json.serialization.JSONEncoderHelper.putString;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/json/serialization/JSONKryoSerializer.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/json/serialization/JSONKryoSerializer.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/json/serialization/JSONKryoSerializer.java
index 091bd09..9d35f62 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/json/serialization/JSONKryoSerializer.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/json/serialization/JSONKryoSerializer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.apache.metron.json.serialization;
+package org.apache.metron.json.serialization;
import org.json.simple.JSONObject;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/metrics/MetricReporter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/metrics/MetricReporter.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/metrics/MetricReporter.java
index 0915780..c820869 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/metrics/MetricReporter.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/metrics/MetricReporter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.metrics;
+package org.apache.metron.metrics;
import com.codahale.metrics.ConsoleReporter;
import com.codahale.metrics.Counter;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/metrics/MyMetricReporter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/metrics/MyMetricReporter.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/metrics/MyMetricReporter.java
index 37a395a..621db43 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/metrics/MyMetricReporter.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/metrics/MyMetricReporter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.metrics;
+package org.apache.metron.metrics;
import com.codahale.metrics.ConsoleReporter;
import com.codahale.metrics.JmxReporter;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/metrics/NullReporter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/metrics/NullReporter.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/metrics/NullReporter.java
index 71b1ca1..dcec4e9 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/metrics/NullReporter.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/metrics/NullReporter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.metrics;
+package org.apache.metron.metrics;
public class NullReporter extends MetricReporter {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/parser/interfaces/MessageFilter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/parser/interfaces/MessageFilter.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/parser/interfaces/MessageFilter.java
index d720bb3..88a3543 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/parser/interfaces/MessageFilter.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/parser/interfaces/MessageFilter.java
@@ -1,4 +1,4 @@
-package com.apache.metron.parser.interfaces;
+package org.apache.metron.parser.interfaces;
import org.json.simple.JSONObject;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/parser/interfaces/MessageParser.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/parser/interfaces/MessageParser.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/parser/interfaces/MessageParser.java
index 6e202e2..f09484a 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/parser/interfaces/MessageParser.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/parser/interfaces/MessageParser.java
@@ -1,4 +1,4 @@
-package com.apache.metron.parser.interfaces;
+package org.apache.metron.parser.interfaces;
import org.json.simple.JSONObject;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/Constants.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/Constants.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/Constants.java
index b051168..d27da5c 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/Constants.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/Constants.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcap;
+package org.apache.metron.pcap;
/**
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/IEEE_802_1Q.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/IEEE_802_1Q.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/IEEE_802_1Q.java
index b17387d..0cc452c 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/IEEE_802_1Q.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/IEEE_802_1Q.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcap;
+package org.apache.metron.pcap;
public class IEEE_802_1Q {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/MetronEthernetDecoder.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/MetronEthernetDecoder.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/MetronEthernetDecoder.java
index db6c064..26ea2af 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/MetronEthernetDecoder.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/MetronEthernetDecoder.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcap;
+package org.apache.metron.pcap;
import java.util.BitSet;
import java.util.HashSet;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PacketInfo.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PacketInfo.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PacketInfo.java
index 48b26ea..0227acc 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PacketInfo.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PacketInfo.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcap;
+package org.apache.metron.pcap;
import java.text.MessageFormat;
import org.apache.log4j.Logger;
@@ -10,8 +10,8 @@ import org.krakenapps.pcap.file.GlobalHeader;
import org.krakenapps.pcap.packet.PacketHeader;
import org.krakenapps.pcap.packet.PcapPacket;
-import com.apache.metron.pcap.Constants;
-import com.apache.metron.pcap.PcapUtils;
+import org.apache.metron.pcap.Constants;
+import org.apache.metron.pcap.PcapUtils;
/**
* The Class PacketInfo.
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapByteInputStream.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapByteInputStream.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapByteInputStream.java
index 8742cb2..e51ee6f 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapByteInputStream.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapByteInputStream.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcap;
+package org.apache.metron.pcap;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapByteOutputStream.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapByteOutputStream.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapByteOutputStream.java
index a226157..5b6f01e 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapByteOutputStream.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapByteOutputStream.java
@@ -1,5 +1,5 @@
// $codepro.audit.disable explicitThisUsage, lossOfPrecisionInCast
-package com.apache.metron.pcap;
+package org.apache.metron.pcap;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapMerger.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapMerger.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapMerger.java
index 03fc495..417b600 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapMerger.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapMerger.java
@@ -1,4 +1,4 @@
- package com.apache.metron.pcap;
+ package org.apache.metron.pcap;
import java.io.ByteArrayOutputStream;
import java.io.EOFException;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapPacketComparator.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapPacketComparator.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapPacketComparator.java
index 441afb1..caba5aa 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapPacketComparator.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapPacketComparator.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcap;
+package org.apache.metron.pcap;
import java.util.Comparator;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapParser.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapParser.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapParser.java
index 7c94c09..18874c2 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapParser.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapParser.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcap;
+package org.apache.metron.pcap;
import java.io.EOFException;
import java.io.File;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapUtils.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapUtils.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapUtils.java
index 4e0393b..578111e 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapUtils.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/pcap/PcapUtils.java
@@ -1,4 +1,4 @@
-package com.apache.metron.pcap;
+package org.apache.metron.pcap;
import java.util.HashMap;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/test/AbstractConfigTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/test/AbstractConfigTest.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/test/AbstractConfigTest.java
index ba9b03d..9dadc33 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/test/AbstractConfigTest.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/test/AbstractConfigTest.java
@@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.apache.metron.test;
+package org.apache.metron.test;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
@@ -33,7 +33,7 @@ import com.github.fge.jackson.JsonLoader;
import com.github.fge.jsonschema.core.report.ProcessingReport;
import com.github.fge.jsonschema.main.JsonSchemaFactory;
import com.github.fge.jsonschema.main.JsonValidator;
-import com.apache.metron.helpers.topology.SettingsLoader;
+import org.apache.metron.helpers.topology.SettingsLoader;
/**
* <ul>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/test/AbstractSchemaTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/test/AbstractSchemaTest.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/test/AbstractSchemaTest.java
index 87ce851..d568b56 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/test/AbstractSchemaTest.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/test/AbstractSchemaTest.java
@@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.apache.metron.test;
+package org.apache.metron.test;
import java.io.BufferedReader;
import java.io.FileReader;
import java.net.URL;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/test/AbstractTestContext.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/test/AbstractTestContext.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/test/AbstractTestContext.java
index 1e30698..bd7267d 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/test/AbstractTestContext.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/test/AbstractTestContext.java
@@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.apache.metron.test;
+package org.apache.metron.test;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/tldextractor/BasicTldExtractor.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/tldextractor/BasicTldExtractor.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/tldextractor/BasicTldExtractor.java
index dc4c447..ae09628 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/tldextractor/BasicTldExtractor.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/tldextractor/BasicTldExtractor.java
@@ -1,4 +1,4 @@
-package com.apache.metron.tldextractor;
+package org.apache.metron.tldextractor;
import java.io.BufferedReader;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-Common/src/main/java/org/apache/metron/tldextractor/test/BasicTldExtractorTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/tldextractor/test/BasicTldExtractorTest.java b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/tldextractor/test/BasicTldExtractorTest.java
index 936626a..73175f0 100644
--- a/metron-streaming/Metron-Common/src/main/java/org/apache/metron/tldextractor/test/BasicTldExtractorTest.java
+++ b/metron-streaming/Metron-Common/src/main/java/org/apache/metron/tldextractor/test/BasicTldExtractorTest.java
@@ -16,10 +16,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.apache.metron.tldextractor.test;
+package org.apache.metron.tldextractor.test;
-import com.apache.metron.test.AbstractConfigTest;
-import com.apache.metron.tldextractor.BasicTldExtractor;
+import org.apache.metron.test.AbstractConfigTest;
+import org.apache.metron.tldextractor.BasicTldExtractor;
/**
@@ -67,7 +67,7 @@ public class BasicTldExtractorTest extends AbstractConfigTest {
*/
protected void setUp() throws Exception {
- super.setUp("com.apache.metron.tldextractor.test.BasicTldExtractorTest");
+ super.setUp("org.apache.metron.tldextractor.test.BasicTldExtractorTest");
this.tldExtractor=new BasicTldExtractor(this.getConfig().getString("logFile"));
}
@@ -81,21 +81,21 @@ public class BasicTldExtractorTest extends AbstractConfigTest {
}
/**
- * Test method for {@link com.apache.metron.tldextractor.BasicTldExtractor#BasicTldExtractor()}.
+ * Test method for {@link org.apache.metron.tldextractor.BasicTldExtractor#BasicTldExtractor()}.
*/
public void testBasicTldExtractor() {
assertNotNull(this.tldExtractor);
}
/**
- * Test method for {@link com.apache.metron.tldextractor.BasicTldExtractor#extract2LD(java.lang.String)}.
+ * Test method for {@link org.apache.metron.tldextractor.BasicTldExtractor#extract2LD(java.lang.String)}.
*/
public void testExtract2LD() {
//fail("Not yet implemented");
}
/**
- * Test method for {@link com.apache.metron.tldextractor.BasicTldExtractor#extractTLD(java.lang.String)}.
+ * Test method for {@link org.apache.metron.tldextractor.BasicTldExtractor#extractTLD(java.lang.String)}.
*/
public void testExtractTLD()
{
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/d504487d/metron-streaming/Metron-DataLoads/pom.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataLoads/pom.xml b/metron-streaming/Metron-DataLoads/pom.xml
index c9e48c7..1e0ea0f 100644
--- a/metron-streaming/Metron-DataLoads/pom.xml
+++ b/metron-streaming/Metron-DataLoads/pom.xml
@@ -13,7 +13,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.apache.metron</groupId>
+ <groupId>org.apache.metron</groupId>
<artifactId>Metron-Streaming</artifactId>
<version>0.6BETA</version>
</parent>
@@ -24,7 +24,7 @@
</properties>
<dependencies>
<dependency>
- <groupId>com.apache.metron</groupId>
+ <groupId>org.apache.metron</groupId>
<artifactId>Metron-Common</artifactId>
<version>${project.parent.version}</version>
</dependency>