SUMOK-7 Modified setup for dependencies

Author: Juan Pablo Diaz-Vaz

build.xml

@@ -13,8 +13,6 @@
         <fileset dir="${external.dir}" includes="**/*.jar" />
         <pathelement location="${basedir}/build" />
         <pathelement location="." />
-        <pathelement location="${basedir}/samples" />
-        <pathelement location="${basedir}/samples/sumologic" />
     </path>
 
     <target name="clean">
@@ -26,28 +24,92 @@
     </target>
 
     <target name="download">
-        <mkdir dir="${external.dir}/lib" />
+        <mkdir dir="${external.dir}/lib"/>
+        
         <get src= "http://central.maven.org/maven2/com/amazonaws/amazon-kinesis-client/1.4.0/amazon-kinesis-client-1.4.0.jar" dest="${external.dir}/lib" usetimestamp="true" verbose="true"/>
+        <get src= "http://central.maven.org/maven2/com/amazonaws/amazon-kinesis-connectors/1.2.0/amazon-kinesis-connectors-1.2.0.jar" dest="${external.dir}/lib" usetimestamp="true" verbose="true"/>
         <get src= "http://central.maven.org/maven2/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar" dest="${external.dir}/lib" usetimestamp="true" verbose="true"/>
         <get src= "http://central.maven.org/maven2/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" dest="${external.dir}/lib" usetimestamp="true" verbose="true"/>
-        <get src= "http://central.maven.org/maven2/org/elasticsearch/elasticsearch/1.2.1/elasticsearch-1.2.1.jar" dest="${external.dir}/lib" usetimestamp="true" verbose="true"/>
         <get src= "http://central.maven.org/maven2/org/apache/lucene/lucene-core/4.8.1/lucene-core-4.8.1.jar" dest="${external.dir}/lib" usetimestamp="true" verbose="true"/>
-        <get src= "http://sdk-for-java.amazonwebservices.com/latest/aws-java-sdk.zip" dest="${src.dir}" usetimestamp="true" verbose="true" />
-	</target>
+        
+        <get src= "https://hamcrest.googlecode.com/files/hamcrest-core-1.3.jar" dest="${external.dir}/lib" usetimestamp="true" verbose="true"/>
+        
+        <get src= "http://sdk-for-java.amazonwebservices.com/latest/aws-java-sdk.zip" dest="${external.dir}" usetimestamp="true" verbose="true" />
+    </target>
+    
+    <target name="download-test">
+        <mkdir dir="${external.dir}/test"/>
+        
+        <get src= "http://central.maven.org/maven2/junit/junit/4.12/junit-4.12.jar" dest="${external.dir}/test" usetimestamp="true" verbose="true" />
+        <get src= "http://central.maven.org/maven2/org/mortbay/jetty/jetty/6.1.26/jetty-6.1.26.jar" dest="${external.dir}/test" usetimestamp="true" verbose="true" />
+        <get src= "http://central.maven.org/maven2/org/mortbay/jetty/jetty-util/6.1.26/jetty-util-6.1.26.jar" dest="${external.dir}/test" usetimestamp="true" verbose="true" />
+        <get src= "http://central.maven.org/maven2/com/google/guava/guava/18.0/guava-18.0.jar" dest="${external.dir}/test" usetimestamp="true" verbose="true" />
+        <get src= "http://central.maven.org/maven2/ch/qos/logback/logback-core/1.1.3/logback-core-1.1.3.jar" dest="${external.dir}/test" usetimestamp="true" verbose="true" />
+        <get src= "http://central.maven.org/maven2/com/jayway/jsonpath/json-path/2.0.0/json-path-2.0.0.jar" dest="${external.dir}/test" usetimestamp="true" verbose="true" />
+        <get src= "http://central.maven.org/maven2/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-4.9.jar" dest="${external.dir}/test" usetimestamp="true" verbose="true" />
+        <get src= "http://central.maven.org/maven2/xmlunit/xmlunit/1.6/xmlunit-1.6.jar" dest="${external.dir}/test" usetimestamp="true" verbose="true" />
+        <get src= "http://central.maven.org/maven2/org/skyscreamer/jsonassert/1.2.3/jsonassert-1.2.3.jar" dest="${external.dir}/test" usetimestamp="true" verbose="true" />
+        <get src= "http://central.maven.org/maven2/org/slf4j/slf4j-api/1.7.12/slf4j-api-1.7.12.jar" dest="${external.dir}/test" usetimestamp="true" verbose="true" />
+        <get src= "http://central.maven.org/maven2/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar" dest="${external.dir}/test" usetimestamp="true" verbose="true" />
+        <get src= "http://central.maven.org/maven2/org/slf4j/slf4j-simple/1.7.12/slf4j-simple-1.7.12.jar" dest="${external.dir}/test" usetimestamp="true" verbose="true" />
+        <get src= "http://central.maven.org/maven2/com/github/tomakehurst/wiremock/1.56/wiremock-1.56.jar" dest="${external.dir}/test" usetimestamp="true" verbose="true" />
+    </target>
 
-	<target name="unzip">
-        <unzip src= "${src.dir}/aws-java-sdk.zip" dest="${src.dir}" />
-        <delete file= "${src.dir}/aws-java-sdk.zip" />
+    <target name="unzip">
+        <unzip src= "${external.dir}/aws-java-sdk.zip" dest="${external.dir}" />
+        <delete file= "${external.dir}/aws-java-sdk.zip" />
     </target>
 
     <target name="setup">
         <antcall target="download"/>
         <antcall target="unzip"/>
     </target>
-
-    <target name="run">
+    
+    <target name="setup-tests">
+        <antcall target="download-test"/>
+    </target>
+    
+    <target name="test">
+        <mkdir dir="${basedir}/build"/>
+        <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"/>
+        <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"/>
+        <junit haltonfailure="yes" 
+               showoutput="yes" 
+               fork="yes" 
+               errorProperty="test.failed"
+               failureProperty="test.failed">
+            <classpath refid="sumologic.classpath"/>            
+            <formatter
+                type="brief"
+                usefile="false"/>
+            
+            <batchtest fork="yes" todir="${reports.tests}">
+                <fileset dir="${src.dir}/test/java">
+                    <include name="**/*Test*.java"/>
+                </fileset>
+            </batchtest>
+        </junit>
+    </target>
+    
+    <target name="main">
         <mkdir dir="${basedir}/build"/>
-        <javac srcdir="${src.dir}/" destdir="${basedir}/build" classpathref="sumologic.classpath" />
+        <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"/>
         <java classname="com.mcplusa.sumologic.SumologicExecutor" classpathref="sumologic.classpath" fork="true" />
     </target>
+
+    <target name="run">
+        <antcall target="main"/>
+    </target>
 </project>