diff --git a/build.xml b/build.xml index cf6be68..66dac1c 100644 --- a/build.xml +++ b/build.xml @@ -77,13 +77,13 @@ + includes="com/sumologic/kinesis/*.java, com/sumologic/kinesis/utils/*.java, + com/sumologic/client/*.java, com/sumologic/client/implementations/*.java"/> + includes="com/sumologic/kinesis/*.java, com/sumologic/kinesis/utils/*.java, + com/sumologic/client/*.java, com/sumologic/client/implementations/*.java"/> - + includes="com/sumologic/kinesis/*.java, com/sumologic/kinesis/utils/*.java, + com/sumologic/client/*.java, com/sumologic/client/implementations/*.java"/> + diff --git a/src/main/java/com/mcplusa/sumologic/CloudWatchMessageModelSumologicTransformer.java b/src/main/java/com/sumologic/client/CloudWatchMessageModelSumologicTransformer.java similarity index 94% rename from src/main/java/com/mcplusa/sumologic/CloudWatchMessageModelSumologicTransformer.java rename to src/main/java/com/sumologic/client/CloudWatchMessageModelSumologicTransformer.java index 8fcaf31..78d9529 100644 --- a/src/main/java/com/mcplusa/sumologic/CloudWatchMessageModelSumologicTransformer.java +++ b/src/main/java/com/sumologic/client/CloudWatchMessageModelSumologicTransformer.java @@ -1,10 +1,10 @@ -package com.mcplusa.sumologic; +package com.sumologic.client; import java.io.IOException; import com.amazonaws.services.kinesis.model.Record; -import com.mcplusa.sumologic.SimpleKinesisMessageModel; -import com.mcplusa.sumologic.implementations.SumologicTransformer; +import com.sumologic.client.SimpleKinesisMessageModel; +import com.sumologic.client.implementations.SumologicTransformer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/main/java/com/mcplusa/sumologic/DefaultKinesisMessageModelSumologicTransformer.java b/src/main/java/com/sumologic/client/DefaultKinesisMessageModelSumologicTransformer.java similarity index 87% rename from src/main/java/com/mcplusa/sumologic/DefaultKinesisMessageModelSumologicTransformer.java rename to src/main/java/com/sumologic/client/DefaultKinesisMessageModelSumologicTransformer.java index bf7572d..5266d00 100644 --- a/src/main/java/com/mcplusa/sumologic/DefaultKinesisMessageModelSumologicTransformer.java +++ b/src/main/java/com/sumologic/client/DefaultKinesisMessageModelSumologicTransformer.java @@ -1,12 +1,12 @@ -package com.mcplusa.sumologic; +package com.sumologic.client; import java.io.IOException; import com.amazonaws.services.kinesis.connectors.BasicJsonTransformer; import com.amazonaws.services.kinesis.model.Record; -import com.mcplusa.sumologic.SimpleKinesisMessageModel; -import com.mcplusa.sumologic.implementations.SumologicEmitter; -import com.mcplusa.sumologic.implementations.SumologicTransformer; +import com.sumologic.client.SimpleKinesisMessageModel; +import com.sumologic.client.implementations.SumologicEmitter; +import com.sumologic.client.implementations.SumologicTransformer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/main/java/com/mcplusa/sumologic/KinesisConnectorForSumologicConfiguration.java b/src/main/java/com/sumologic/client/KinesisConnectorForSumologicConfiguration.java similarity index 97% rename from src/main/java/com/mcplusa/sumologic/KinesisConnectorForSumologicConfiguration.java rename to src/main/java/com/sumologic/client/KinesisConnectorForSumologicConfiguration.java index 5c124e8..bb65f84 100644 --- a/src/main/java/com/mcplusa/sumologic/KinesisConnectorForSumologicConfiguration.java +++ b/src/main/java/com/sumologic/client/KinesisConnectorForSumologicConfiguration.java @@ -1,4 +1,4 @@ -package com.mcplusa.sumologic; +package com.sumologic.client; import java.util.Properties; diff --git a/src/main/java/com/mcplusa/sumologic/SimpleKinesisMessageModel.java b/src/main/java/com/sumologic/client/SimpleKinesisMessageModel.java similarity index 94% rename from src/main/java/com/mcplusa/sumologic/SimpleKinesisMessageModel.java rename to src/main/java/com/sumologic/client/SimpleKinesisMessageModel.java index e1d671e..da5e43c 100644 --- a/src/main/java/com/mcplusa/sumologic/SimpleKinesisMessageModel.java +++ b/src/main/java/com/sumologic/client/SimpleKinesisMessageModel.java @@ -1,4 +1,4 @@ -package com.mcplusa.sumologic; +package com.sumologic.client; import java.io.Serializable; diff --git a/src/main/java/com/mcplusa/sumologic/SumologicExecutor.java b/src/main/java/com/sumologic/client/SumologicExecutor.java similarity index 84% rename from src/main/java/com/mcplusa/sumologic/SumologicExecutor.java rename to src/main/java/com/sumologic/client/SumologicExecutor.java index 97a908e..f2e48c6 100644 --- a/src/main/java/com/mcplusa/sumologic/SumologicExecutor.java +++ b/src/main/java/com/sumologic/client/SumologicExecutor.java @@ -1,10 +1,10 @@ -package com.mcplusa.sumologic; +package com.sumologic.client; import com.amazonaws.services.kinesis.connectors.KinesisConnectorRecordProcessorFactory; -import com.mcplusa.kinesis.KinesisConnectorExecutor; -import com.mcplusa.sumologic.SimpleKinesisMessageModel; -import com.mcplusa.sumologic.SumologicMessageModelPipeline; +import com.sumologic.kinesis.KinesisConnectorExecutor; +import com.sumologic.client.SimpleKinesisMessageModel; +import com.sumologic.client.SumologicMessageModelPipeline; public class SumologicExecutor extends KinesisConnectorExecutor { diff --git a/src/main/java/com/mcplusa/sumologic/SumologicMessageModelPipeline.java b/src/main/java/com/sumologic/client/SumologicMessageModelPipeline.java similarity index 91% rename from src/main/java/com/mcplusa/sumologic/SumologicMessageModelPipeline.java rename to src/main/java/com/sumologic/client/SumologicMessageModelPipeline.java index 1441c83..edbf76b 100644 --- a/src/main/java/com/mcplusa/sumologic/SumologicMessageModelPipeline.java +++ b/src/main/java/com/sumologic/client/SumologicMessageModelPipeline.java @@ -1,11 +1,11 @@ -package com.mcplusa.sumologic; +package com.sumologic.client; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.mcplusa.sumologic.SimpleKinesisMessageModel; -import com.mcplusa.sumologic.CloudWatchMessageModelSumologicTransformer; -import com.mcplusa.sumologic.implementations.SumologicEmitter; +import com.sumologic.client.SimpleKinesisMessageModel; +import com.sumologic.client.CloudWatchMessageModelSumologicTransformer; +import com.sumologic.client.implementations.SumologicEmitter; import com.amazonaws.services.kinesis.connectors.interfaces.IKinesisConnectorPipeline; import com.amazonaws.services.kinesis.connectors.KinesisConnectorConfiguration; import com.amazonaws.services.kinesis.connectors.impl.BasicMemoryBuffer; @@ -47,7 +47,7 @@ public IBuffer getBuffer(KinesisConnectorConfiguratio // Load specified class String argClass = ((KinesisConnectorForSumologicConfiguration)configuration).TRANSFORMER_CLASS; - String className = "com.mcplusa.sumologic."+argClass; + String className = "com.sumologic.client."+argClass; ClassLoader classLoader = SumologicMessageModelPipeline.class.getClassLoader(); Class ModelClass = null; try { diff --git a/src/main/java/com/mcplusa/sumologic/SumologicSender.java b/src/main/java/com/sumologic/client/SumologicSender.java similarity index 99% rename from src/main/java/com/mcplusa/sumologic/SumologicSender.java rename to src/main/java/com/sumologic/client/SumologicSender.java index 1ee9056..295234e 100644 --- a/src/main/java/com/mcplusa/sumologic/SumologicSender.java +++ b/src/main/java/com/sumologic/client/SumologicSender.java @@ -1,4 +1,4 @@ -package com.mcplusa.sumologic; +package com.sumologic.client; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/com/mcplusa/sumologic/implementations/SumologicEmitter.java b/src/main/java/com/sumologic/client/implementations/SumologicEmitter.java similarity index 94% rename from src/main/java/com/mcplusa/sumologic/implementations/SumologicEmitter.java rename to src/main/java/com/sumologic/client/implementations/SumologicEmitter.java index b57a4fe..dc4c1da 100644 --- a/src/main/java/com/mcplusa/sumologic/implementations/SumologicEmitter.java +++ b/src/main/java/com/sumologic/client/implementations/SumologicEmitter.java @@ -1,4 +1,4 @@ -package com.mcplusa.sumologic.implementations; +package com.sumologic.client.implementations; import java.io.IOException; import java.util.ArrayList; @@ -9,8 +9,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.mcplusa.sumologic.SumologicSender; -import com.mcplusa.sumologic.KinesisConnectorForSumologicConfiguration; +import com.sumologic.client.SumologicSender; +import com.sumologic.client.KinesisConnectorForSumologicConfiguration; import com.amazonaws.services.kinesis.connectors.KinesisConnectorConfiguration; import com.amazonaws.services.kinesis.connectors.UnmodifiableBuffer; diff --git a/src/main/java/com/mcplusa/sumologic/implementations/SumologicTransformer.java b/src/main/java/com/sumologic/client/implementations/SumologicTransformer.java similarity index 85% rename from src/main/java/com/mcplusa/sumologic/implementations/SumologicTransformer.java rename to src/main/java/com/sumologic/client/implementations/SumologicTransformer.java index ed5bfe0..34b234d 100644 --- a/src/main/java/com/mcplusa/sumologic/implementations/SumologicTransformer.java +++ b/src/main/java/com/sumologic/client/implementations/SumologicTransformer.java @@ -1,4 +1,4 @@ -package com.mcplusa.sumologic.implementations; +package com.sumologic.client.implementations; import com.amazonaws.services.kinesis.connectors.interfaces.ITransformer; diff --git a/src/main/java/com/mcplusa/kinesis/BatchedStreamSource.java b/src/main/java/com/sumologic/kinesis/BatchedStreamSource.java similarity index 84% rename from src/main/java/com/mcplusa/kinesis/BatchedStreamSource.java rename to src/main/java/com/sumologic/kinesis/BatchedStreamSource.java index d463002..192db34 100644 --- a/src/main/java/com/mcplusa/kinesis/BatchedStreamSource.java +++ b/src/main/java/com/sumologic/kinesis/BatchedStreamSource.java @@ -1,18 +1,4 @@ -/* - * Copyright 2014 Amazon.com, Inc. or its affiliates. All Rights Reserved. - * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at - * - * http://aws.amazon.com/asl/ - * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package com.mcplusa.kinesis; +package com.sumologic.kinesis; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; @@ -28,7 +14,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.mcplusa.sumologic.SimpleKinesisMessageModel; +import com.sumologic.client.SimpleKinesisMessageModel; import com.amazonaws.services.kinesis.connectors.KinesisConnectorConfiguration; import com.amazonaws.services.kinesis.model.PutRecordRequest; diff --git a/src/main/java/com/mcplusa/kinesis/KinesisConnectorExecutor.java b/src/main/java/com/sumologic/kinesis/KinesisConnectorExecutor.java similarity index 86% rename from src/main/java/com/mcplusa/kinesis/KinesisConnectorExecutor.java rename to src/main/java/com/sumologic/kinesis/KinesisConnectorExecutor.java index c7440c6..77a6e56 100644 --- a/src/main/java/com/mcplusa/kinesis/KinesisConnectorExecutor.java +++ b/src/main/java/com/sumologic/kinesis/KinesisConnectorExecutor.java @@ -1,18 +1,4 @@ -/* - * Copyright 2013-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved. - * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at - * - * http://aws.amazon.com/asl/ - * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package com.mcplusa.kinesis; +package com.sumologic.kinesis; import java.io.IOException; import java.io.InputStream; @@ -21,8 +7,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.mcplusa.sumologic.KinesisConnectorForSumologicConfiguration; -import com.mcplusa.kinesis.KinesisConnectorExecutorBase; +import com.sumologic.client.KinesisConnectorForSumologicConfiguration; +import com.sumologic.kinesis.KinesisConnectorExecutorBase; import com.amazonaws.auth.AWSCredentialsProvider; import com.amazonaws.auth.ClasspathPropertiesFileCredentialsProvider; import com.amazonaws.services.kinesis.connectors.KinesisConnectorConfiguration; diff --git a/src/main/java/com/mcplusa/kinesis/KinesisConnectorExecutorBase.java b/src/main/java/com/sumologic/kinesis/KinesisConnectorExecutorBase.java similarity index 90% rename from src/main/java/com/mcplusa/kinesis/KinesisConnectorExecutorBase.java rename to src/main/java/com/sumologic/kinesis/KinesisConnectorExecutorBase.java index eacf9a2..e7c8cae 100644 --- a/src/main/java/com/mcplusa/kinesis/KinesisConnectorExecutorBase.java +++ b/src/main/java/com/sumologic/kinesis/KinesisConnectorExecutorBase.java @@ -1,18 +1,4 @@ -/* - * Copyright 2013-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved. - * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at - * - * http://aws.amazon.com/asl/ - * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package com.mcplusa.kinesis; +package com.sumologic.kinesis; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/src/main/java/com/mcplusa/kinesis/KinesisConnectorMetricsExecutor.java b/src/main/java/com/sumologic/kinesis/KinesisConnectorMetricsExecutor.java similarity index 62% rename from src/main/java/com/mcplusa/kinesis/KinesisConnectorMetricsExecutor.java rename to src/main/java/com/sumologic/kinesis/KinesisConnectorMetricsExecutor.java index 38bec4e..9a4bdb0 100644 --- a/src/main/java/com/mcplusa/kinesis/KinesisConnectorMetricsExecutor.java +++ b/src/main/java/com/sumologic/kinesis/KinesisConnectorMetricsExecutor.java @@ -1,18 +1,4 @@ -/* - * Copyright 2013-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved. - * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at - * - * http://aws.amazon.com/asl/ - * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package com.mcplusa.kinesis; +package com.sumologic.kinesis; import com.amazonaws.services.kinesis.metrics.impl.CWMetricsFactory; import com.amazonaws.services.kinesis.metrics.interfaces.IMetricsFactory; diff --git a/src/main/java/com/mcplusa/kinesis/StreamSource.java b/src/main/java/com/sumologic/kinesis/StreamSource.java similarity index 87% rename from src/main/java/com/mcplusa/kinesis/StreamSource.java rename to src/main/java/com/sumologic/kinesis/StreamSource.java index b9b4b2b..0290b5d 100644 --- a/src/main/java/com/mcplusa/kinesis/StreamSource.java +++ b/src/main/java/com/sumologic/kinesis/StreamSource.java @@ -1,18 +1,4 @@ -/* - * Copyright 2013-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved. - * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at - * - * http://aws.amazon.com/asl/ - * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package com.mcplusa.kinesis; +package com.sumologic.kinesis; import java.io.BufferedReader; import java.io.IOException; @@ -23,8 +9,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.mcplusa.sumologic.SimpleKinesisMessageModel; -import com.mcplusa.kinesis.utils.KinesisUtils; +import com.sumologic.client.SimpleKinesisMessageModel; +import com.sumologic.kinesis.utils.KinesisUtils; import com.amazonaws.auth.AWSCredentialsProvider; import com.amazonaws.regions.RegionUtils; diff --git a/src/main/java/com/mcplusa/kinesis/utils/KinesisUtils.java b/src/main/java/com/sumologic/kinesis/utils/KinesisUtils.java similarity index 94% rename from src/main/java/com/mcplusa/kinesis/utils/KinesisUtils.java rename to src/main/java/com/sumologic/kinesis/utils/KinesisUtils.java index 9c477d2..59154b8 100644 --- a/src/main/java/com/mcplusa/kinesis/utils/KinesisUtils.java +++ b/src/main/java/com/sumologic/kinesis/utils/KinesisUtils.java @@ -1,18 +1,4 @@ -/* - * Copyright 2013-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved. - * - * Licensed under the Amazon Software License (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at - * - * http://aws.amazon.com/asl/ - * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package com.mcplusa.kinesis.utils; +package com.sumologic.kinesis.utils; import java.util.List; diff --git a/src/test/java/com/mcplusa/sumologic/CloudWatchMessageModelSumologicTransformerTest.java b/src/test/java/com/sumologic/client/CloudWatchMessageModelSumologicTransformerTest.java similarity index 89% rename from src/test/java/com/mcplusa/sumologic/CloudWatchMessageModelSumologicTransformerTest.java rename to src/test/java/com/sumologic/client/CloudWatchMessageModelSumologicTransformerTest.java index 7839b34..7f31a29 100644 --- a/src/test/java/com/mcplusa/sumologic/CloudWatchMessageModelSumologicTransformerTest.java +++ b/src/test/java/com/sumologic/client/CloudWatchMessageModelSumologicTransformerTest.java @@ -1,4 +1,4 @@ -package com.mcplusa.sumologic; +package com.sumologic.client; import org.junit.Assert; import org.junit.Before; @@ -7,8 +7,8 @@ import org.junit.Ignore; import com.amazonaws.services.kinesis.model.Record; -import com.mcplusa.sumologic.CloudWatchMessageModelSumologicTransformer; -import com.mcplusa.sumologic.SimpleKinesisMessageModel; +import com.sumologic.client.CloudWatchMessageModelSumologicTransformer; +import com.sumologic.client.SimpleKinesisMessageModel; import java.io.IOException; import java.nio.charset.Charset; diff --git a/src/test/java/com/mcplusa/sumologic/SumologicSenderTest.java b/src/test/java/com/sumologic/client/SumologicSenderTest.java similarity index 92% rename from src/test/java/com/mcplusa/sumologic/SumologicSenderTest.java rename to src/test/java/com/sumologic/client/SumologicSenderTest.java index c4ead55..8961ec4 100644 --- a/src/test/java/com/mcplusa/sumologic/SumologicSenderTest.java +++ b/src/test/java/com/sumologic/client/SumologicSenderTest.java @@ -1,4 +1,4 @@ -package com.mcplusa.sumologic; +package com.sumologic.client; import java.io.IOException; import java.nio.charset.Charset; @@ -16,9 +16,9 @@ import com.github.tomakehurst.wiremock.client.WireMock; import com.github.tomakehurst.wiremock.junit.WireMockRule; -import com.mcplusa.sumologic.CloudWatchMessageModelSumologicTransformer; -import com.mcplusa.sumologic.SumologicSender; -import com.mcplusa.sumologic.implementations.SumologicEmitter; +import com.sumologic.client.CloudWatchMessageModelSumologicTransformer; +import com.sumologic.client.SumologicSender; +import com.sumologic.client.implementations.SumologicEmitter; public class SumologicSenderTest { diff --git a/src/test/java/com/mcplusa/sumologic/implementations/SumologicEmitterTest.java b/src/test/java/com/sumologic/client/implementations/SumologicEmitterTest.java similarity index 94% rename from src/test/java/com/mcplusa/sumologic/implementations/SumologicEmitterTest.java rename to src/test/java/com/sumologic/client/implementations/SumologicEmitterTest.java index 0f788f3..d1968a6 100644 --- a/src/test/java/com/mcplusa/sumologic/implementations/SumologicEmitterTest.java +++ b/src/test/java/com/sumologic/client/implementations/SumologicEmitterTest.java @@ -1,4 +1,4 @@ -package com.mcplusa.sumologic.implementations; +package com.sumologic.client.implementations; import java.util.ArrayList; import java.util.List; @@ -13,7 +13,7 @@ import com.github.tomakehurst.wiremock.client.WireMock; import com.github.tomakehurst.wiremock.junit.WireMockRule; -import com.mcplusa.sumologic.implementations.SumologicEmitter; +import com.sumologic.client.implementations.SumologicEmitter; public class SumologicEmitterTest {