# HG changeset patch # User Tom Gottfried # Date 1366992838 -7200 # Node ID cff1eea9854fa0a6f6342e471c371537661d5982 # Parent 249b8766a17827e43cc209fb3edbf9bf46dbfc5c adjust importer build-script to new names diff -r 249b8766a178 -r cff1eea9854f backend/pom-oracle.xml --- a/backend/pom-oracle.xml Fri Apr 26 16:50:14 2013 +0200 +++ b/backend/pom-oracle.xml Fri Apr 26 18:13:58 2013 +0200 @@ -2,12 +2,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - de.intevation.flys - flys-backend + org.dive4elements.river + backend 1.0-SNAPSHOT jar - flys-backend + backend http://maven.apache.org @@ -43,8 +43,8 @@ - de.intevation.flys.importer.Importer - de.intevation.flys.importer + org.dive4elements.river.importer.Importer + org.dive4elements.river.importer @@ -54,7 +54,7 @@ - de.intevation.flys.importer.Importer + org.dive4elements.river.importer.Importer @@ -67,7 +67,7 @@ - de.intevation.artifacts.common + org.dive4elements.artifacts.common artifacts-common 1.0-SNAPSHOT diff -r 249b8766a178 -r cff1eea9854f contrib/make_flys_release/bin/make-importer-package.sh --- a/contrib/make_flys_release/bin/make-importer-package.sh Fri Apr 26 16:50:14 2013 +0200 +++ b/contrib/make_flys_release/bin/make-importer-package.sh Fri Apr 26 18:13:58 2013 +0200 @@ -6,8 +6,8 @@ # The working directory. Resulting tarball will be placed in the directory above. PKG_DIR=~/tmp/flys-importer # Path to the flys checkout -FLYS_DIR=~/flys/flys/ -# Tarball that will be extracted into flys-imprter/opt +FLYS_DIR=~/flys/river/ +# Tarball that will be extracted into flys-importer/opt EXTRAS=$1 rm -fr $PKG_DIR @@ -27,27 +27,27 @@ log4j.appender.IMPORTER.MaxBackupIndex=10 EOF -cd ${FLYS_DIR}/flys-backend +cd ${FLYS_DIR}/backend mvn -f pom-oracle.xml clean compile assembly:single -cp target/flys-backend-1.0-SNAPSHOT-jar-with-dependencies.jar \ +cp target/backend-1.0-SNAPSHOT-jar-with-dependencies.jar \ $PKG_DIR/hydr_morph/importer.jar mvn -f pom.xml clean compile assembly:single -cp target/flys-backend-1.0-SNAPSHOT-jar-with-dependencies.jar \ +cp target/river-backend-1.0-SNAPSHOT-jar-with-dependencies.jar \ $PKG_DIR/hydr_morph/importer_psql.jar -cp ${FLYS_DIR}/flys-backend/contrib/shpimporter/*.py $PKG_DIR/geodaesie -cp ${FLYS_DIR}/flys-backend/contrib/run_geo.sh \ - ${FLYS_DIR}/flys-backend/contrib/run_hydr_morph.sh \ - ${FLYS_DIR}/flys-backend/contrib/import_river.sh \ +cp ${FLYS_DIR}/backend/contrib/shpimporter/*.py $PKG_DIR/geodaesie +cp ${FLYS_DIR}/backend/contrib/run_geo.sh \ + ${FLYS_DIR}/backend/contrib/run_hydr_morph.sh \ + ${FLYS_DIR}/backend/contrib/import_river.sh \ $PKG_DIR -cp ${FLYS_DIR}/flys-backend/doc/annotation-types.xml $PKG_DIR/conf +cp ${FLYS_DIR}/backend/doc/annotation-types.xml $PKG_DIR/conf if [ -f "$EXTRAS" ]; then cd $PKG_DIR tar -xzf "$EXTRAS" fi -cp ${FLYS_DIR}/flys-backend/doc/schema/*.sql $PKG_DIR/schema +cp ${FLYS_DIR}/backend/doc/schema/*.sql $PKG_DIR/schema -cd ${FLYS_DIR}/flys-backend/doc/documentation/de/ +cd ${FLYS_DIR}/backend/doc/documentation/de/ make importer-manual.pdf cp importer-manual.pdf $PKG_DIR