# HG changeset patch
# User Tom Gottfried <tom@intevation.de>
# Date 1418828201 -3600
# Node ID 6b8410ba48cbf1d716bf091f098e278f56145054
# Parent  de8be181fa87d3f13feacab29f2c7c9fe76d6e4b
Use Maven instead of potentially outdated JARs for creation of h2-databases. TODO: adapt release script.

diff -r de8be181fa87 -r 6b8410ba48cb artifacts/bin/createDatacage.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/bin/createDatacage.sh	Wed Dec 17 15:56:41 2014 +0100
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+mkdir -p datacagedb
+
+DIR=`dirname $0`
+DIR=`readlink -f "$DIR"`
+
+if [ $# != 1 ]; then
+    SCHEMA="$DIR/../doc/conf/datacage.sql"
+else
+    SCHEMA="$1"
+fi
+
+URL="jdbc:h2:`readlink -f datacagedb`/datacage"
+
+mvn -e -Dexec.mainClass=org.h2.tools.RunScript exec:java \
+    -Dexec.args="-url $URL -script $SCHEMA"
diff -r de8be181fa87 -r 6b8410ba48cb contrib/make_flys_release/h2/commons-dbcp-1.2.2.jar
Binary file contrib/make_flys_release/h2/commons-dbcp-1.2.2.jar has changed
diff -r de8be181fa87 -r 6b8410ba48cb contrib/make_flys_release/h2/commons-pool-1.3.jar
Binary file contrib/make_flys_release/h2/commons-pool-1.3.jar has changed
diff -r de8be181fa87 -r 6b8410ba48cb contrib/make_flys_release/h2/createArtifacts.sh
--- a/contrib/make_flys_release/h2/createArtifacts.sh	Wed Dec 17 10:50:35 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-mkdir -p artifactsdb
-
-#DIR=`dirname $0`
-#DIR=`readlink -f "$DIR"`
-DIR=`pwd`
-
-CLASSPATH=
-for l in `find "$DIR" -name \*.jar -print`; do
-   CLASSPATH=$CLASSPATH:$l
-done
-
-export CLASSPATH
-
-if [ $# != 1 ]; then
-    echo "Usage: $0 <schema_file>"
-fi
-
-java org.h2.tools.RunScript \
-    -url jdbc:h2:`readlink -f artifactsdb`/artifacts \
-    -script "$1"
diff -r de8be181fa87 -r 6b8410ba48cb contrib/make_flys_release/h2/createDatacage.sh
--- a/contrib/make_flys_release/h2/createDatacage.sh	Wed Dec 17 10:50:35 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-mkdir -p datacagedb
-
-#DIR=`dirname $0`
-#DIR=`readlink -f "$DIR"`
-DIR=`pwd`
-
-CLASSPATH=
-for l in `find "$DIR" -name \*.jar -print`; do
-   CLASSPATH=$CLASSPATH:$l
-done
-
-export CLASSPATH
-if [ $# != 1 ]; then
-    echo "Usage: $0 <schema_file>"
-fi
-
-java org.h2.tools.RunScript \
-    -url jdbc:h2:`readlink -f datacagedb`/datacage \
-    -script "$1"
diff -r de8be181fa87 -r 6b8410ba48cb contrib/make_flys_release/h2/h2-1.3.158.jar
Binary file contrib/make_flys_release/h2/h2-1.3.158.jar has changed
diff -r de8be181fa87 -r 6b8410ba48cb contrib/make_flys_release/h2/log4j-1.2.14.jar
Binary file contrib/make_flys_release/h2/log4j-1.2.14.jar has changed