Removed references to mcplusa

build.xml

@@ -77,13 +77,13 @@
         <javac srcdir="${src.dir}/main/java" 
                        destdir="${basedir}/build" 
                        classpathref="sumologic.classpath"
-                       includes="com/mcplusa/kinesis/*.java, com/mcplusa/kinesis/utils/*.java,
-                                 com/mcplusa/sumologic/*.java, com/mcplusa/sumologic/implementations/*.java"/>
+                       includes="com/sumologic/kinesis/*.java, com/sumologic/kinesis/utils/*.java,
+                                 com/sumologic/client/*.java, com/sumologic/client/implementations/*.java"/>
         <javac srcdir="${src.dir}/test/java" 
                destdir="${basedir}/build" 
                classpathref="sumologic.classpath"
-               includes="com/mcplusa/kinesis/*.java, com/mcplusa/kinesis/utils/*.java,
-                         com/mcplusa/sumologic/*.java, com/mcplusa/sumologic/implementations/*.java"/>
+               includes="com/sumologic/kinesis/*.java, com/sumologic/kinesis/utils/*.java,
+                         com/sumologic/client/*.java, com/sumologic/client/implementations/*.java"/>
 
 		<junit haltonfailure="yes" 
 			   showoutput="yes" 
@@ -106,11 +106,12 @@
     <target name="main">
         <mkdir dir="${basedir}/build"/>
         <javac srcdir="${src.dir}/main/java" 
+        	   debug="on"
                destdir="${basedir}/build" 
                classpathref="sumologic.classpath"
-               includes="com/mcplusa/kinesis/*.java, com/mcplusa/kinesis/utils/*.java,
-                         com/mcplusa/sumologic/*.java, com/mcplusa/sumologic/implementations/*.java"/>
-        <java classname="com.mcplusa.sumologic.SumologicExecutor" classpathref="sumologic.classpath" fork="true" />
+               includes="com/sumologic/kinesis/*.java, com/sumologic/kinesis/utils/*.java,
+                         com/sumologic/client/*.java, com/sumologic/client/implementations/*.java"/>
+        <java classname="com.sumologic.client.SumologicExecutor" classpathref="sumologic.classpath" fork="true" />
 	</target>
 
     <target name="run">

src/main/java/com/mcplusa/sumologic/CloudWatchMessageModelSumologicTransformer.java → 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;

src/main/java/com/mcplusa/sumologic/DefaultKinesisMessageModelSumologicTransformer.java → 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;

src/main/java/com/mcplusa/sumologic/KinesisConnectorForSumologicConfiguration.java → src/main/java/com/sumologic/client/KinesisConnectorForSumologicConfiguration.java

@@ -1,4 +1,4 @@
-package com.mcplusa.sumologic;
+package com.sumologic.client;
 
 import java.util.Properties;
 

src/main/java/com/mcplusa/sumologic/SimpleKinesisMessageModel.java → src/main/java/com/sumologic/client/SimpleKinesisMessageModel.java

@@ -1,4 +1,4 @@
-package com.mcplusa.sumologic;
+package com.sumologic.client;
 
 import java.io.Serializable;
 

src/main/java/com/mcplusa/sumologic/SumologicExecutor.java → 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<SimpleKinesisMessageModel, String> {
 

src/main/java/com/mcplusa/sumologic/SumologicMessageModelPipeline.java → 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<SimpleKinesisMessageModel> 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 {

src/main/java/com/mcplusa/sumologic/SumologicSender.java → 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;

src/main/java/com/mcplusa/sumologic/implementations/SumologicEmitter.java → 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;

src/main/java/com/mcplusa/sumologic/implementations/SumologicTransformer.java → 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;
 

src/main/java/com/mcplusa/kinesis/BatchedStreamSource.java → 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;

src/main/java/com/mcplusa/kinesis/KinesisConnectorExecutor.java → 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;

src/main/java/com/mcplusa/kinesis/KinesisConnectorExecutorBase.java → 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;

src/main/java/com/mcplusa/kinesis/KinesisConnectorMetricsExecutor.java → 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;

src/main/java/com/mcplusa/kinesis/StreamSource.java → 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;

src/main/java/com/mcplusa/kinesis/utils/KinesisUtils.java → 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;
 

src/test/java/com/mcplusa/sumologic/CloudWatchMessageModelSumologicTransformerTest.java → 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;

src/test/java/com/mcplusa/sumologic/SumologicSenderTest.java → 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 {
 

src/test/java/com/mcplusa/sumologic/implementations/SumologicEmitterTest.java → 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 {