diff --git a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml deleted file mode 100644 index 43e2702..0000000 --- a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml deleted file mode 100644 index 43e2702..0000000 --- a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml new file mode 100644 index 0000000..873c2c0 --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml deleted file mode 100644 index 43e2702..0000000 --- a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml new file mode 100644 index 0000000..873c2c0 --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-jdbc-stats.iml b/.idea/modules/simple-jdbc-stats.iml index be4bd00..7ed33c6 100644 --- a/.idea/modules/simple-jdbc-stats.iml +++ b/.idea/modules/simple-jdbc-stats.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml deleted file mode 100644 index 43e2702..0000000 --- a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml new file mode 100644 index 0000000..873c2c0 --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-jdbc-stats.iml b/.idea/modules/simple-jdbc-stats.iml index be4bd00..7ed33c6 100644 --- a/.idea/modules/simple-jdbc-stats.iml +++ b/.idea/modules/simple-jdbc-stats.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/simple-jdbc-stats_main.iml b/.idea/modules/simple-jdbc-stats_main.iml index dff0656..55c76aa 100644 --- a/.idea/modules/simple-jdbc-stats_main.iml +++ b/.idea/modules/simple-jdbc-stats_main.iml @@ -1,5 +1,5 @@ - + @@ -11,7 +11,7 @@ - + \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml deleted file mode 100644 index 43e2702..0000000 --- a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml new file mode 100644 index 0000000..873c2c0 --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-jdbc-stats.iml b/.idea/modules/simple-jdbc-stats.iml index be4bd00..7ed33c6 100644 --- a/.idea/modules/simple-jdbc-stats.iml +++ b/.idea/modules/simple-jdbc-stats.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/simple-jdbc-stats_main.iml b/.idea/modules/simple-jdbc-stats_main.iml index dff0656..55c76aa 100644 --- a/.idea/modules/simple-jdbc-stats_main.iml +++ b/.idea/modules/simple-jdbc-stats_main.iml @@ -1,5 +1,5 @@ - + @@ -11,7 +11,7 @@ - + \ No newline at end of file diff --git a/.idea/modules/simple-jdbc-stats_test.iml b/.idea/modules/simple-jdbc-stats_test.iml index 5f34a3a..270cb7e 100644 --- a/.idea/modules/simple-jdbc-stats_test.iml +++ b/.idea/modules/simple-jdbc-stats_test.iml @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml deleted file mode 100644 index 43e2702..0000000 --- a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml new file mode 100644 index 0000000..873c2c0 --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-jdbc-stats.iml b/.idea/modules/simple-jdbc-stats.iml index be4bd00..7ed33c6 100644 --- a/.idea/modules/simple-jdbc-stats.iml +++ b/.idea/modules/simple-jdbc-stats.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/simple-jdbc-stats_main.iml b/.idea/modules/simple-jdbc-stats_main.iml index dff0656..55c76aa 100644 --- a/.idea/modules/simple-jdbc-stats_main.iml +++ b/.idea/modules/simple-jdbc-stats_main.iml @@ -1,5 +1,5 @@ - + @@ -11,7 +11,7 @@ - + \ No newline at end of file diff --git a/.idea/modules/simple-jdbc-stats_test.iml b/.idea/modules/simple-jdbc-stats_test.iml index 5f34a3a..270cb7e 100644 --- a/.idea/modules/simple-jdbc-stats_test.iml +++ b/.idea/modules/simple-jdbc-stats_test.iml @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/build.gradle b/build.gradle index b5d81fc..dbf7171 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -group 'nl.astraeus.jdbc' +group 'nl.astraeus' version '1.5.4-SNAPSHOT' apply plugin: 'java' @@ -16,6 +16,7 @@ } sourceCompatibility = 1.5 +targetCompatibility = 1.5 repositories { maven { @@ -88,3 +89,14 @@ } } } + +task fatJar(type: Jar) { + manifest { + attributes 'Implementation-Title': 'simple-jdbc-statistics', + 'Implementation-Version': version + } + baseName = project.name + '-nodep' + from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } + with jar +} + diff --git a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml deleted file mode 100644 index 43e2702..0000000 --- a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml new file mode 100644 index 0000000..873c2c0 --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-jdbc-stats.iml b/.idea/modules/simple-jdbc-stats.iml index be4bd00..7ed33c6 100644 --- a/.idea/modules/simple-jdbc-stats.iml +++ b/.idea/modules/simple-jdbc-stats.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/simple-jdbc-stats_main.iml b/.idea/modules/simple-jdbc-stats_main.iml index dff0656..55c76aa 100644 --- a/.idea/modules/simple-jdbc-stats_main.iml +++ b/.idea/modules/simple-jdbc-stats_main.iml @@ -1,5 +1,5 @@ - + @@ -11,7 +11,7 @@ - + \ No newline at end of file diff --git a/.idea/modules/simple-jdbc-stats_test.iml b/.idea/modules/simple-jdbc-stats_test.iml index 5f34a3a..270cb7e 100644 --- a/.idea/modules/simple-jdbc-stats_test.iml +++ b/.idea/modules/simple-jdbc-stats_test.iml @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/build.gradle b/build.gradle index b5d81fc..dbf7171 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -group 'nl.astraeus.jdbc' +group 'nl.astraeus' version '1.5.4-SNAPSHOT' apply plugin: 'java' @@ -16,6 +16,7 @@ } sourceCompatibility = 1.5 +targetCompatibility = 1.5 repositories { maven { @@ -88,3 +89,14 @@ } } } + +task fatJar(type: Jar) { + manifest { + attributes 'Implementation-Title': 'simple-jdbc-statistics', + 'Implementation-Version': version + } + baseName = project.name + '-nodep' + from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } + with jar +} + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 30d399d..51288f9 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar Binary files differ diff --git a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml deleted file mode 100644 index 43e2702..0000000 --- a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml new file mode 100644 index 0000000..873c2c0 --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-jdbc-stats.iml b/.idea/modules/simple-jdbc-stats.iml index be4bd00..7ed33c6 100644 --- a/.idea/modules/simple-jdbc-stats.iml +++ b/.idea/modules/simple-jdbc-stats.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/simple-jdbc-stats_main.iml b/.idea/modules/simple-jdbc-stats_main.iml index dff0656..55c76aa 100644 --- a/.idea/modules/simple-jdbc-stats_main.iml +++ b/.idea/modules/simple-jdbc-stats_main.iml @@ -1,5 +1,5 @@ - + @@ -11,7 +11,7 @@ - + \ No newline at end of file diff --git a/.idea/modules/simple-jdbc-stats_test.iml b/.idea/modules/simple-jdbc-stats_test.iml index 5f34a3a..270cb7e 100644 --- a/.idea/modules/simple-jdbc-stats_test.iml +++ b/.idea/modules/simple-jdbc-stats_test.iml @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/build.gradle b/build.gradle index b5d81fc..dbf7171 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -group 'nl.astraeus.jdbc' +group 'nl.astraeus' version '1.5.4-SNAPSHOT' apply plugin: 'java' @@ -16,6 +16,7 @@ } sourceCompatibility = 1.5 +targetCompatibility = 1.5 repositories { maven { @@ -88,3 +89,14 @@ } } } + +task fatJar(type: Jar) { + manifest { + attributes 'Implementation-Title': 'simple-jdbc-statistics', + 'Implementation-Version': version + } + baseName = project.name + '-nodep' + from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } + with jar +} + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 30d399d..51288f9 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar Binary files differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 975ceaf..088b40b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Dec 09 09:24:26 CET 2016 +#Sun Dec 11 17:19:37 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 +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip diff --git a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml deleted file mode 100644 index 43e2702..0000000 --- a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml new file mode 100644 index 0000000..873c2c0 --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-jdbc-stats.iml b/.idea/modules/simple-jdbc-stats.iml index be4bd00..7ed33c6 100644 --- a/.idea/modules/simple-jdbc-stats.iml +++ b/.idea/modules/simple-jdbc-stats.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/simple-jdbc-stats_main.iml b/.idea/modules/simple-jdbc-stats_main.iml index dff0656..55c76aa 100644 --- a/.idea/modules/simple-jdbc-stats_main.iml +++ b/.idea/modules/simple-jdbc-stats_main.iml @@ -1,5 +1,5 @@ - + @@ -11,7 +11,7 @@ - + \ No newline at end of file diff --git a/.idea/modules/simple-jdbc-stats_test.iml b/.idea/modules/simple-jdbc-stats_test.iml index 5f34a3a..270cb7e 100644 --- a/.idea/modules/simple-jdbc-stats_test.iml +++ b/.idea/modules/simple-jdbc-stats_test.iml @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/build.gradle b/build.gradle index b5d81fc..dbf7171 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -group 'nl.astraeus.jdbc' +group 'nl.astraeus' version '1.5.4-SNAPSHOT' apply plugin: 'java' @@ -16,6 +16,7 @@ } sourceCompatibility = 1.5 +targetCompatibility = 1.5 repositories { maven { @@ -88,3 +89,14 @@ } } } + +task fatJar(type: Jar) { + manifest { + attributes 'Implementation-Title': 'simple-jdbc-statistics', + 'Implementation-Version': version + } + baseName = project.name + '-nodep' + from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } + with jar +} + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 30d399d..51288f9 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar Binary files differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 975ceaf..088b40b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Dec 09 09:24:26 CET 2016 +#Sun Dec 11 17:19:37 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 +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip diff --git a/gradlew b/gradlew index 91a7e26..4453cce 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,12 +6,30 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# 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" @@ -30,6 +48,7 @@ cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,31 +59,11 @@ MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=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. @@ -90,7 +89,7 @@ fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +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 @@ -114,6 +113,7 @@ 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` @@ -154,11 +154,19 @@ 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=("$@") +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# 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/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml deleted file mode 100644 index 43e2702..0000000 --- a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml new file mode 100644 index 0000000..873c2c0 --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-jdbc-stats.iml b/.idea/modules/simple-jdbc-stats.iml index be4bd00..7ed33c6 100644 --- a/.idea/modules/simple-jdbc-stats.iml +++ b/.idea/modules/simple-jdbc-stats.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/simple-jdbc-stats_main.iml b/.idea/modules/simple-jdbc-stats_main.iml index dff0656..55c76aa 100644 --- a/.idea/modules/simple-jdbc-stats_main.iml +++ b/.idea/modules/simple-jdbc-stats_main.iml @@ -1,5 +1,5 @@ - + @@ -11,7 +11,7 @@ - + \ No newline at end of file diff --git a/.idea/modules/simple-jdbc-stats_test.iml b/.idea/modules/simple-jdbc-stats_test.iml index 5f34a3a..270cb7e 100644 --- a/.idea/modules/simple-jdbc-stats_test.iml +++ b/.idea/modules/simple-jdbc-stats_test.iml @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/build.gradle b/build.gradle index b5d81fc..dbf7171 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -group 'nl.astraeus.jdbc' +group 'nl.astraeus' version '1.5.4-SNAPSHOT' apply plugin: 'java' @@ -16,6 +16,7 @@ } sourceCompatibility = 1.5 +targetCompatibility = 1.5 repositories { maven { @@ -88,3 +89,14 @@ } } } + +task fatJar(type: Jar) { + manifest { + attributes 'Implementation-Title': 'simple-jdbc-statistics', + 'Implementation-Version': version + } + baseName = project.name + '-nodep' + from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } + with jar +} + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 30d399d..51288f9 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar Binary files differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 975ceaf..088b40b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Dec 09 09:24:26 CET 2016 +#Sun Dec 11 17:19:37 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 +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip diff --git a/gradlew b/gradlew index 91a7e26..4453cce 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,12 +6,30 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# 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" @@ -30,6 +48,7 @@ cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,31 +59,11 @@ MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=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. @@ -90,7 +89,7 @@ fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +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 @@ -114,6 +113,7 @@ 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` @@ -154,11 +154,19 @@ 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=("$@") +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# 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 index 8a0b282..f955316 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @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 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 @@ -46,10 +46,9 @@ goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows 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. @@ -60,11 +59,6 @@ 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 diff --git a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml deleted file mode 100644 index 43e2702..0000000 --- a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml new file mode 100644 index 0000000..873c2c0 --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_web_simple_web_0_3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-jdbc-stats.iml b/.idea/modules/simple-jdbc-stats.iml index be4bd00..7ed33c6 100644 --- a/.idea/modules/simple-jdbc-stats.iml +++ b/.idea/modules/simple-jdbc-stats.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/simple-jdbc-stats_main.iml b/.idea/modules/simple-jdbc-stats_main.iml index dff0656..55c76aa 100644 --- a/.idea/modules/simple-jdbc-stats_main.iml +++ b/.idea/modules/simple-jdbc-stats_main.iml @@ -1,5 +1,5 @@ - + @@ -11,7 +11,7 @@ - + \ No newline at end of file diff --git a/.idea/modules/simple-jdbc-stats_test.iml b/.idea/modules/simple-jdbc-stats_test.iml index 5f34a3a..270cb7e 100644 --- a/.idea/modules/simple-jdbc-stats_test.iml +++ b/.idea/modules/simple-jdbc-stats_test.iml @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/build.gradle b/build.gradle index b5d81fc..dbf7171 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -group 'nl.astraeus.jdbc' +group 'nl.astraeus' version '1.5.4-SNAPSHOT' apply plugin: 'java' @@ -16,6 +16,7 @@ } sourceCompatibility = 1.5 +targetCompatibility = 1.5 repositories { maven { @@ -88,3 +89,14 @@ } } } + +task fatJar(type: Jar) { + manifest { + attributes 'Implementation-Title': 'simple-jdbc-statistics', + 'Implementation-Version': version + } + baseName = project.name + '-nodep' + from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } + with jar +} + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 30d399d..51288f9 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar Binary files differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 975ceaf..088b40b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Dec 09 09:24:26 CET 2016 +#Sun Dec 11 17:19:37 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 +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip diff --git a/gradlew b/gradlew index 91a7e26..4453cce 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,12 +6,30 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# 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" @@ -30,6 +48,7 @@ cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,31 +59,11 @@ MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=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. @@ -90,7 +89,7 @@ fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +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 @@ -114,6 +113,7 @@ 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` @@ -154,11 +154,19 @@ 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=("$@") +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# 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 index 8a0b282..f955316 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @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 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 @@ -46,10 +46,9 @@ goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows 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. @@ -60,11 +59,6 @@ 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 diff --git a/readme.md b/readme.md index 1cac008..2aeb23f 100644 --- a/readme.md +++ b/readme.md @@ -1,3 +1,5 @@ +# Simple jdbc statistics + A simple wrapper around jdbc drivers that will show some statistics about the running queries on a simple web page on port 18080. See a running example here: @@ -10,15 +12,29 @@ ![Screenshot](/data/jdbc-stats.png "Screenshot") -Download: +## Download: [jdbc-stats-1.2-nodeb.jar](https://github.com/rnentjes/Simple-jdbc-statistics/releases/download/v1.2/jdbc-stats-1.2-nodeb.jar) -How to use: +## Maven, gradle etc. + +Add maven repository: https://nexus.astraeus.nl/nexus/content/groups/public + +Pom: + +```xml + + nl.astraeus + simple-jdbc-stats + 1.5.4 + +``` + +## How to use: Add the jar to your classpath: -* jdbc-stats-1.2-nodeb.jar +* jdbc-stats-1.5.4-nodeb.jar Set your jdbc driver property to the following class: