You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by si...@apache.org on 2016/01/14 18:03:50 UTC
[55/85] incubator-metron git commit: Replace all references to
'OpenSoc' with 'Metron'
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ISEParser.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ISEParser.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ISEParser.java
index a54f1ce..9f89835 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ISEParser.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ISEParser.java
@@ -1,5 +1,5 @@
/* Generated By:JavaCC: Do not edit this line. ISEParser.java */
-package com.opensoc.ise.parser;
+package com.apache.metron.ise.parser;
import java.io.*;
import java.util.*;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ISEParser.jj
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ISEParser.jj b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ISEParser.jj
index bcd5dfd..649cf65 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ISEParser.jj
+++ b/metron-streaming/Metron-Common/src/main/java/com/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.opensoc.ise.parser;import java.io.*;import java.util.*;import org.json.simple.*;/**
+}PARSER_BEGIN(ISEParser)package com.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/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ISEParserConstants.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ISEParserConstants.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ISEParserConstants.java
index 62ea0a3..ac5f59b 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ISEParserConstants.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ISEParserConstants.java
@@ -1,5 +1,5 @@
/* Generated By:JavaCC: Do not edit this line. ISEParserConstants.java */
-package com.opensoc.ise.parser;
+package com.apache.metron.ise.parser;
/**
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ISEParserTokenManager.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ISEParserTokenManager.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ISEParserTokenManager.java
index 9999452..ab3b2f2 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ISEParserTokenManager.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ISEParserTokenManager.java
@@ -1,5 +1,5 @@
/* Generated By:JavaCC: Do not edit this line. ISEParserTokenManager.java */
-package com.opensoc.ise.parser;
+package com.apache.metron.ise.parser;
/** Token Manager. */
class ISEParserTokenManager implements ISEParserConstants
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/JavaCharStream.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/JavaCharStream.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/JavaCharStream.java
index dbe7138..a1af9fb 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/JavaCharStream.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/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.opensoc.ise.parser;
+package com.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/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ParseException.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ParseException.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ParseException.java
index 31f3b5b..c0ad0fd 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/ParseException.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/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.opensoc.ise.parser;
+package com.apache.metron.ise.parser;
/**
* This exception is thrown when parse errors are encountered.
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/Token.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/Token.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/Token.java
index 805125f..e19beae 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/Token.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/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.opensoc.ise.parser;
+package com.apache.metron.ise.parser;
/**
* Describes the input token stream.
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/TokenMgrError.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/TokenMgrError.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/TokenMgrError.java
index 944d483..3ee1bb9 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/ise/parser/TokenMgrError.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/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.opensoc.ise.parser;
+package com.apache.metron.ise.parser;
/** Token Manager Error. */
class TokenMgrError extends Error
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/json/serialization/JSONDecoderHelper.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/json/serialization/JSONDecoderHelper.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/json/serialization/JSONDecoderHelper.java
index 1954aa7..868c051 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/json/serialization/JSONDecoderHelper.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/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.opensoc.json.serialization;
+package com.apache.metron.json.serialization;
import java.io.DataInputStream;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/json/serialization/JSONEncoderHelper.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/json/serialization/JSONEncoderHelper.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/json/serialization/JSONEncoderHelper.java
index b388397..7351cd7 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/json/serialization/JSONEncoderHelper.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/json/serialization/JSONEncoderHelper.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.opensoc.json.serialization;
+package com.apache.metron.json.serialization;
import java.io.DataOutputStream;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/json/serialization/JSONKafkaSerializer.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/json/serialization/JSONKafkaSerializer.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/json/serialization/JSONKafkaSerializer.java
index c08444f..4f9fddb 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/json/serialization/JSONKafkaSerializer.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/json/serialization/JSONKafkaSerializer.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package com.opensoc.json.serialization;
+package com.apache.metron.json.serialization;
-import static com.opensoc.json.serialization.JSONDecoderHelper.getObject;
-import static com.opensoc.json.serialization.JSONEncoderHelper.putBoolean;
-import static com.opensoc.json.serialization.JSONEncoderHelper.putNull;
-import static com.opensoc.json.serialization.JSONEncoderHelper.putNumber;
-import static com.opensoc.json.serialization.JSONEncoderHelper.putString;
+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 java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -76,7 +76,7 @@ public class JSONKafkaSerializer implements Encoder<JSONObject>,
*/
public static void main(String args[]) throws IOException {
- //String Input = "/home/kiran/git/opensoc-streaming/OpenSOC-Common/BroExampleOutput";
+ //String Input = "/home/kiran/git/metron-streaming/Metron-Common/BroExampleOutput";
String Input = "/tmp/test";
BufferedReader reader = new BufferedReader(new FileReader(Input));
@@ -262,4 +262,4 @@ public class JSONKafkaSerializer implements Encoder<JSONObject>,
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/json/serialization/JSONKryoSerializer.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/json/serialization/JSONKryoSerializer.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/json/serialization/JSONKryoSerializer.java
index 7b7d394..091bd09 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/json/serialization/JSONKryoSerializer.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/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.opensoc.json.serialization;
+package com.apache.metron.json.serialization;
import org.json.simple.JSONObject;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/metrics/MetricReporter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/metrics/MetricReporter.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/metrics/MetricReporter.java
index 3d344a2..0915780 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/metrics/MetricReporter.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/metrics/MetricReporter.java
@@ -1,4 +1,4 @@
-package com.opensoc.metrics;
+package com.apache.metron.metrics;
import com.codahale.metrics.ConsoleReporter;
import com.codahale.metrics.Counter;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/metrics/MyMetricReporter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/metrics/MyMetricReporter.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/metrics/MyMetricReporter.java
index fc6752f..37a395a 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/metrics/MyMetricReporter.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/metrics/MyMetricReporter.java
@@ -1,4 +1,4 @@
-package com.opensoc.metrics;
+package com.apache.metron.metrics;
import com.codahale.metrics.ConsoleReporter;
import com.codahale.metrics.JmxReporter;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/metrics/NullReporter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/metrics/NullReporter.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/metrics/NullReporter.java
index 6585a32..71b1ca1 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/metrics/NullReporter.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/metrics/NullReporter.java
@@ -1,4 +1,4 @@
-package com.opensoc.metrics;
+package com.apache.metron.metrics;
public class NullReporter extends MetricReporter {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/parser/interfaces/MessageFilter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/parser/interfaces/MessageFilter.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/parser/interfaces/MessageFilter.java
index 339a2ec..d720bb3 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/parser/interfaces/MessageFilter.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/parser/interfaces/MessageFilter.java
@@ -1,4 +1,4 @@
-package com.opensoc.parser.interfaces;
+package com.apache.metron.parser.interfaces;
import org.json.simple.JSONObject;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/parser/interfaces/MessageParser.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/parser/interfaces/MessageParser.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/parser/interfaces/MessageParser.java
index b71e4f9..6e202e2 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/parser/interfaces/MessageParser.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/parser/interfaces/MessageParser.java
@@ -1,4 +1,4 @@
-package com.opensoc.parser.interfaces;
+package com.apache.metron.parser.interfaces;
import org.json.simple.JSONObject;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/Constants.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/Constants.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/Constants.java
index 9192665..b051168 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/Constants.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/Constants.java
@@ -1,4 +1,4 @@
-package com.opensoc.pcap;
+package com.apache.metron.pcap;
/**
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/IEEE_802_1Q.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/IEEE_802_1Q.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/IEEE_802_1Q.java
index 6375a3f..b17387d 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/IEEE_802_1Q.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/IEEE_802_1Q.java
@@ -1,4 +1,4 @@
-package com.opensoc.pcap;
+package com.apache.metron.pcap;
public class IEEE_802_1Q {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/MetronEthernetDecoder.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/MetronEthernetDecoder.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/MetronEthernetDecoder.java
index 2dee341..db6c064 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/MetronEthernetDecoder.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/MetronEthernetDecoder.java
@@ -1,4 +1,4 @@
-package com.opensoc.pcap;
+package com.apache.metron.pcap;
import java.util.BitSet;
import java.util.HashSet;
@@ -14,12 +14,12 @@ import org.krakenapps.pcap.decoder.ethernet.MacAddress;
import org.krakenapps.pcap.packet.PcapPacket;
import org.krakenapps.pcap.util.Buffer;
-public class OpenSocEthernetDecoder extends EthernetDecoder {
+public class MetronEthernetDecoder extends EthernetDecoder {
private Set<EthernetProcessor> callbacks;
private Map<Integer, Set<EthernetProcessor>> typeCallbacks;
- public OpenSocEthernetDecoder() {
+ public MetronEthernetDecoder() {
callbacks = new CopyOnWriteArraySet<EthernetProcessor>();
typeCallbacks = new ConcurrentHashMap<Integer, Set<EthernetProcessor>>();
}
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PacketInfo.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PacketInfo.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PacketInfo.java
index 804387d..48b26ea 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PacketInfo.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PacketInfo.java
@@ -1,4 +1,4 @@
-package com.opensoc.pcap;
+package com.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.opensoc.pcap.Constants;
-import com.opensoc.pcap.PcapUtils;
+import com.apache.metron.pcap.Constants;
+import com.apache.metron.pcap.PcapUtils;
/**
* The Class PacketInfo.
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapByteInputStream.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapByteInputStream.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapByteInputStream.java
index 44f3597..8742cb2 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapByteInputStream.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapByteInputStream.java
@@ -1,4 +1,4 @@
-package com.opensoc.pcap;
+package com.apache.metron.pcap;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapByteOutputStream.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapByteOutputStream.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapByteOutputStream.java
index 8a5ad18..a226157 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapByteOutputStream.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapByteOutputStream.java
@@ -1,5 +1,5 @@
// $codepro.audit.disable explicitThisUsage, lossOfPrecisionInCast
-package com.opensoc.pcap;
+package com.apache.metron.pcap;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapMerger.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapMerger.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapMerger.java
index 392523b..03fc495 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapMerger.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapMerger.java
@@ -1,4 +1,4 @@
- package com.opensoc.pcap;
+ package com.apache.metron.pcap;
import java.io.ByteArrayOutputStream;
import java.io.EOFException;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapPacketComparator.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapPacketComparator.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapPacketComparator.java
index 29a2414..441afb1 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapPacketComparator.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapPacketComparator.java
@@ -1,4 +1,4 @@
-package com.opensoc.pcap;
+package com.apache.metron.pcap;
import java.util.Comparator;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapParser.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapParser.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapParser.java
index abc0873..7c94c09 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapParser.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapParser.java
@@ -1,4 +1,4 @@
-package com.opensoc.pcap;
+package com.apache.metron.pcap;
import java.io.EOFException;
import java.io.File;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapUtils.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapUtils.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapUtils.java
index 8f9520f..4e0393b 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapUtils.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/pcap/PcapUtils.java
@@ -1,4 +1,4 @@
-package com.opensoc.pcap;
+package com.apache.metron.pcap;
import java.util.HashMap;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/test/AbstractConfigTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/test/AbstractConfigTest.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/test/AbstractConfigTest.java
index 7484e16..ba9b03d 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/test/AbstractConfigTest.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/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.opensoc.test;
+package com.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.opensoc.helpers.topology.SettingsLoader;
+import com.apache.metron.helpers.topology.SettingsLoader;
/**
* <ul>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/test/AbstractSchemaTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/test/AbstractSchemaTest.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/test/AbstractSchemaTest.java
index 670d7f9..87ce851 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/test/AbstractSchemaTest.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/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.opensoc.test;
+package com.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/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/test/AbstractTestContext.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/test/AbstractTestContext.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/test/AbstractTestContext.java
index ea5b04f..1e30698 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/test/AbstractTestContext.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/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.opensoc.test;
+package com.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/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/tldextractor/BasicTldExtractor.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/tldextractor/BasicTldExtractor.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/tldextractor/BasicTldExtractor.java
index 2dbcd95..dc4c447 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/tldextractor/BasicTldExtractor.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/tldextractor/BasicTldExtractor.java
@@ -1,4 +1,4 @@
-package com.opensoc.tldextractor;
+package com.apache.metron.tldextractor;
import java.io.BufferedReader;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-Common/src/main/java/com/apache/metron/tldextractor/test/BasicTldExtractorTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/tldextractor/test/BasicTldExtractorTest.java b/metron-streaming/Metron-Common/src/main/java/com/apache/metron/tldextractor/test/BasicTldExtractorTest.java
index 03cc065..936626a 100644
--- a/metron-streaming/Metron-Common/src/main/java/com/apache/metron/tldextractor/test/BasicTldExtractorTest.java
+++ b/metron-streaming/Metron-Common/src/main/java/com/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.opensoc.tldextractor.test;
+package com.apache.metron.tldextractor.test;
-import com.opensoc.test.AbstractConfigTest;
-import com.opensoc.tldextractor.BasicTldExtractor;
+import com.apache.metron.test.AbstractConfigTest;
+import com.apache.metron.tldextractor.BasicTldExtractor;
/**
@@ -67,7 +67,7 @@ public class BasicTldExtractorTest extends AbstractConfigTest {
*/
protected void setUp() throws Exception {
- super.setUp("com.opensoc.tldextractor.test.BasicTldExtractorTest");
+ super.setUp("com.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.opensoc.tldextractor.BasicTldExtractor#BasicTldExtractor()}.
+ * Test method for {@link com.apache.metron.tldextractor.BasicTldExtractor#BasicTldExtractor()}.
*/
public void testBasicTldExtractor() {
assertNotNull(this.tldExtractor);
}
/**
- * Test method for {@link com.opensoc.tldextractor.BasicTldExtractor#extract2LD(java.lang.String)}.
+ * Test method for {@link com.apache.metron.tldextractor.BasicTldExtractor#extract2LD(java.lang.String)}.
*/
public void testExtract2LD() {
//fail("Not yet implemented");
}
/**
- * Test method for {@link com.opensoc.tldextractor.BasicTldExtractor#extractTLD(java.lang.String)}.
+ * Test method for {@link com.apache.metron.tldextractor.BasicTldExtractor#extractTLD(java.lang.String)}.
*/
public void testExtractTLD()
{
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataLoads/README.md
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataLoads/README.md b/metron-streaming/Metron-DataLoads/README.md
index 773d6db..b6fe229 100644
--- a/metron-streaming/Metron-DataLoads/README.md
+++ b/metron-streaming/Metron-DataLoads/README.md
@@ -1,10 +1,10 @@
-# OpenSOC-DataLoads
+# Metron-DataLoads
-This project is a collection of classes to assist with loading of various enrichment sources into OpenSOC.
+This project is a collection of classes to assist with loading of various enrichment sources into Metron.
## Threat Intel Enrichment
-Threat Intel enrichment data sources can be loaded into OpenSOC using the ThreatIntelLoader class and an implementation of a ThreatIntelSource interface. Both are described below.
+Threat Intel enrichment data sources can be loaded into Metron using the ThreatIntelLoader class and an implementation of a ThreatIntelSource interface. Both are described below.
### ThreatIntelSource Interface
@@ -20,7 +20,7 @@ This is called after all data is retrieved, just before ThreatIntelLoader exists
`JSONObject next()`
-This method should return the next piece of intel to be stored in OpenSOC. The returned JSONObject must have the following fields:
+This method should return the next piece of intel to be stored in Metron. The returned JSONObject must have the following fields:
* indicator - The indicator that will be checked against during enrichment. For example, and IP Address or a Hostname.
* source - The source of the data, which can be any unique string to identify the origin of the intel. This will be the column qualifer in HBase and be used to group matches on in Storm
@@ -34,7 +34,7 @@ Returns true if there are more sources to read. Otherwise, false.
### ThreatIntelLoader
-This class is intenteded to be called from the commandline on the OpenSOC cluster and is responsible for taking intel from a ThreatIntelSource implementation and putting them into HBase.
+This class is intenteded to be called from the commandline on the Metron cluster and is responsible for taking intel from a ThreatIntelSource implementation and putting them into HBase.
#### Usage
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataLoads/pom.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataLoads/pom.xml b/metron-streaming/Metron-DataLoads/pom.xml
index c51c045..c9e48c7 100644
--- a/metron-streaming/Metron-DataLoads/pom.xml
+++ b/metron-streaming/Metron-DataLoads/pom.xml
@@ -13,19 +13,19 @@
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.opensoc</groupId>
- <artifactId>OpenSOC-Streaming</artifactId>
+ <groupId>com.apache.metron</groupId>
+ <artifactId>Metron-Streaming</artifactId>
<version>0.6BETA</version>
</parent>
- <artifactId>OpenSOC-DataLoads</artifactId>
+ <artifactId>Metron-DataLoads</artifactId>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<dependencies>
<dependency>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Common</artifactId>
+ <groupId>com.apache.metron</groupId>
+ <artifactId>Metron-Common</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataLoads/src/main/java/com/apache/metron/dataloads/ThreatIntelLoader.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataLoads/src/main/java/com/apache/metron/dataloads/ThreatIntelLoader.java b/metron-streaming/Metron-DataLoads/src/main/java/com/apache/metron/dataloads/ThreatIntelLoader.java
index c602d0c..3e08b30 100644
--- a/metron-streaming/Metron-DataLoads/src/main/java/com/apache/metron/dataloads/ThreatIntelLoader.java
+++ b/metron-streaming/Metron-DataLoads/src/main/java/com/apache/metron/dataloads/ThreatIntelLoader.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataloads;
+package com.apache.metron.dataloads;
import java.io.File;
@@ -22,7 +22,7 @@ import org.apache.log4j.Logger;
import org.json.simple.JSONObject;
import org.json.simple.JSONArray;
-import com.opensoc.dataloads.interfaces.ThreatIntelSource;
+import com.apache.metron.dataloads.interfaces.ThreatIntelSource;
public class ThreatIntelLoader {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataLoads/src/main/java/com/apache/metron/dataloads/cif/HBaseTableLoad.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataLoads/src/main/java/com/apache/metron/dataloads/cif/HBaseTableLoad.java b/metron-streaming/Metron-DataLoads/src/main/java/com/apache/metron/dataloads/cif/HBaseTableLoad.java
index 5e456e4..9fb06b1 100644
--- a/metron-streaming/Metron-DataLoads/src/main/java/com/apache/metron/dataloads/cif/HBaseTableLoad.java
+++ b/metron-streaming/Metron-DataLoads/src/main/java/com/apache/metron/dataloads/cif/HBaseTableLoad.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataloads.cif;
+package com.apache.metron.dataloads.cif;
import java.io.BufferedReader;
import java.io.File;
@@ -161,7 +161,7 @@ public class HBaseTableLoad {
private void printUsage() {
System.out
- .println("Usage: java -cp JarFile com.opensoc.dataloads.cif.HBaseTableLoad -d <directory> -t <tablename> -f <optional file-list>");
+ .println("Usage: java -cp JarFile com.apache.metron.dataloads.cif.HBaseTableLoad -d <directory> -t <tablename> -f <optional file-list>");
}
private void parse(String[] args) {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/pom.xml
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/pom.xml b/metron-streaming/Metron-DataServices/pom.xml
index 14c51eb..f8ed750 100644
--- a/metron-streaming/Metron-DataServices/pom.xml
+++ b/metron-streaming/Metron-DataServices/pom.xml
@@ -2,13 +2,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Streaming</artifactId>
+ <groupId>com.apache.metron</groupId>
+ <artifactId>Metron-Streaming</artifactId>
<version>0.6BETA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>OpenSOC-DataServices</artifactId>
+ <artifactId>Metron-DataServices</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
@@ -42,8 +42,8 @@
</dependency>
<dependency>
- <groupId>com.opensoc</groupId>
- <artifactId>OpenSOC-Common</artifactId>
+ <groupId>com.apache.metron</groupId>
+ <artifactId>Metron-Common</artifactId>
<version>${parent.version}</version>
</dependency>
@@ -461,7 +461,7 @@
<archive>
<manifest>
<addClasspath>true</addClasspath>
- <mainClass>com.opensoc.dataservices.Main</mainClass>
+ <mainClass>com.apache.metron.dataservices.Main</mainClass>
</manifest>
</archive>
</configuration>
@@ -472,7 +472,7 @@
<configuration>
<archive>
<manifest>
- <mainClass>com.opensoc.dataservices.Main</mainClass>
+ <mainClass>com.apache.metron.dataservices.Main</mainClass>
</manifest>
</archive>
<descriptorRefs>
@@ -494,7 +494,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
- <mainClass>com.opensoc.dataservices.Main</mainClass>
+ <mainClass>com.apache.metron.dataservices.Main</mainClass>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/alerts/server/AlertsCacheReaper.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/alerts/server/AlertsCacheReaper.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/alerts/server/AlertsCacheReaper.java
index d150833..64423a6 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/alerts/server/AlertsCacheReaper.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/alerts/server/AlertsCacheReaper.java
@@ -1,4 +1,4 @@
-package com.opensoc.alerts.server;
+package com.apache.metron.alerts.server;
import java.util.ArrayList;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/alerts/server/AlertsFilterCacheEntry.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/alerts/server/AlertsFilterCacheEntry.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/alerts/server/AlertsFilterCacheEntry.java
index 7a0f687..68fbd28 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/alerts/server/AlertsFilterCacheEntry.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/alerts/server/AlertsFilterCacheEntry.java
@@ -1,4 +1,4 @@
-package com.opensoc.alerts.server;
+package com.apache.metron.alerts.server;
public class AlertsFilterCacheEntry {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/alerts/server/AlertsProcessingServer.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/alerts/server/AlertsProcessingServer.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/alerts/server/AlertsProcessingServer.java
index cec50b9..1b4a121 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/alerts/server/AlertsProcessingServer.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/alerts/server/AlertsProcessingServer.java
@@ -1,4 +1,4 @@
-package com.opensoc.alerts.server;
+package com.apache.metron.alerts.server;
import static java.util.concurrent.TimeUnit.SECONDS;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/alerts/server/AlertsSearcher.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/alerts/server/AlertsSearcher.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/alerts/server/AlertsSearcher.java
index 4a23395..0fe4ad2 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/alerts/server/AlertsSearcher.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/alerts/server/AlertsSearcher.java
@@ -1,4 +1,4 @@
-package com.opensoc.alerts.server;
+package com.apache.metron.alerts.server;
import java.io.File;
import java.io.FileInputStream;
@@ -38,7 +38,7 @@ public class AlertsSearcher implements Runnable {
private Properties configProps;
// TODO: inject Searcher module for either ElasticSearch or Solr...
- // TODO: inject OpenSocServiceFactory here
+ // TODO: inject MetronServiceFactory here
public final Map<String, AlertsFilterCacheEntry> alertsFilterCache = new HashMap<String, AlertsFilterCacheEntry>();
MessageDigest md;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/Main.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/Main.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/Main.java
index f34dc50..11d88fa 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/Main.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/Main.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataservices;
+package com.apache.metron.dataservices;
import java.io.File;
import java.io.FileNotFoundException;
@@ -46,10 +46,10 @@ import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.servlet.GuiceFilter;
-import com.opensoc.alerts.server.AlertsProcessingServer;
-import com.opensoc.dataservices.modules.guice.AlertsServerModule;
-import com.opensoc.dataservices.modules.guice.DefaultServletModule;
-import com.opensoc.dataservices.modules.guice.DefaultShiroWebModule;
+import com.apache.metron.alerts.server.AlertsProcessingServer;
+import com.apache.metron.dataservices.modules.guice.AlertsServerModule;
+import com.apache.metron.dataservices.modules.guice.DefaultServletModule;
+import com.apache.metron.dataservices.modules.guice.DefaultShiroWebModule;
public class Main {
@@ -270,7 +270,7 @@ public class Main {
context.setResourceBase(baseUri.toASCIIString());
- context.setInitParameter("resteasy.guice.modules", "com.opensoc.dataservices.modules.guice.RestEasyModule");
+ context.setInitParameter("resteasy.guice.modules", "com.apache.metron.dataservices.modules.guice.RestEasyModule");
context.setInitParameter("resteasy.servlet.mapping.prefix", "/rest");
context.addEventListener(injector.getInstance(GuiceResteasyBootstrapServletContextListener.class));
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/auth/AuthToken.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/auth/AuthToken.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/auth/AuthToken.java
index 5d4fe68..8add2ec 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/auth/AuthToken.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/auth/AuthToken.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataservices.auth;
+package com.apache.metron.dataservices.auth;
import java.io.FileInputStream;
import java.security.KeyStore;
@@ -56,7 +56,7 @@ public class AuthToken {
Cipher cipher = Cipher.getInstance("AES");
cipher.init(Cipher.ENCRYPT_MODE, key);
- String tokenString = "OpenSOC_AuthToken:" + System.currentTimeMillis();
+ String tokenString = "Metron_AuthToken:" + System.currentTimeMillis();
byte[] encryptedData = cipher.doFinal(tokenString.getBytes());
@@ -104,7 +104,7 @@ public class AuthToken {
System.out.println( "clearTextToken: " + clearTextToken );
String[] tokenParts = clearTextToken.split( ":" );
- if( tokenParts[0].equals( "OpenSOC_AuthToken" ))
+ if( tokenParts[0].equals( "Metron_AuthToken" ))
{
long now = System.currentTimeMillis();
long tokenTime = Long.parseLong(tokenParts[1]);
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/auth/AuthTokenFilter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/auth/AuthTokenFilter.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/auth/AuthTokenFilter.java
index 103a4cc..aab3449 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/auth/AuthTokenFilter.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/auth/AuthTokenFilter.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataservices.auth;
+package com.apache.metron.dataservices.auth;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/auth/CustomDomainADRealm.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/auth/CustomDomainADRealm.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/auth/CustomDomainADRealm.java
index d7bffb2..1ea5b0f 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/auth/CustomDomainADRealm.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/auth/CustomDomainADRealm.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataservices.auth;
+package com.apache.metron.dataservices.auth;
import javax.naming.NamingException;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/auth/RestSecurityInterceptor.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/auth/RestSecurityInterceptor.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/auth/RestSecurityInterceptor.java
index 03e2c48..682a9e5 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/auth/RestSecurityInterceptor.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/auth/RestSecurityInterceptor.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataservices.auth;
+package com.apache.metron.dataservices.auth;
import java.io.IOException;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/common/MetronService.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/common/MetronService.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/common/MetronService.java
index 27b4cbf..ae296d4 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/common/MetronService.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/common/MetronService.java
@@ -1,6 +1,6 @@
-package com.opensoc.dataservices.common;
+package com.apache.metron.dataservices.common;
-public interface OpenSOCService {
+public interface MetronService {
//secure service that front elastic search or solr
//and the message broker
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/kafkaclient/KafkaClient.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/kafkaclient/KafkaClient.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/kafkaclient/KafkaClient.java
index 7b61ba0..f142d31 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/kafkaclient/KafkaClient.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/kafkaclient/KafkaClient.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataservices.kafkaclient;
+package com.apache.metron.dataservices.kafkaclient;
import java.util.HashMap;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/kafkaclient/KafkaConsumer.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/kafkaclient/KafkaConsumer.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/kafkaclient/KafkaConsumer.java
index ca2f113..dd09dee 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/kafkaclient/KafkaConsumer.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/kafkaclient/KafkaConsumer.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataservices.kafkaclient;
+package com.apache.metron.dataservices.kafkaclient;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/kafkaclient/poll/PollingKafkaClient.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/kafkaclient/poll/PollingKafkaClient.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/kafkaclient/poll/PollingKafkaClient.java
index a8a0305..0b7acc8 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/kafkaclient/poll/PollingKafkaClient.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/kafkaclient/poll/PollingKafkaClient.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataservices.kafkaclient.poll;
+package com.apache.metron.dataservices.kafkaclient.poll;
import java.util.ArrayList;
import java.util.HashMap;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/kafkaclient/poll/PollingKafkaConsumer.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/kafkaclient/poll/PollingKafkaConsumer.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/kafkaclient/poll/PollingKafkaConsumer.java
index ee59b1f..0c513d3 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/kafkaclient/poll/PollingKafkaConsumer.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/kafkaclient/poll/PollingKafkaConsumer.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataservices.kafkaclient.poll;
+package com.apache.metron.dataservices.kafkaclient.poll;
import java.util.List;
import java.util.concurrent.CountDownLatch;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/AlertsServerModule.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/AlertsServerModule.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/AlertsServerModule.java
index bd741be..6396a6c 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/AlertsServerModule.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/AlertsServerModule.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataservices.modules.guice;
+package com.apache.metron.dataservices.modules.guice;
import java.util.Properties;
@@ -8,9 +8,9 @@ import org.slf4j.LoggerFactory;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
import com.google.inject.Singleton;
-import com.opensoc.alerts.server.AlertsCacheReaper;
-import com.opensoc.alerts.server.AlertsProcessingServer;
-import com.opensoc.alerts.server.AlertsSearcher;
+import com.apache.metron.alerts.server.AlertsCacheReaper;
+import com.apache.metron.alerts.server.AlertsProcessingServer;
+import com.apache.metron.alerts.server.AlertsSearcher;
public class AlertsServerModule extends AbstractModule {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/DefaultServletModule.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/DefaultServletModule.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/DefaultServletModule.java
index 68ce111..184769b 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/DefaultServletModule.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/DefaultServletModule.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataservices.modules.guice;
+package com.apache.metron.dataservices.modules.guice;
import java.util.Properties;
@@ -9,10 +9,10 @@ import org.slf4j.LoggerFactory;
import com.google.inject.Singleton;
import com.google.inject.servlet.ServletModule;
-import com.opensoc.dataservices.servlet.LoginServlet;
-import com.opensoc.dataservices.servlet.LogoutServlet;
-import com.opensoc.dataservices.websocket.KafkaMessageSenderServlet;
-import com.opensoc.dataservices.websocket.KafkaWebSocketCreator;
+import com.apache.metron.dataservices.servlet.LoginServlet;
+import com.apache.metron.dataservices.servlet.LogoutServlet;
+import com.apache.metron.dataservices.websocket.KafkaMessageSenderServlet;
+import com.apache.metron.dataservices.websocket.KafkaWebSocketCreator;
public class DefaultServletModule extends ServletModule {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/DefaultShiroWebModule.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/DefaultShiroWebModule.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/DefaultShiroWebModule.java
index bce4fce..6c0c8da 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/DefaultShiroWebModule.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/DefaultShiroWebModule.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataservices.modules.guice;
+package com.apache.metron.dataservices.modules.guice;
import java.util.HashMap;
import java.util.Map;
@@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory;
import com.google.inject.Provides;
import com.google.inject.name.Names;
-import com.opensoc.dataservices.auth.CustomDomainADRealm;
+import com.apache.metron.dataservices.auth.CustomDomainADRealm;
public class DefaultShiroWebModule extends ShiroWebModule {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/RestEasyModule.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/RestEasyModule.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/RestEasyModule.java
index a9efce8..e58e694 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/RestEasyModule.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/RestEasyModule.java
@@ -1,12 +1,12 @@
-package com.opensoc.dataservices.modules.guice;
+package com.apache.metron.dataservices.modules.guice;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.inject.AbstractModule;
-import com.opensoc.dataservices.auth.RestSecurityInterceptor;
-import com.opensoc.dataservices.rest.Index;
-import com.opensoc.pcapservice.PcapReceiverImplRestEasy;
+import com.apache.metron.dataservices.auth.RestSecurityInterceptor;
+import com.apache.metron.dataservices.rest.Index;
+import com.apache.metron.pcapservice.PcapReceiverImplRestEasy;
public class RestEasyModule extends AbstractModule {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/ServiceModule.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/ServiceModule.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/ServiceModule.java
index 8c7e01d..1185a47 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/ServiceModule.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/modules/guice/ServiceModule.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataservices.modules.guice;
+package com.apache.metron.dataservices.modules.guice;
import javax.inject.Singleton;
@@ -7,9 +7,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.inject.Provides;
-import com.opensoc.dataservices.common.OpenSOCService;
-import com.opensoc.services.alerts.ElasticSearch_KafkaAlertsService;
-import com.opensoc.services.alerts.Solr_KafkaAlertsService;
+import com.apache.metron.dataservices.common.MetronService;
+import com.apache.metron.services.alerts.ElasticSearch_KafkaAlertsService;
+import com.apache.metron.services.alerts.Solr_KafkaAlertsService;
public class ServiceModule extends RequestScopeModule {
@@ -23,7 +23,7 @@ public class ServiceModule extends RequestScopeModule {
@Provides
@Singleton
- public OpenSOCService socservice() {
+ public MetronService socservice() {
if (args.length > 0 && args[0].equals("ElasticSearch_KafkaAlertsService")) {
return new ElasticSearch_KafkaAlertsService();
} else {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/rest/Index.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/rest/Index.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/rest/Index.java
index d9916dc..72a9c58 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/rest/Index.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/rest/Index.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataservices.rest;
+package com.apache.metron.dataservices.rest;
import java.util.List;
import java.util.Properties;
@@ -12,8 +12,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
-import com.opensoc.dataservices.auth.AuthTokenFilter;
-import com.opensoc.dataservices.kafkaclient.poll.PollingKafkaClient;
+import com.apache.metron.dataservices.auth.AuthTokenFilter;
+import com.apache.metron.dataservices.kafkaclient.poll.PollingKafkaClient;
@Path("/")
public class Index
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/rest/RestServices.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/rest/RestServices.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/rest/RestServices.java
index 4029214..5c84d72 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/rest/RestServices.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/rest/RestServices.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataservices.rest;
+package com.apache.metron.dataservices.rest;
import java.util.HashSet;
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/servlet/LoginServlet.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/servlet/LoginServlet.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/servlet/LoginServlet.java
index 56d2c3e..0411545 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/servlet/LoginServlet.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/servlet/LoginServlet.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataservices.servlet;
+package com.apache.metron.dataservices.servlet;
import java.io.IOException;
import java.util.Properties;
@@ -21,7 +21,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
-import com.opensoc.dataservices.auth.AuthToken;
+import com.apache.metron.dataservices.auth.AuthToken;
public class LoginServlet extends HttpServlet
{
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/servlet/LogoutServlet.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/servlet/LogoutServlet.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/servlet/LogoutServlet.java
index dbc13c7..bd50340 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/servlet/LogoutServlet.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/servlet/LogoutServlet.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataservices.servlet;
+package com.apache.metron.dataservices.servlet;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/websocket/KafkaMessageSenderServlet.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/websocket/KafkaMessageSenderServlet.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/websocket/KafkaMessageSenderServlet.java
index 5823e18..9215e76 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/websocket/KafkaMessageSenderServlet.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/websocket/KafkaMessageSenderServlet.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataservices.websocket;
+package com.apache.metron.dataservices.websocket;
import javax.servlet.annotation.WebServlet;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/websocket/KafkaMessageSenderSocket.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/websocket/KafkaMessageSenderSocket.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/websocket/KafkaMessageSenderSocket.java
index 97a61f6..47db439 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/websocket/KafkaMessageSenderSocket.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/websocket/KafkaMessageSenderSocket.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataservices.websocket;
+package com.apache.metron.dataservices.websocket;
import java.io.IOException;
@@ -13,7 +13,7 @@ import org.eclipse.jetty.websocket.api.annotations.WebSocket;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.opensoc.dataservices.kafkaclient.KafkaClient;
+import com.apache.metron.dataservices.kafkaclient.KafkaClient;
@WebSocket(maxTextMessageSize = 64 * 1024)
public class KafkaMessageSenderSocket
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/websocket/KafkaWebSocketCreator.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/websocket/KafkaWebSocketCreator.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/websocket/KafkaWebSocketCreator.java
index 575fbfe..37cb156 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/websocket/KafkaWebSocketCreator.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/dataservices/websocket/KafkaWebSocketCreator.java
@@ -1,4 +1,4 @@
-package com.opensoc.dataservices.websocket;
+package com.apache.metron.dataservices.websocket;
import java.net.HttpCookie;
import java.util.List;
@@ -11,7 +11,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
-import com.opensoc.dataservices.auth.AuthToken;
+import com.apache.metron.dataservices.auth.AuthToken;
public class KafkaWebSocketCreator implements WebSocketCreator
{
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/CellTimestampComparator.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/CellTimestampComparator.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/CellTimestampComparator.java
index e45d849..43a4f28 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/CellTimestampComparator.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/CellTimestampComparator.java
@@ -1,4 +1,4 @@
-package com.opensoc.pcapservice;
+package com.apache.metron.pcapservice;
import java.util.Comparator;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/ConfigurationUtil.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/ConfigurationUtil.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/ConfigurationUtil.java
index be1a1bf..51f85fe 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/ConfigurationUtil.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/ConfigurationUtil.java
@@ -1,10 +1,10 @@
-package com.opensoc.pcapservice;
+package com.apache.metron.pcapservice;
import org.apache.commons.configuration.Configuration;
import org.apache.hadoop.hbase.util.Bytes;
import org.springframework.util.Assert;
-import com.opensoc.configuration.ConfigurationManager;
+import com.apache.metron.configuration.ConfigurationManager;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/HBaseConfigConstants.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/HBaseConfigConstants.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/HBaseConfigConstants.java
index a7e7e3b..bd3eecb 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/HBaseConfigConstants.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/HBaseConfigConstants.java
@@ -1,4 +1,4 @@
-package com.opensoc.pcapservice;
+package com.apache.metron.pcapservice;
/**
* HBase configuration properties.
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/HBaseConfigurationUtil.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/HBaseConfigurationUtil.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/HBaseConfigurationUtil.java
index 8a5c022..6061a5d 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/HBaseConfigurationUtil.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/HBaseConfigurationUtil.java
@@ -1,7 +1,7 @@
/**
*
*/
-package com.opensoc.pcapservice;
+package com.apache.metron.pcapservice;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/IPcapGetter.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/IPcapGetter.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/IPcapGetter.java
index dbff59c..3bb10c2 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/IPcapGetter.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/IPcapGetter.java
@@ -1,7 +1,7 @@
/**
*
*/
-package com.opensoc.pcapservice;
+package com.apache.metron.pcapservice;
import java.io.IOException;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/IPcapScanner.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/IPcapScanner.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/IPcapScanner.java
index 64408e9..195c5d6 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/IPcapScanner.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/IPcapScanner.java
@@ -1,4 +1,4 @@
-package com.opensoc.pcapservice;
+package com.apache.metron.pcapservice;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapGetterHBaseImpl.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapGetterHBaseImpl.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapGetterHBaseImpl.java
index b06137d..d45a7e9 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapGetterHBaseImpl.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapGetterHBaseImpl.java
@@ -1,4 +1,4 @@
-package com.opensoc.pcapservice;
+package com.apache.metron.pcapservice;
import java.io.File;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapHelper.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapHelper.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapHelper.java
index 5224945..6018065 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapHelper.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapHelper.java
@@ -1,4 +1,4 @@
-package com.opensoc.pcapservice;
+package com.apache.metron.pcapservice;
import java.util.ArrayList;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapReceiverImplRestEasy.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapReceiverImplRestEasy.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapReceiverImplRestEasy.java
index 55c6b78..6d33824 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapReceiverImplRestEasy.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapReceiverImplRestEasy.java
@@ -1,4 +1,4 @@
-package com.opensoc.pcapservice;
+package com.apache.metron.pcapservice;
import java.io.IOException;
import java.util.ArrayList;
@@ -18,8 +18,8 @@ import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import com.google.common.annotations.VisibleForTesting;
-import com.opensoc.dataservices.auth.AuthTokenFilter;
-import com.opensoc.pcap.PcapUtils;
+import com.apache.metron.dataservices.auth.AuthTokenFilter;
+import com.apache.metron.pcap.PcapUtils;
@Path("/pcap/")
public class PcapReceiverImplRestEasy {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapScannerHBaseImpl.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapScannerHBaseImpl.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapScannerHBaseImpl.java
index b1f0179..e32b80e 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapScannerHBaseImpl.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapScannerHBaseImpl.java
@@ -1,4 +1,4 @@
-package com.opensoc.pcapservice;
+package com.apache.metron.pcapservice;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -20,7 +20,7 @@ import org.apache.log4j.Logger;
import org.springframework.util.Assert;
import com.google.common.annotations.VisibleForTesting;
-import com.opensoc.pcap.PcapMerger;
+import com.apache.metron.pcap.PcapMerger;
/**
* Singleton class which integrates with HBase table and returns sorted pcaps
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapsResponse.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapsResponse.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapsResponse.java
index 10af9e0..ea004e9 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapsResponse.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/PcapsResponse.java
@@ -1,14 +1,14 @@
/**
*
*/
-package com.opensoc.pcapservice;
+package com.apache.metron.pcapservice;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import com.opensoc.pcap.PcapMerger;
+import com.apache.metron.pcap.PcapMerger;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/RestTestingUtil.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/RestTestingUtil.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/RestTestingUtil.java
index 651affe..baf6285 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/RestTestingUtil.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/RestTestingUtil.java
@@ -1,4 +1,4 @@
-package com.opensoc.pcapservice;
+package com.apache.metron.pcapservice;
import java.util.HashMap;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/rest/JettyServiceRunner.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/rest/JettyServiceRunner.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/rest/JettyServiceRunner.java
index 1fdb025..83709ea 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/rest/JettyServiceRunner.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/rest/JettyServiceRunner.java
@@ -1,11 +1,11 @@
-package com.opensoc.pcapservice.rest;
+package com.apache.metron.pcapservice.rest;
import java.util.HashSet;
import java.util.Set;
import javax.ws.rs.core.Application;
-import com.opensoc.pcapservice.PcapReceiverImplRestEasy;
+import com.apache.metron.pcapservice.PcapReceiverImplRestEasy;
public class JettyServiceRunner extends Application {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/rest/PcapService.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/rest/PcapService.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/rest/PcapService.java
index 5f47ead..c8f4a20 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/rest/PcapService.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/pcapservice/rest/PcapService.java
@@ -1,4 +1,4 @@
-package com.opensoc.pcapservice.rest;
+package com.apache.metron.pcapservice.rest;
import java.io.IOException;
@@ -7,7 +7,7 @@ import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher;
-import com.opensoc.helpers.services.PcapServiceCli;
+import com.apache.metron.helpers.services.PcapServiceCli;
public class PcapService {
@@ -21,7 +21,7 @@ public class PcapService {
ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
context.setContextPath("/");
ServletHolder h = new ServletHolder(new HttpServletDispatcher());
- h.setInitParameter("javax.ws.rs.Application", "com.opensoc.pcapservice.rest.JettyServiceRunner");
+ h.setInitParameter("javax.ws.rs.Application", "com.apache.metron.pcapservice.rest.JettyServiceRunner");
context.addServlet(h, "/*");
server.setHandler(context);
try {
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/services/alerts/ElasticSearch_KafkaAlertsService.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/services/alerts/ElasticSearch_KafkaAlertsService.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/services/alerts/ElasticSearch_KafkaAlertsService.java
index 69ec5bc..ee2cf2d 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/services/alerts/ElasticSearch_KafkaAlertsService.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/services/alerts/ElasticSearch_KafkaAlertsService.java
@@ -1,14 +1,14 @@
-package com.opensoc.services.alerts;
+package com.apache.metron.services.alerts;
import javax.inject.Singleton;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.opensoc.dataservices.common.OpenSOCService;
+import com.apache.metron.dataservices.common.MetronService;
@Singleton
-public class ElasticSearch_KafkaAlertsService implements OpenSOCService {
+public class ElasticSearch_KafkaAlertsService implements MetronService {
private static final Logger logger = LoggerFactory.getLogger( ElasticSearch_KafkaAlertsService.class );
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/services/alerts/Solr_KafkaAlertsService.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/services/alerts/Solr_KafkaAlertsService.java b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/services/alerts/Solr_KafkaAlertsService.java
index 36aaee9..e6f048f 100644
--- a/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/services/alerts/Solr_KafkaAlertsService.java
+++ b/metron-streaming/Metron-DataServices/src/main/java/com/apache/metron/services/alerts/Solr_KafkaAlertsService.java
@@ -1,14 +1,14 @@
-package com.opensoc.services.alerts;
+package com.apache.metron.services.alerts;
import javax.inject.Singleton;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.opensoc.dataservices.common.OpenSOCService;
+import com.apache.metron.dataservices.common.MetronService;
@Singleton
-public class Solr_KafkaAlertsService implements OpenSOCService {
+public class Solr_KafkaAlertsService implements MetronService {
private static final Logger logger = LoggerFactory.getLogger( Solr_KafkaAlertsService.class );
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/db6e64e8/metron-streaming/Metron-DataServices/src/test/java/com/apache/metron/pcapservice/CellTimestampComparatorTest.java
----------------------------------------------------------------------
diff --git a/metron-streaming/Metron-DataServices/src/test/java/com/apache/metron/pcapservice/CellTimestampComparatorTest.java b/metron-streaming/Metron-DataServices/src/test/java/com/apache/metron/pcapservice/CellTimestampComparatorTest.java
index c2a4bf2..db38f7c 100644
--- a/metron-streaming/Metron-DataServices/src/test/java/com/apache/metron/pcapservice/CellTimestampComparatorTest.java
+++ b/metron-streaming/Metron-DataServices/src/test/java/com/apache/metron/pcapservice/CellTimestampComparatorTest.java
@@ -1,4 +1,4 @@
-package com.opensoc.pcapservice;
+package com.apache.metron.pcapservice;
import junit.framework.Assert;
@@ -8,7 +8,7 @@ import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
-import com.opensoc.pcapservice.CellTimestampComparator;
+import com.apache.metron.pcapservice.CellTimestampComparator;
/**
* The Class CellTimestampComparatorTest.