Moving over dispatcher to gradle

Signed-off-by: Fatih Ulusoy <ulusoy@de.ibm.com>

core/dispatcher/.gitignore

@@ -1,2 +1,3 @@
 /bin/
+/build/
 .cache-main

core/dispatcher/Dockerfile

@@ -5,10 +5,8 @@ FROM whisk/scala
 RUN wget -O /usr/bin/docker "https://get.docker.com/builds/Linux/x86_64/docker-1.9.0" && \
 chmod +x /usr/bin/docker
 
-EXPOSE 8080
-
-# Copy app jars
-COPY dispatcher.jar dispatcher-libs.tar startDispatcher.sh ./
-RUN tar xf dispatcher-libs.tar && rm dispatcher-libs.tar && \
-chmod +x startDispatcher.sh
+COPY build/distributions/dispatcher.tar ./
+RUN tar xf dispatcher.tar
+CMD dispatcher/bin/dispatcher
 
+EXPOSE 8080

core/dispatcher/build.gradle

@@ -0,0 +1,29 @@
+apply plugin: 'scala'
+
+sourceSets {
+    main {
+        scala {
+            srcDirs = ['src/']
+        }
+        resources {
+            srcDirs = ['src/']
+        }
+    }
+}
+
+dependencies {
+    compile project(':common:scala')
+}
+
+task distDocker(dependsOn:distTar, type:Exec) {
+    commandLine 'docker', 'build', '-t', 'whisk/' + project.name, '.'
+}
+
+mainClassName = "whisk.core.dispatcher.Dispatcher"
+startScripts {
+    doLast {
+        def lines = unixScript.readLines()
+        lines[lines.size()-1] = lines.last() + ' >> /logs/$1_logs.log 2>&1'
+        unixScript.text = lines.join("\n")
+    }
+}

core/dispatcher/build.xml

@@ -3,7 +3,6 @@
 <!-- targets in this file should be called from the parent directory -->
 <project basedir="../..">
     <import file="../../docker.xml" />
-    <import file="../../common/build.xml" />
 
     <!-- build the docker image for the dispatcher service -->
     <target name="compileDispatcher" depends="initScala">
@@ -119,7 +118,7 @@
             <arg line="${consul.service.check}" />
             <arg line="-v ${whisk.logs.dir}/activator:/logs" />
             <arg line="-h activator_${main.docker.endpoint}" />
-            <arg line="-d --name activator ${docker.registry}whisk/dispatcher:${docker.image.tag} /startDispatcher.sh activator" />
+            <arg line="-d --name activator ${docker.registry}whisk/dispatcher:${docker.image.tag} /dispatcher/bin/dispatcher activator" />
         </exec>
     </target>