diff --git a/.gitignore b/.gitignore
index 6b302d16..ff808e6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@ apps*
!apps/manage
classes/*
db*
+dist
+docs
launcher.jar
lib/helma*.jar
lib/ext
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 00000000..430d7c6d
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,34 @@
+apply plugin: 'java'
+defaultTasks 'main'
+
+ant.importBuild 'build.xml'
+
+repositories {
+ jcenter()
+}
+
+dependencies {
+ // Potential replacement for apache-dom
+ //compile group: 'xerces', name: 'xercesImpl', version: '2.11.0'
+ compile group: 'commons-codec', name: 'commons-codec', version: '1.10'
+ compile group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.2'
+ compile group: 'commons-logging', name: 'commons-logging', version: '1.2'
+ compile group: 'commons-net', name: 'commons-net', version: '3.5'
+ compile group: 'javax.servlet', name: 'javax.servlet-api', version:'3.1.0'
+ compile group: 'org.eclipse.jetty', name: 'jetty-ajp', version: '8.1.22.v20160922'
+ compile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.1.22.v20160922'
+ compile group: 'org.eclipse.jetty', name: 'jetty-xml', version: '8.1.22.v20160922'
+ compile group: 'javax.mail', name: 'mail', version: '1.4.7'
+ compile group: 'org.mozilla', name: 'rhino', version: '1.7R5'
+ compile group: 'org.ccil.cowan.tagsoup', name: 'tagsoup', version: '1.2.1'
+ compile group: 'xmlrpc', name: 'xmlrpc', version: '2.0.1'
+}
+
+task deps(type: Copy) {
+ from configurations.compile
+ into 'lib/'
+}
+
+task main(dependsOn: 'mkjar') {
+
+}
diff --git a/build.xml b/build.xml
index fd428491..394c28d5 100644
--- a/build.xml
+++ b/build.xml
@@ -62,7 +62,7 @@
-
+
@@ -71,7 +71,7 @@
-
+
@@ -118,7 +118,7 @@
-
+
@@ -199,7 +199,7 @@
-
+
@@ -284,7 +284,7 @@
-
+
@@ -470,7 +470,7 @@
-
+
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..51288f9c
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..7a1adaa9
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sun Dec 04 13:10:15 CET 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 00000000..4453ccea
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+## 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
+
+# Escape application args
+save ( ) {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# 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" "$@"
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/lib/activation-1.1.jar b/lib/activation-1.1.jar
new file mode 100644
index 00000000..53f82a1c
Binary files /dev/null and b/lib/activation-1.1.jar differ
diff --git a/lib/activation.jar b/lib/activation.jar
deleted file mode 100644
index 589b6749..00000000
Binary files a/lib/activation.jar and /dev/null differ
diff --git a/lib/commons-codec-1.10.jar b/lib/commons-codec-1.10.jar
new file mode 100644
index 00000000..1d7417c4
Binary files /dev/null and b/lib/commons-codec-1.10.jar differ
diff --git a/lib/commons-codec.jar b/lib/commons-codec.jar
deleted file mode 100644
index 9ff33b6d..00000000
Binary files a/lib/commons-codec.jar and /dev/null differ
diff --git a/lib/commons-fileupload-1.3.2.jar b/lib/commons-fileupload-1.3.2.jar
new file mode 100644
index 00000000..4975590e
Binary files /dev/null and b/lib/commons-fileupload-1.3.2.jar differ
diff --git a/lib/commons-fileupload.jar b/lib/commons-fileupload.jar
deleted file mode 100644
index 12539f5e..00000000
Binary files a/lib/commons-fileupload.jar and /dev/null differ
diff --git a/lib/commons-io-2.2.jar b/lib/commons-io-2.2.jar
new file mode 100644
index 00000000..84ca5658
Binary files /dev/null and b/lib/commons-io-2.2.jar differ
diff --git a/lib/commons-io.jar b/lib/commons-io.jar
deleted file mode 100644
index 7affdefc..00000000
Binary files a/lib/commons-io.jar and /dev/null differ
diff --git a/lib/commons-logging-1.2.jar b/lib/commons-logging-1.2.jar
new file mode 100644
index 00000000..93a3b9f6
Binary files /dev/null and b/lib/commons-logging-1.2.jar differ
diff --git a/lib/commons-logging.jar b/lib/commons-logging.jar
deleted file mode 100644
index 2ff9bbd9..00000000
Binary files a/lib/commons-logging.jar and /dev/null differ
diff --git a/lib/commons-net-3.5.jar b/lib/commons-net-3.5.jar
new file mode 100644
index 00000000..d50e36ff
Binary files /dev/null and b/lib/commons-net-3.5.jar differ
diff --git a/lib/commons-net.jar b/lib/commons-net.jar
deleted file mode 100644
index 9666a92c..00000000
Binary files a/lib/commons-net.jar and /dev/null differ
diff --git a/lib/javax.servlet-3.0.0.v201112011016.jar b/lib/javax.servlet-3.0.0.v201112011016.jar
new file mode 100644
index 00000000..b1354096
Binary files /dev/null and b/lib/javax.servlet-3.0.0.v201112011016.jar differ
diff --git a/lib/javax.servlet-api-3.1.0.jar b/lib/javax.servlet-api-3.1.0.jar
new file mode 100644
index 00000000..6b14c3d2
Binary files /dev/null and b/lib/javax.servlet-api-3.1.0.jar differ
diff --git a/lib/jetty-ajp-7.6.2.v20120308.jar b/lib/jetty-ajp-7.6.2.v20120308.jar
deleted file mode 100644
index 73e38cb0..00000000
Binary files a/lib/jetty-ajp-7.6.2.v20120308.jar and /dev/null differ
diff --git a/lib/jetty-ajp-8.1.22.v20160922.jar b/lib/jetty-ajp-8.1.22.v20160922.jar
new file mode 100644
index 00000000..bfc440ea
Binary files /dev/null and b/lib/jetty-ajp-8.1.22.v20160922.jar differ
diff --git a/lib/jetty-continuation-7.6.2.v20120308.jar b/lib/jetty-continuation-7.6.2.v20120308.jar
deleted file mode 100644
index 011708b7..00000000
Binary files a/lib/jetty-continuation-7.6.2.v20120308.jar and /dev/null differ
diff --git a/lib/jetty-continuation-8.1.22.v20160922.jar b/lib/jetty-continuation-8.1.22.v20160922.jar
new file mode 100644
index 00000000..e190402d
Binary files /dev/null and b/lib/jetty-continuation-8.1.22.v20160922.jar differ
diff --git a/lib/jetty-http-7.6.2.v20120308.jar b/lib/jetty-http-7.6.2.v20120308.jar
deleted file mode 100644
index 277712e4..00000000
Binary files a/lib/jetty-http-7.6.2.v20120308.jar and /dev/null differ
diff --git a/lib/jetty-http-8.1.22.v20160922.jar b/lib/jetty-http-8.1.22.v20160922.jar
new file mode 100644
index 00000000..819714f8
Binary files /dev/null and b/lib/jetty-http-8.1.22.v20160922.jar differ
diff --git a/lib/jetty-io-7.6.2.v20120308.jar b/lib/jetty-io-7.6.2.v20120308.jar
deleted file mode 100644
index c7e52918..00000000
Binary files a/lib/jetty-io-7.6.2.v20120308.jar and /dev/null differ
diff --git a/lib/jetty-io-8.1.22.v20160922.jar b/lib/jetty-io-8.1.22.v20160922.jar
new file mode 100644
index 00000000..9df3bfae
Binary files /dev/null and b/lib/jetty-io-8.1.22.v20160922.jar differ
diff --git a/lib/jetty-security-7.6.2.v20120308.jar b/lib/jetty-security-7.6.2.v20120308.jar
deleted file mode 100644
index 12a71937..00000000
Binary files a/lib/jetty-security-7.6.2.v20120308.jar and /dev/null differ
diff --git a/lib/jetty-security-8.1.22.v20160922.jar b/lib/jetty-security-8.1.22.v20160922.jar
new file mode 100644
index 00000000..1692abd8
Binary files /dev/null and b/lib/jetty-security-8.1.22.v20160922.jar differ
diff --git a/lib/jetty-server-7.6.2.v20120308.jar b/lib/jetty-server-7.6.2.v20120308.jar
deleted file mode 100644
index 4ed92ef6..00000000
Binary files a/lib/jetty-server-7.6.2.v20120308.jar and /dev/null differ
diff --git a/lib/jetty-server-8.1.22.v20160922.jar b/lib/jetty-server-8.1.22.v20160922.jar
new file mode 100644
index 00000000..c875d4fc
Binary files /dev/null and b/lib/jetty-server-8.1.22.v20160922.jar differ
diff --git a/lib/jetty-servlet-7.6.2.v20120308.jar b/lib/jetty-servlet-7.6.2.v20120308.jar
deleted file mode 100644
index 93edeadc..00000000
Binary files a/lib/jetty-servlet-7.6.2.v20120308.jar and /dev/null differ
diff --git a/lib/jetty-servlet-8.1.22.v20160922.jar b/lib/jetty-servlet-8.1.22.v20160922.jar
new file mode 100644
index 00000000..e624ce9f
Binary files /dev/null and b/lib/jetty-servlet-8.1.22.v20160922.jar differ
diff --git a/lib/jetty-util-7.6.2.v20120308.jar b/lib/jetty-util-7.6.2.v20120308.jar
deleted file mode 100644
index 61407b83..00000000
Binary files a/lib/jetty-util-7.6.2.v20120308.jar and /dev/null differ
diff --git a/lib/jetty-util-8.1.22.v20160922.jar b/lib/jetty-util-8.1.22.v20160922.jar
new file mode 100644
index 00000000..4a28db96
Binary files /dev/null and b/lib/jetty-util-8.1.22.v20160922.jar differ
diff --git a/lib/jetty-xml-7.6.2.v20120308.jar b/lib/jetty-xml-7.6.2.v20120308.jar
deleted file mode 100644
index e489ad9f..00000000
Binary files a/lib/jetty-xml-7.6.2.v20120308.jar and /dev/null differ
diff --git a/lib/jetty-xml-8.1.22.v20160922.jar b/lib/jetty-xml-8.1.22.v20160922.jar
new file mode 100644
index 00000000..ec605ae8
Binary files /dev/null and b/lib/jetty-xml-8.1.22.v20160922.jar differ
diff --git a/lib/mail-1.4.7.jar b/lib/mail-1.4.7.jar
new file mode 100644
index 00000000..236fcdb6
Binary files /dev/null and b/lib/mail-1.4.7.jar differ
diff --git a/lib/mail.jar b/lib/mail.jar
deleted file mode 100644
index e6f70832..00000000
Binary files a/lib/mail.jar and /dev/null differ
diff --git a/lib/rhino-1.7R5.jar b/lib/rhino-1.7R5.jar
new file mode 100644
index 00000000..76b6eaed
Binary files /dev/null and b/lib/rhino-1.7R5.jar differ
diff --git a/lib/rhino.jar b/lib/rhino.jar
deleted file mode 100644
index e22b8885..00000000
Binary files a/lib/rhino.jar and /dev/null differ
diff --git a/lib/servlet-api-2.5.jar b/lib/servlet-api-2.5.jar
deleted file mode 100644
index 681a0687..00000000
Binary files a/lib/servlet-api-2.5.jar and /dev/null differ
diff --git a/lib/tagsoup-1.2.1.jar b/lib/tagsoup-1.2.1.jar
new file mode 100644
index 00000000..27516019
Binary files /dev/null and b/lib/tagsoup-1.2.1.jar differ
diff --git a/lib/tagsoup.jar b/lib/tagsoup.jar
deleted file mode 100644
index d3d9597a..00000000
Binary files a/lib/tagsoup.jar and /dev/null differ
diff --git a/lib/xmlrpc.jar b/lib/xmlrpc-2.0.1.jar
similarity index 97%
rename from lib/xmlrpc.jar
rename to lib/xmlrpc-2.0.1.jar
index 2d528aa2..47b46375 100644
Binary files a/lib/xmlrpc.jar and b/lib/xmlrpc-2.0.1.jar differ