diff --git a/.gitignore b/.gitignore
index c38f6a7..3df8799 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,22 @@
-.classpath
+.DS_Store
.gradle
.idea
+.classpath
.project
.settings
-module.iml
+.yardoc
+.yardopts
bin
build
+target
out
+*.iml
+*.ipr
+*.iws
+test-output
+Scratch.java
+ScratchTest.java
+test-results
+test-tmp
+*.class
+mods
diff --git a/build.gradle b/build.gradle
index d9e20eb..ca36b69 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,107 +1,99 @@
+apply from: "gradle/vertx.gradle"
+
/*
- * Copyright 2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+Usage:
-apply plugin: 'java'
+./gradlew task_name
-defaultTasks = ['assemble']
+(or gradlew.bat task_name if you have the misfortune to have to use Windows)
-sourceCompatibility = '1.7'
-targetCompatibility = '1.7'
+If no task name is specified then the default task 'assemble' is run
-jar.enabled = false // We don't produce a jar
+Task names are:
-configurations {
- provided
-}
+idea - generate a skeleton IntelliJ IDEA project
-repositories {
- maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
- mavenCentral()
-}
+eclipse - generate a skeleton Eclipse IDE project
-dependencies {
- provided "org.vert-x:vertx-core:$vertxVersion"
- provided "org.vert-x:vertx-platform:$vertxVersion"
+assemble - builds the outputs, by default this is the module zip file. It can also include a jar file if produceJar
+ in gradle.properties is set to true. Outputs are created in build/libs.
+ if pullInDeps in gradle.properties is set to 'true' then the modules dependencies will be
+ automatically pulled into a nested mods directory inside the module during the build
- testCompile "org.vert-x:vertx-lang-java:$vertxVersion"
- testCompile "org.vert-x:vertx-lang-rhino:$vertxVersion"
- testCompile( "org.vert-x:vertx-testframework:$vertxVersion" ) {
- transitive = false
- }
- testCompile "org.mozilla:rhino:$rhinoVersion"
- testCompile "junit:junit:$junitVersion"
-}
+copyMod - builds and copies the module to the local 'mods' directory so you can execute vertx runmod (etc)
+ directly from the command line
-sourceSets {
- main {
- compileClasspath = compileClasspath + configurations.provided
- }
-}
+modZip - creates the module zip into build/libs
-task copyMod( type:Copy, dependsOn: 'classes' ) {
- into "build/mod/$modulename-v$version"
- from 'build/classes/main'
- from 'src/main/conf'
- into( 'lib' ) {
- from configurations.compile
- }
-}
+clean - cleans everything up
-// Package into build/libs/mod.zip
-task dist( type: Zip, dependsOn: 'copyMod' ) {
- group = 'vert.x'
- description = "Assembles a vert.x module in 'mod.zip' format"
- destinationDir = project.file('build/libs')
- archiveName = 'mod.zip'
- from project.file("build/mod")
-}
+test - runs the tests. An nice html test report is created in build/reports/tests (index.html)
+runMod - runs the module. This is similar to executing vertx runmod from the command line except that it does
+ not use the version of Vert.x installed and on the PATH to run it. Instead it uses the version of Vert.x
+ that the module was compiled and tested against.
-task prepareVertxTest(type: Sync, dependsOn: 'copyMod' ) {
- from 'build/mod'
- into 'build/tmp/mod-test'
-}
+pullInDeps - pulls in all dependencies of the module into a nested module directory
-test {
- // Can't have the app on the vert.x classpath
- classpath = files( classpath.findAll {
- !( it.toString() ==~ /.+build\/(classes|resources)\/main$/ )
- } )
+uploadArchives - upload the module zip file (and jar if one has been created) to Nexus. You will need to
+ configure sonatypeUsername and sonatypePassword in ~/.gradle/gradle.properties.
- // Some vert.x properties
- systemProperty 'vertx.test.timeout', 15
- systemProperty 'vertx.mods', "$projectDir/build/tmp/mod-test"
- systemProperty 'vertx.version', "$project.version"
+install - install any jars produced to the local Maven repository (.m2)
- // Show output
- testLogging.showStandardStreams = true
+ */
- // No idea why we need to depend on testClasses...
- dependsOn << [ 'testClasses', 'copyMod', 'prepareVertxTest' ]
+dependencies {
+ /*
+ Add your module jar dependencies here
+ E.g.
+ compile "com.foo:foo-lib:1.0.1" - for compile time deps - this will end up in your module too!
+ testCompile "com.foo:foo-lib:1.0.1" - for test time deps
+ provided "com.foo:foo-lib:1.0.1" - if you DON'T want it to be packaged in the module zip
+ */
+ compile "io.netty:netty:$nettyVersion"
}
+test {
+ /* Configure which tests are included
+ include 'org/foo/**'
+ exclude 'org/boo/**'
+ */
-task collectDeps(type: Copy) {
- group = 'vert.x'
- description = 'conveniently collect dependencies for other IDEs'
- destinationDir = file("build/deps")
- into("compile") {
- from configurations.compile
- }
- into("test") {
- from configurations.testCompile
+}
+
+/*
+If you're uploading stuff to Maven, Gradle needs to generate a POM.
+Please edit the details below.
+ */
+def configurePom(def pom) {
+ pom.project {
+ description 'Form Upload Module for Vert.x'
+ inceptionYear '2012'
+ packaging 'zip'
+ url 'https://github.com/vert-x/mod-form-upload'
+
+ developers {
+ developer {
+ id 'purplefox'
+ name 'Tim Fox'
+ // email 'developer email'
+ }
+ }
+
+ scm {
+ url 'https://github.com/vert-x/mod-form-upload.git'
+ }
+
+ licenses {
+ license {
+ name 'The Apache Software License, Version 2.0'
+ url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+ distribution 'repo'
+ }
+ }
+
+ properties {
+ setProperty('project.build.sourceEncoding', 'UTF8')
+ }
}
}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 400b633..207b7ab 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,10 @@
-modulename=vertx.formupload
-version=1.0
-gradleVersion=1.1
-vertxVersion=1.2.1.final
+# Set to true if you want module dependencies to be pulled in and nested inside the module itself
+pullInDeps=false
+# Set to true if you want the build to output a jar as well as a module zip file
+produceJar=false
+
+gradleVersion=1.4
+vertxVersion=2.0.0-SNAPSHOT
+toolsVersion=1.0.0-SNAPSHOT
junitVersion=4.10
-rhinoVersion=1.7R4
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e3b3376..42d9b0e 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 50a3d65..43dc243 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Jul 07 10:05:19 BST 2012
+#Mon Jan 28 08:12:12 GMT 2013
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.1-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.4-bin.zip
diff --git a/mk b/mk
deleted file mode 100755
index 15680c7..0000000
--- a/mk
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/bin/bash
-
-##############################################################################
-##
-## Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# 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
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
- [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# 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\"`/"
-APP_HOME="`pwd -P`"
-cd "$SAVED"
-
-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" ] ; 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 businessSystem 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"`
-
- # 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"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain --daemon "$@"
diff --git a/src/examples/java/simpleform/run_example.sh b/src/examples/java/simpleform/run_example.sh
old mode 100755
new mode 100644
diff --git a/src/examples/java/simpleupload/run_example.sh b/src/examples/java/simpleupload/run_example.sh
old mode 100755
new mode 100644
diff --git a/src/main/conf/mod.json b/src/main/conf/mod.json
deleted file mode 100644
index 7a73a41..0000000
--- a/src/main/conf/mod.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
\ No newline at end of file
diff --git a/src/main/java/org/vertx/mods/formupload/Attribute.java b/src/main/java/org/vertx/mods/formupload/Attribute.java
index 702053b..00503f3 100644
--- a/src/main/java/org/vertx/mods/formupload/Attribute.java
+++ b/src/main/java/org/vertx/mods/formupload/Attribute.java
@@ -4,8 +4,8 @@
* @author Tim Fox
*/
public class Attribute {
- public String name;
- public String value;
+ public final String name;
+ public final String value;
public Attribute(String name, String value) {
this.name = name;
diff --git a/src/main/java/org/vertx/mods/formupload/Upload.java b/src/main/java/org/vertx/mods/formupload/Upload.java
index 32e3cb5..4fca1b8 100644
--- a/src/main/java/org/vertx/mods/formupload/Upload.java
+++ b/src/main/java/org/vertx/mods/formupload/Upload.java
@@ -112,7 +112,7 @@ public void handle(Void event) {
});
resume();
} else {
- resultHandler.handle(new AsyncResult(ar.exception));
+ resultHandler.handle(new AsyncResult().setFailure(ar.exception));
}
}
});
diff --git a/src/main/javascript/vertx-formupload.js b/src/main/javascript/vertx-formupload.js
deleted file mode 100644
index af3eae6..0000000
--- a/src/main/javascript/vertx-formupload.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Created with IntelliJ IDEA.
- * User: tim
- * Date: 03/10/12
- * Time: 11:57
- * To change this template use File | Settings | File Templates.
- */
diff --git a/wmk.bat b/wmk.bat
deleted file mode 100644
index 8a0b282..0000000
--- a/wmk.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@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
-
-@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=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@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 Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_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=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-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