changeset 8513:6b8410ba48cb

Use Maven instead of potentially outdated JARs for creation of h2-databases. TODO: adapt release script.
author Tom Gottfried <tom@intevation.de>
date Wed, 17 Dec 2014 15:56:41 +0100
parents de8be181fa87
children 97d2a83118e4
files artifacts/bin/createDatacage.sh contrib/make_flys_release/h2/commons-dbcp-1.2.2.jar contrib/make_flys_release/h2/commons-pool-1.3.jar contrib/make_flys_release/h2/createArtifacts.sh contrib/make_flys_release/h2/createDatacage.sh contrib/make_flys_release/h2/h2-1.3.158.jar contrib/make_flys_release/h2/log4j-1.2.14.jar
diffstat 7 files changed, 17 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- /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"
Binary file contrib/make_flys_release/h2/commons-dbcp-1.2.2.jar has changed
Binary file contrib/make_flys_release/h2/commons-pool-1.3.jar has changed
--- 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"
--- 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"
Binary file contrib/make_flys_release/h2/h2-1.3.158.jar has changed
Binary file contrib/make_flys_release/h2/log4j-1.2.14.jar has changed

http://dive4elements.wald.intevation.org