Migrate build tasks to gradle

.gitignore

@@ -13,3 +13,4 @@ nginx.conf
 /config/custom-config.xml
 cloudant-local.env
 results
+.gradle

build.xml

@@ -1,14 +1,9 @@
-<!-- vim: set expandtab ts=4 sw=4 : -->
 <project>
     <import file="config/config.xml" />
-    <import file="common/build.xml" />
 
     <!-- clean temporary build files created by build script -->
     <target name="dust">
         <exec executable="/bin/date" />
-        <delete dir="${docker.scratch}" />
-        <delete dir="${build.dir}" />
-        <delete dir="results" />
         <delete dir="logs" />
         <delete failonerror="false">
             <fileset dir="." includes="**/*.pyc" />
@@ -17,16 +12,6 @@
         </delete>
     </target>
 
-    <!-- clean all bin directories also out of paranoia; no bin directory outside of the ${build.dir} is created by the build script -->
-    <!-- if you develop with eclipse you should not call this target; if you do, refresh your eclipse workspace to rebuild. -->
-    <target name="scrub" depends="dust">
-        <delete dir="tests/bin" />
-        <delete dir="core/controller/bin" />
-        <delete dir="core/dispatcher/bin" />
-        <delete dir="core/loadBalancer/bin" />
-        <delete dir="common/scala/bin" />
-    </target>
-
     <!-- scan the code base, checking some conventions that are enforced -->
     <target name="scanCode">
         <exec executable="/bin/bash" failonerror="true">
@@ -38,20 +23,14 @@
     <target name="clean" depends="dust,teardown">
     </target>
 
-    <!-- compile and build images and tests -->
+    <!-- compile and build images -->
     <target name="build" depends="writePropertyFile">
-        <parallel threadCount="${buildthreads}" failonany="true">
-            <ant target="scanCode" />
-            <ant antfile="common/build.xml" target="build" />
-        </parallel>
-        <parallel threadCount="${buildthreads}" failonany="true">
-            <ant antfile="services/build.xml" target="build" />
-            <ant antfile="core/build.xml" target="build" />
-        </parallel>
+        <var file="whisk.properties" />
+        <ant target="scanCode" />
+        <exec executable="./gradlew" failonerror="true">
+            <arg value="distDocker" />
+        </exec>
         <ant antfile="${openwhisk.dir}/services/nginx/build.xml" target="buildProxy" />
-        <ant antfile="tests/build.xml" target="build" />
-        <ant antfile="tools/cli/build.xml" target="buildCLI" />
-        <antcall target="createTrustStore" />
     </target>
 
     <!-- run unit tests-->
@@ -65,18 +44,13 @@
         <ant antfile="${openwhisk.dir}/services/nginx/build.xml" target="startProxy" />
         <ant antfile="services/build.xml" target="deploy" />
         <ant antfile="core/build.xml" target="deploy" />
+        <ant antfile="tools/cli/build.xml" target="buildCLI" />
         <antcall target="installCatalog" />
     </target>
 
     <!-- teardown and deploy all services -->
     <target name="redeploy" depends="teardown,deploy" />
 
-    <!-- push containers -->
-    <target name="push" depends="writePropertyFile">
-        <ant antfile="services/build.xml" target="push" />
-        <ant antfile="core/build.xml" target="push" />
-    </target>
-
     <target name="teardownLocal">
         <exec executable="/bin/bash">
             <arg value="tools/docker/cleanDocker.sh" />
@@ -123,17 +97,6 @@
         </exec>
     </target>
 
-    <!-- Create a trust store for use during testing -->
-    <target name="createTrustStore">
-        <var file="whisk.properties" />
-        <delete file="${build.dir}/tests/keystore" quiet="true" />
-        <exec executable="keytool" failonerror="true">
-            <arg line="-import -alias Whisk -noprompt -trustcacerts" />
-            <arg line="-file ${whisk.ssl.cert}" />
-            <arg line="-keystore ${build.dir}/tests/keystore -storepass '${whisk.ssl.challenge}'" />
-        </exec>
-    </target>
-
     <!-- fetch the docker logs from all local containers to ./logs on this host -->
     <target name="copyOutLogs">
         <var file="whisk.properties" />

common/scala/.gitignore

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

common/scala/build.gradle

@@ -0,0 +1,47 @@
+apply plugin: 'scala'
+
+repositories {
+    mavenCentral()
+}
+
+sourceSets {
+    main {
+        scala {
+            srcDirs = ['src/']
+        }
+        resources {
+            srcDirs = ['src/']
+        }
+    }
+}
+
+dependencies {
+    compile 'org.scala-lang:scala-library:2.11.1'
+
+    compile 'io.spray:spray-caching_2.11:1.3.3'
+    compile 'io.spray:spray-json_2.11:1.3.2'
+    compile 'io.spray:spray-can_2.11:1.3.3'
+    compile 'io.spray:spray-client:1.3.1'
+    compile 'io.spray:spray-httpx_2.11:1.3.3'
+    compile 'io.spray:spray-io_2.11:1.3.3'
+    compile 'io.spray:spray-routing_2.11:1.3.3'
+
+    compile 'com.typesafe.akka:akka-actor_2.11:2.3.9'
+    compile 'com.typesafe.akka:akka-slf4j_2.11:2.3.9'
+
+    compile 'com.cloudant:cloudant-client:1.0.1'
+
+    compile 'log4j:log4j:1.2.16'
+    compile 'commons-codec:commons-codec:1.9'
+    compile 'commons-io:commons-io:2.4'
+    compile 'commons-logging:commons-logging:1.2'
+    compile 'org.apache.zookeeper:zookeeper:3.4.6'
+    compile 'org.apache.kafka:kafka-clients:0.9.0.0'
+    compile 'com.google.code.gson:gson:2.3.1'
+    compile 'org.apache.httpcomponents:httpclient:4.4.1'
+}
+
+def dockerImageName = project.name
+task distDocker(type:Exec) {
+    commandLine 'docker', 'build', '-t', 'whisk/' + dockerImageName, '.'
+}

core/build.xml

@@ -5,27 +5,6 @@
     <import file="../config/config.xml" />
     <import file="../docker.xml" />
 
-    <!-- build all components in the whisk core in parallel -->
-    <target name="build" >
-        <parallel threadCount="${buildthreads}" failonany="true">
-            <ant antfile="${openwhisk.dir}/core/nodejsAction/build.xml" target="buildNodeJsAction" />
-            <ant antfile="${openwhisk.dir}/core/swiftAction/build.xml" target="buildSwiftAction" />
-            <ant antfile="${openwhisk.dir}/core/loadBalancer/build.xml" target="buildLoadBalancer" />
-            <ant antfile="${openwhisk.dir}/core/dispatcher/build.xml" target="buildDispatcher" />
-            <ant antfile="${openwhisk.dir}/core/controller/build.xml" target="buildController" />
-        </parallel>
-    </target>
-
-    <target name="push" >
-        <parallel threadCount="${pushthreads}" failonany="true">
-            <ant antfile="${openwhisk.dir}/core/nodejsAction/build.xml" target="pushNodeJsAction" />
-            <ant antfile="${openwhisk.dir}/core/swiftAction/build.xml" target="pushSwiftAction" />
-            <ant antfile="${openwhisk.dir}/core/loadBalancer/build.xml" target="pushLoadBalancer" />
-            <ant antfile="${openwhisk.dir}/core/dispatcher/build.xml" target="pushDispatcher" />
-            <ant antfile="${openwhisk.dir}/core/controller/build.xml" target="pushController" />
-        </parallel>
-    </target>
-
     <!-- deploy all components in the whisk core in parallel -->
     <target name="deploy" >
         <parallel threadCount="${deploythreads}" failonany="true">

core/controller/.gitignore

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

core/controller/Dockerfile

@@ -11,9 +11,8 @@ Run wget https://github.com/swagger-api/swagger-ui/archive/v2.1.4.tar.gz && \
 
 #
 # Copy app jars
-COPY controller.jar controller-libs.tar startController.sh ./
-
-RUN tar xf controller-libs.tar && rm controller-libs.tar && \
-chmod +x startController.sh
+COPY build/distributions/controller.tar ./
+RUN tar xf controller.tar
+CMD controller/bin/controller
 
 EXPOSE 8080

core/controller/build.gradle

@@ -0,0 +1,47 @@
+apply plugin: 'scala'
+apply plugin: 'application'
+
+repositories {
+    mavenCentral()
+}
+
+sourceSets {
+    main {
+        scala {
+            srcDirs = ['src/']
+        }
+        resources {
+            srcDirs = ['src/']
+        }
+    }
+}
+
+dependencies {
+    compile project(':common:scala')
+}
+
+mainClassName = "whisk.core.controller.Controller"
+applicationDefaultJvmArgs = ["-Xmx2g"]
+startScripts {
+    doLast {
+        def lines = unixScript.readLines()
+        lines[lines.size()-1] = lines.last() + ' >> /logs/${COMPONENT_NAME}_logs.log 2>&1'
+        unixScript.text = lines.join("\n")
+    }
+}
+
+def dockerImageName = project.name
+def dockerRegistry =  project.hasProperty('dockerRegistry') ? dockerRegistry + '/' : ''
+def dockerImageTag = project.hasProperty('dockerImageTag') ? dockerImageTag : 'latest'
+
+task distDocker(dependsOn:[distTar, ':common:scala:distDocker'], type:Exec) {
+    commandLine 'docker', 'build', '-t', 'whisk/' + dockerImageName, '.'
+}
+task tagImage(type: Exec) {
+    commandLine 'docker', 'tag', '-f', 'whisk/' + dockerImageName, dockerRegistry + 'whisk/' + dockerImageName + ':' + dockerImageTag
+}
+task pushImage(dependsOn: tagImage, type:Exec) {
+    commandLine 'docker', 'push', dockerRegistry + 'whisk/' + dockerImageName + ':' + dockerImageTag
+}
+pushImage.onlyIf { dockerRegistry != '' }
+distDocker.finalizedBy pushImage