diff --git a/.gitignore b/.gitignore index 3df8799..6f73b8f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,4 @@ ScratchTest.java test-results test-tmp *.class -mods +/mods diff --git a/gradle/maven.gradle b/gradle/maven.gradle new file mode 100644 index 0000000..0d131ba --- /dev/null +++ b/gradle/maven.gradle @@ -0,0 +1,68 @@ +/* + * 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. + */ + +apply plugin: 'maven' +apply plugin: 'signing' + +if (!hasProperty('sonatypeUsername')) { + ext.sonatypeUsername = '' +} +if (!hasProperty('sonatypePassword')) { + ext.sonatypePassword = '' +} + +// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// maven task configuration + +ext.isReleaseVersion = !version.endsWith("SNAPSHOT") + +signing { + required { isReleaseVersion && gradle.taskGraph.hasTask("uploadArchives") } + sign configurations.archives +} + +uploadArchives { + group 'build' + description = "Does a maven deploy of archives artifacts" + + repositories { + mavenDeployer { + // setUniqueVersion(false) + + configuration = configurations.archives + + repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { + authentication(userName: sonatypeUsername, password: sonatypePassword) + } + + snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") { + authentication(userName: sonatypeUsername, password: sonatypePassword) + } + + if (isReleaseVersion) { + beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } + } + + configurePom(pom) + } + } +} + +// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +// configuration methods + + + diff --git a/gradle/vertx.gradle b/gradle/vertx.gradle new file mode 100644 index 0000000..ad79b38 --- /dev/null +++ b/gradle/vertx.gradle @@ -0,0 +1,156 @@ +import org.vertx.java.core.Handler +import org.vertx.java.platform.PlatformLocator +import org.vertx.java.platform.impl.ModuleClassLoader + +/* + * 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. + */ + +apply from: "gradle/maven.gradle" + +apply plugin: 'java' +apply plugin: 'groovy' +apply plugin: 'idea' +apply plugin: 'eclipse' + +// We load some extra properties from vertx.properties +loadProperties("vertx.properties") + +version = project.ext.version +group = groupname +archivesBaseName = artifact + +defaultTasks = ['assemble'] + +sourceCompatibility = '1.7' +targetCompatibility = '1.7' + +project.ext.moduleName = "maven:$groupname:$artifact:$version" + +if (produceJar == 'false') { + jar.enabled = false + assert configurations.archives.artifacts.removeAll { it.file == jar.archivePath } +} + +configurations { + provided + testCompile.extendsFrom provided +} + +repositories { + mavenLocal() + maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } + mavenCentral() +} + +dependencies { + provided "io.vertx:vertx-core:$vertxVersion" + provided "io.vertx:vertx-platform:$vertxVersion" + testCompile "junit:junit:$junitVersion" + testCompile "io.vertx:testtools:$toolsVersion" +} + +// This sets up the classpath for the script itself +buildscript { + + repositories { + mavenLocal() + maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } + mavenCentral() + } + + dependencies { + classpath "io.vertx:vertx-core:$vertxVersion" + classpath "io.vertx:vertx-platform:$vertxVersion" + } +} + +sourceSets { + main { + compileClasspath = compileClasspath + configurations.provided + } +} + +task copyMod( type:Copy, dependsOn: 'classes', description: 'Assemble the module into the local mods directory' ) { + into "mods/$moduleName" + from compileJava + from 'src/main/resources' + into( 'lib' ) { + from configurations.compile + } +} + +task modZip( type: Zip, dependsOn: 'pullInDeps', description: 'Package the module .zip file') { + group = 'vert.x' + description = "Assembles a vert.x module" + destinationDir = project.file('build/libs') + archiveName = "${artifact}-${version}" + ".zip" + from copyMod +} + +artifacts { + archives modZip +} + +task cleanModsDir(type: Delete) { + delete 'mods' +} + +clean { + dependsOn cleanModsDir +} + +test { + dependsOn copyMod + + // Make sure tests are always run! + outputs.upToDateWhen { false } + + // Show output + testLogging.showStandardStreams = true + + testLogging { exceptionFormat "full" } +} + +task runMod(dependsOn: copyMod, description: 'Run the module using all the build dependencies (not using installed vertx') << { + ModuleClassLoader.reverseLoadOrder = false + def pm = PlatformLocator.factory.createPlatformManager() + pm.deployModule(moduleName, null, 1, new Handler() { + public void handle(String deploymentID) { + System.out.println("CTRL-C to stop server") + } + }); + Thread.sleep(Long.MAX_VALUE); +} + +task pullInDeps(dependsOn: copyMod, description: 'Pull in all the module dependencies for the module into the nested mods directory') << { + if (pullInDeps == 'true') { + def pm = PlatformLocator.factory.createPlatformManager() + System.out.println("Pulling in dependencies for module " + moduleName + " Please wait") + pm.pullInDependencies(moduleName) + System.out.println("Dependencies pulled into mods directory of module") + } +} + +def loadProperties(String sourceFileName) { + def config = new Properties() + def propFile = new File(sourceFileName) + if (propFile.canRead()) { + config.load(new FileInputStream(propFile)) + for (Map.Entry property in config) { + project.ext[property.key] = property.value; + } + } +} diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..15680c7 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/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/gradlew.bat b/gradlew.bat new file mode 100755 index 0000000..8a0b282 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@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 diff --git a/src/main/resources/mod.json b/src/main/resources/mod.json new file mode 100644 index 0000000..7a73a41 --- /dev/null +++ b/src/main/resources/mod.json @@ -0,0 +1,2 @@ +{ +} \ No newline at end of file diff --git a/src/main/resources/vertx-formupload.js b/src/main/resources/vertx-formupload.js new file mode 100644 index 0000000..5fbf5fb --- /dev/null +++ b/src/main/resources/vertx-formupload.js @@ -0,0 +1,6 @@ +var vertx = vertx || {}; + +if (!vertx.MultipartRequest) { + vertx.MultipartRequest = function() { + } +} diff --git a/vertx.properties b/vertx.properties new file mode 100644 index 0000000..b8007dd --- /dev/null +++ b/vertx.properties @@ -0,0 +1,16 @@ +# The module repo tyoe +repotype=maven + +# Your domain name +groupname=io.vertx + +# Your module name +artifact=mod-form-upload + +# Your module version +version=2.0.0-SNAPSHOT + +# The test timeout +testtimeout=300 + +nettyVersion=3.6.2.Final