diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..a6f89c2d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/target/ \ No newline at end of file diff --git a/lib/commons-lang-2.4.jar b/lib/commons-lang-2.4.jar deleted file mode 100755 index 532939ec..00000000 Binary files a/lib/commons-lang-2.4.jar and /dev/null differ diff --git a/lib/log4j-1.2.16.jar b/lib/log4j-1.2.16.jar deleted file mode 100644 index 3f9d8476..00000000 Binary files a/lib/log4j-1.2.16.jar and /dev/null differ diff --git a/lib/logback-classic-1.0.0.jar b/lib/logback-classic-1.0.0.jar deleted file mode 100644 index 209a4583..00000000 Binary files a/lib/logback-classic-1.0.0.jar and /dev/null differ diff --git a/lib/logback-core-1.0.0.jar b/lib/logback-core-1.0.0.jar deleted file mode 100644 index 4b2bd0ad..00000000 Binary files a/lib/logback-core-1.0.0.jar and /dev/null differ diff --git a/lib/slf4j-api-1.6.4.jar b/lib/slf4j-api-1.6.4.jar deleted file mode 100644 index 4d23f41d..00000000 Binary files a/lib/slf4j-api-1.6.4.jar and /dev/null differ diff --git a/lib/slf4j-jdk14-1.6.4.jar b/lib/slf4j-jdk14-1.6.4.jar deleted file mode 100644 index 8503cabd..00000000 Binary files a/lib/slf4j-jdk14-1.6.4.jar and /dev/null differ diff --git a/lib/slf4j-log4j12-1.6.4.jar b/lib/slf4j-log4j12-1.6.4.jar deleted file mode 100644 index daa3aa16..00000000 Binary files a/lib/slf4j-log4j12-1.6.4.jar and /dev/null differ diff --git a/lib/splunk-sdk.jar b/lib/splunk-sdk.jar deleted file mode 100755 index 1e5bdfc8..00000000 Binary files a/lib/splunk-sdk.jar and /dev/null differ diff --git a/lib/splunk.jar b/lib/splunk.jar deleted file mode 100755 index 0df481fa..00000000 Binary files a/lib/splunk.jar and /dev/null differ diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..16e4bc54 --- /dev/null +++ b/pom.xml @@ -0,0 +1,90 @@ + + + 4.0.0 + + com.dtdsoftware + splunk-logging + 1.1-SNAPSHOT + jar + + splunk-logging + http://maven.apache.org + + + UTF-8 + 0.8.1 + 1.6.4 + + + + + scm:git:git@github.com:stringaling/SplunkJavaLogging.git + scm:git:git@github.com:stringaling/SplunkJavaLogging.git + scm:git:git@github.com:stringaling/SplunkJavaLogging.git + + + + + false + art01 + art01-releases + http://art01.corp.pingidentity.com:8080/artifactory/inhouse + + + art01 + art01-snapshots + http://art01.corp.pingidentity.com:8080/artifactory/inhouse + + + + + + commons-lang + commons-lang + 2.4 + compile + + + log4j + log4j + 1.2.16 + provided + + + ch.qos.logback + logback-classic + 1.0.0 + provided + + + org.slf4j + slf4j-api + ${dependency.slf4j.version} + provided + + + org.slf4j + slf4j-jdk14 + ${dependency.slf4j.version} + provided + + + org.slf4j + slf4j-log4j12 + ${dependency.slf4j.version} + provided + + + com.splunk + splunk + ${dependency.splunk.version} + compile + + + com.splunk + splunk-sdk + ${dependency.splunk.version} + compile + + + diff --git a/src/com/dtdsoftware/splunk/logging/RestEventData.java b/src/main/java/com/dtdsoftware/splunk/logging/RestEventData.java similarity index 100% rename from src/com/dtdsoftware/splunk/logging/RestEventData.java rename to src/main/java/com/dtdsoftware/splunk/logging/RestEventData.java diff --git a/src/com/dtdsoftware/splunk/logging/SplunkInput.java b/src/main/java/com/dtdsoftware/splunk/logging/SplunkInput.java similarity index 100% rename from src/com/dtdsoftware/splunk/logging/SplunkInput.java rename to src/main/java/com/dtdsoftware/splunk/logging/SplunkInput.java diff --git a/src/com/dtdsoftware/splunk/logging/SplunkLogEvent.java b/src/main/java/com/dtdsoftware/splunk/logging/SplunkLogEvent.java similarity index 100% rename from src/com/dtdsoftware/splunk/logging/SplunkLogEvent.java rename to src/main/java/com/dtdsoftware/splunk/logging/SplunkLogEvent.java diff --git a/src/com/dtdsoftware/splunk/logging/SplunkLogEventFactory.java b/src/main/java/com/dtdsoftware/splunk/logging/SplunkLogEventFactory.java similarity index 100% rename from src/com/dtdsoftware/splunk/logging/SplunkLogEventFactory.java rename to src/main/java/com/dtdsoftware/splunk/logging/SplunkLogEventFactory.java diff --git a/src/com/dtdsoftware/splunk/logging/SplunkRawTCPInput.java b/src/main/java/com/dtdsoftware/splunk/logging/SplunkRawTCPInput.java similarity index 100% rename from src/com/dtdsoftware/splunk/logging/SplunkRawTCPInput.java rename to src/main/java/com/dtdsoftware/splunk/logging/SplunkRawTCPInput.java diff --git a/src/com/dtdsoftware/splunk/logging/SplunkRestInput.java b/src/main/java/com/dtdsoftware/splunk/logging/SplunkRestInput.java similarity index 89% rename from src/com/dtdsoftware/splunk/logging/SplunkRestInput.java rename to src/main/java/com/dtdsoftware/splunk/logging/SplunkRestInput.java index 7ef2f0c1..b2ea3663 100644 --- a/src/com/dtdsoftware/splunk/logging/SplunkRestInput.java +++ b/src/main/java/com/dtdsoftware/splunk/logging/SplunkRestInput.java @@ -7,7 +7,7 @@ import java.net.Socket; import com.splunk.Args; -import com.splunk.Receivers; +import com.splunk.Receiver; import com.splunk.Service; /** @@ -21,7 +21,7 @@ public class SplunkRestInput extends SplunkInput { // Java SDK objects private Service service; - private Receivers receivers; + private Receiver receiver; private Args args; // connection props @@ -74,7 +74,7 @@ private void initService() { this.service = new Service(host, port); this.service.login(user, pass); - this.receivers = new Receivers(this.service); + this.receiver = this.service.getReceiver(); } @@ -85,9 +85,9 @@ private void initService() { */ private void openStream() throws Exception { - if (this.receivers != null) { + if (this.receiver != null) { - this.streamSocket = this.receivers.attach(args); + this.streamSocket = this.receiver.attach(args); this.ostream = streamSocket.getOutputStream(); this.writerOut = new OutputStreamWriter(ostream, "UTF8"); @@ -152,13 +152,13 @@ public void sendEvent(String message) { try { if (streamSocket == null) { - this.receivers.submit(currentMessage, args); + this.receiver.submit(args, currentMessage); // flush the queue while (queueContainsEvents()) { String messageOffQueue = dequeue(); currentMessage = messageOffQueue; - this.receivers.submit(currentMessage, args); + this.receiver.submit(args, currentMessage); } } } catch (Exception e) { diff --git a/src/com/dtdsoftware/splunk/logging/examples/Example.java b/src/main/java/com/dtdsoftware/splunk/logging/examples/Example.java similarity index 100% rename from src/com/dtdsoftware/splunk/logging/examples/Example.java rename to src/main/java/com/dtdsoftware/splunk/logging/examples/Example.java diff --git a/src/com/dtdsoftware/splunk/logging/jdk/handler/SplunkFormatter.java b/src/main/java/com/dtdsoftware/splunk/logging/jdk/handler/SplunkFormatter.java similarity index 100% rename from src/com/dtdsoftware/splunk/logging/jdk/handler/SplunkFormatter.java rename to src/main/java/com/dtdsoftware/splunk/logging/jdk/handler/SplunkFormatter.java diff --git a/src/com/dtdsoftware/splunk/logging/jdk/handler/SplunkRawTCPHandler.java b/src/main/java/com/dtdsoftware/splunk/logging/jdk/handler/SplunkRawTCPHandler.java similarity index 100% rename from src/com/dtdsoftware/splunk/logging/jdk/handler/SplunkRawTCPHandler.java rename to src/main/java/com/dtdsoftware/splunk/logging/jdk/handler/SplunkRawTCPHandler.java diff --git a/src/com/dtdsoftware/splunk/logging/jdk/handler/SplunkRestHandler.java b/src/main/java/com/dtdsoftware/splunk/logging/jdk/handler/SplunkRestHandler.java similarity index 100% rename from src/com/dtdsoftware/splunk/logging/jdk/handler/SplunkRestHandler.java rename to src/main/java/com/dtdsoftware/splunk/logging/jdk/handler/SplunkRestHandler.java diff --git a/src/com/dtdsoftware/splunk/logging/log4j/appender/SplunkRawTCPAppender.java b/src/main/java/com/dtdsoftware/splunk/logging/log4j/appender/SplunkRawTCPAppender.java similarity index 100% rename from src/com/dtdsoftware/splunk/logging/log4j/appender/SplunkRawTCPAppender.java rename to src/main/java/com/dtdsoftware/splunk/logging/log4j/appender/SplunkRawTCPAppender.java diff --git a/src/com/dtdsoftware/splunk/logging/log4j/appender/SplunkRestAppender.java b/src/main/java/com/dtdsoftware/splunk/logging/log4j/appender/SplunkRestAppender.java similarity index 100% rename from src/com/dtdsoftware/splunk/logging/log4j/appender/SplunkRestAppender.java rename to src/main/java/com/dtdsoftware/splunk/logging/log4j/appender/SplunkRestAppender.java diff --git a/src/com/dtdsoftware/splunk/logging/logback/appender/SplunkRawTCPAppender.java b/src/main/java/com/dtdsoftware/splunk/logging/logback/appender/SplunkRawTCPAppender.java similarity index 100% rename from src/com/dtdsoftware/splunk/logging/logback/appender/SplunkRawTCPAppender.java rename to src/main/java/com/dtdsoftware/splunk/logging/logback/appender/SplunkRawTCPAppender.java diff --git a/src/com/dtdsoftware/splunk/logging/logback/appender/SplunkRestAppender.java b/src/main/java/com/dtdsoftware/splunk/logging/logback/appender/SplunkRestAppender.java similarity index 100% rename from src/com/dtdsoftware/splunk/logging/logback/appender/SplunkRestAppender.java rename to src/main/java/com/dtdsoftware/splunk/logging/logback/appender/SplunkRestAppender.java