diff --git a/.gitignore b/.gitignore
index 162f781c..bcda0574 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,5 @@ build.number
/nbbuild.xml
/jars/
.idea/*
-*.iml
\ No newline at end of file
+*.iml
+.gradle
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index a5e55f3a..6ff398c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,5 +7,6 @@ notifications:
email:
on_success: always
on_failure: always
+install: true
script:
- ./travis_checks.sh
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 00000000..25da2e94
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,244 @@
+
+// We want the standard java conventions for everything.
+apply plugin: 'java'
+// This is needed if want to publish artifacts
+apply plugin: 'maven-publish'
+
+// TODO: translate more tests, javadoc, revision, major, minor
+
+// For info on the gradle java plugin see https://docs.gradle.org/current/userguide/tutorial_java_projects.html
+
+sourceCompatibility = 1.8
+
+// Load our numbers from the build.properties files.
+Properties properties = new Properties()
+properties.load(project.file('build.properties').newDataInputStream())
+def gigapaxosBuildMajorNumber = properties.getProperty('build.major.number')
+def gigapaxosBuildMinorNumber = properties.getProperty('build.minor.number')
+def gigapaxosBuildRevisionNumber = properties.getProperty('build.revision.number')
+def gigapaxosBuildVersion = "${gigapaxosBuildMajorNumber}.${gigapaxosBuildMinorNumber}.${gigapaxosBuildRevisionNumber}"
+def nioBuildMajorNumber = properties.getProperty('nio.build.major.number')
+def nioBuildMinorNumber = properties.getProperty('nio.build.minor.number')
+def nioBuildRevisionNumber = properties.getProperty('nio.build.revision.number')
+def nioBuildVersion = "${nioBuildMajorNumber}.${nioBuildMinorNumber}.${nioBuildRevisionNumber}"
+
+
+// Change the locations of the srcs - gradle jar plugin has different standard locations
+sourceSets {
+ main {
+ java {
+ srcDir 'src'
+ }
+ }
+ test {
+ java {
+ srcDir 'src'
+ }
+ }
+}
+
+// Define where we get our libs from
+repositories {
+ mavenLocal() // Local things end up in ~/.m2/repository
+ mavenCentral()
+}
+
+dependencies {
+
+ compile group: 'com.mchange', name: 'c3p0', version: '0.9.5'
+ compile group: 'org.apache.derby', name: 'derby', version: '10.11.1.1'
+ compile group: 'redis.clients', name: 'jedis', version: '2.8.1'
+ compile group: 'net.minidev', name: 'json-smart', version: '1.2'
+ compile group: 'org.mapdb', name: 'mapdb', version: '2.0-beta13'
+ compile group: 'com.mchange', name: 'mchange-commons-java', version: '0.2.9'
+ compile group: 'org.msgpack', name: 'msgpack-core', version: '0.8.8'
+ compile group: 'io.netty', name: 'netty-all', version: '4.1.4.Final'
+ // Using a newer version of zookeeper because of problems with the log4j dependency
+ compile group: 'org.apache.zookeeper', name: 'zookeeper', version: '3.4.9'
+
+ // Use these jars for unit testing
+ compile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3'
+ compile group: 'junit', name: 'junit', version: '4.12'
+}
+
+// Updates the build.number. Used below whenever a jar is created.
+task incrementBuildNumber {
+ ant.buildnumber(file: 'build.number')
+}
+
+// Redefine the default jar task to produce our 3 jars
+task jar(type: Jar, overwrite: true,
+ // Note that we enforce an explicit ordering for these below with
+ // "createJars.mustRunAfter incrementBuildNumber"
+ dependsOn: ['incrementBuildNumber', 'createJars']) {
+}
+
+// Note that copying the jars to the 'jars' folder will probably go away once we're fully integrated
+task createJars(type: Jar,
+ dependsOn: ['copyGigapaxosFatJar', 'copyNioFatJar', 'copyGigapaxosNioSrcJar']) {
+}
+
+createJars.mustRunAfter incrementBuildNumber
+
+// Builds a fat jar for the gigapaxos with all jars included.
+task gigapaxosFatJar(type: Jar, dependsOn: [':compileJava', ':processResources']) {
+ baseName = 'gigapaxos'
+ version = gigapaxosBuildVersion
+ // All the source classes
+ from files(sourceSets.main.output.classesDir)
+ // All the libs
+ from configurations.runtime.asFileTree.files.collect {
+ zipTree(it)
+ }
+ // Handle the build number info
+ Properties props = new Properties()
+ props.load(project.file('build.number').newDataInputStream())
+ def buildNumber = props.getProperty('build.number')
+ def fullVersion = "${gigapaxosBuildVersion}_${buildNumber}"
+
+ manifest {
+ attributes 'Built-By': System.getProperty('user.name'),
+ 'Built-Date': new Date(),
+ 'Build-Version': "${fullVersion}",
+ 'Class-Path': '.',
+ 'Implementation-Vendor': 'University of Massachusetts',
+ 'Implementation-Title': 'GigaPaxos',
+ 'Implementation-Version': "$gigapaxosBuildVersion"
+ }
+}
+
+task copyGigapaxosFatJar(type: Copy) {
+ from gigapaxosFatJar
+ into 'jars'
+}
+
+// Builds a fat jar for the nio with all jars included.
+task nioFatJar(type: Jar, dependsOn: [':compileJava', ':processResources']) {
+ baseName = 'nio'
+ version = nioBuildVersion
+ // All the nio source classes
+ from files(sourceSets.main.output.classesDir) {
+ include 'edu/umass/cs/nio/**'
+ include 'edu/umass/cs/utils*'
+ include 'org/json/*'
+ // Copied from build.xml, but maybe not needed now.
+ // Interesting special cases here added because of one use of ReconfigurableClient in NIOInstrumenter
+ //include 'edu/umass/cs/reconfiguration/**'
+ //include 'edu/umass/cs/gigapaxos/**'
+ //include 'edu/umass/cs/protocoltask/**'
+ }
+ // All the libs
+ from configurations.runtime.asFileTree.files.collect {
+ zipTree(it)
+ }
+ // Handle the build number info
+ Properties props = new Properties()
+ props.load(project.file('build.number').newDataInputStream())
+ def buildNumber = props.getProperty('build.number')
+ def fullVersion = "${nioBuildVersion}_${buildNumber}"
+
+ manifest {
+ attributes 'Built-By': System.getProperty('user.name'),
+ 'Built-Date': new Date(),
+ 'Build-Version': "${fullVersion}",
+ 'Implementation-Vendor': 'University of Massachusetts',
+ 'Implementation-Title': 'NIO',
+ 'Implementation-Version': "$nioBuildVersion"
+ }
+}
+
+task copyNioFatJar(type: Copy) {
+ from nioFatJar
+ into 'jars'
+}
+
+// Builds a fat jar for the nio with all jars included.
+task gigapaxosNioSrcJar(type: Jar, dependsOn: [':compileJava', ':processResources']) {
+ baseName = 'gigapaxos-nio-src'
+ version = gigapaxosBuildVersion
+ // all the source jars
+ from files(sourceSets.main.java.srcDirs)
+}
+
+task copyGigapaxosNioSrcJar(type: Copy) {
+ from gigapaxosNioSrcJar
+ into 'jars'
+}
+
+// Add to the clean task to remove the jars and dist directory
+clean.doLast {
+ file('jars').deleteDir()
+ file('dist').deleteDir()
+}
+
+artifacts {
+ archives gigapaxosFatJar, nioFatJar, gigapaxosNioSrcJar
+}
+
+publishing {
+ publications {
+ gigapaxos(MavenPublication) {
+ groupId 'edu.umass.cs'
+ artifactId 'gigapaxos'
+ version "$gigapaxosBuildVersion"
+
+ artifact gigapaxosFatJar
+ }
+ nio(MavenPublication) {
+ groupId 'edu.umass.cs'
+ artifactId 'nio'
+ version "$nioBuildVersion"
+
+ artifact nioFatJar
+ }
+ gigapaxosNioSrc(MavenPublication) {
+ groupId 'edu.umass.cs'
+ artifactId 'gigapaxos-nio-src'
+ version "$gigapaxosBuildVersion"
+
+ artifact gigapaxosNioSrcJar
+ }
+ }
+}
+
+test {
+ jvmArgs '-ea'
+ jvmArgs '-Djava.util.logging.config.file=logging.properties'
+ jvmArgs '-Djavax.net.ssl.trustStorePassword=qwerty'
+ jvmArgs '-Djavax.net.ssl.trustStore=conf/keyStore/node100.jks'
+ jvmArgs '-Djavax.net.ssl.keyStorePassword=qwerty'
+ jvmArgs '-Djavax.net.ssl.keyStore=conf/keyStore/node100.jks'
+ // Always run the tests - otherwise default is only runs when something changes
+ outputs.upToDateWhen { false }
+ filter {
+ includeTestsMatching 'edu.umass.cs.reconfiguration.testing.TESTReconfigurationClient'
+ }
+ // The rest of this below isn't necessary, it just changes the output
+ testLogging {
+ // Set options for log level LIFECYCLE
+ events "passed", "skipped", "failed", "standardOut"
+ showExceptions true
+ exceptionFormat "full"
+ showCauses true
+ showStackTraces true
+
+ // Set options for log level DEBUG and INFO
+ debug {
+ events "started", "passed", "skipped", "failed", "standardOut", "standardError"
+ exceptionFormat "full"
+ }
+ info.events = debug.events
+ info.exceptionFormat = debug.exceptionFormat
+ beforeTest { descriptor ->
+ logger.lifecycle("Running test: $descriptor")
+ }
+ afterSuite { desc, result ->
+ if (!desc.parent) { // will match the outermost suite
+ def output = "Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} successes, ${result.failedTestCount} failures, ${result.skippedTestCount} skipped)"
+ def startItem = '| ', endItem = ' |'
+ def repeatLength = startItem.length() + output.length() + endItem.length()
+ println('\n' + ('-' * repeatLength) + '\n' + startItem + output + endItem + '\n' + ('-' * repeatLength))
+ }
+ }
+ }
+}
diff --git a/build.xml b/build.xml
index c87e170a..2f01c933 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,6 @@
-
@@ -139,6 +138,7 @@ destfile="${build.jar.dir}/gigapaxos-${build.major.number}.${build.minor.number}
+
@@ -152,7 +152,6 @@ destfile="${build.jar.dir}/gigapaxos-${build.major.number}.${build.minor.number}
-
@@ -345,34 +344,23 @@ value="${build.major.number}.${build.minor.number}.${build.revision.number}_buil
-
+
-
+
-
-
+
+
-
-
-
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..6ffa2378
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..e180c397
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Apr 05 16:17:00 EDT 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 00000000..9aa616c2
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,169 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 00000000..e95643d6
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/travis_checks.sh b/travis_checks.sh
index feb9e114..a38bbc55 100755
--- a/travis_checks.sh
+++ b/travis_checks.sh
@@ -2,8 +2,14 @@
test_repeat=10
-ant
+# We use ./gradlew (the gradle wrapper) because travis is using an ancient version of gradle.
+# For info on the gradle wrapper see https://docs.gradle.org/current/userguide/gradle_wrapper.html
+# Do a complete build and generate jars
+# ant
+./gradlew jar
+
+# was ant test || { echo "Test $i failed, exiting.." ; exit 1; }
for ((i=0; i<$test_repeat; i++)); do
- ant test || { echo "Test $i failed, exiting.." ; exit 1; }
+ ./gradlew test || { echo "Test $i failed, exiting.." ; exit 1; }
done