# HG changeset patch # User Andre Heinecke # Date 1367597021 -7200 # Node ID 8698e3284b7ac392c9da96fc897d925aa61a1df6 # Parent 45dd4331cb6dfdc6de275d355a1b741437540963 Update after renaming and remove the binary artifact-database and common diff -r 45dd4331cb6d -r 8698e3284b7a contrib/make_flys_release/README --- a/contrib/make_flys_release/README Fri May 03 16:16:04 2013 +0200 +++ b/contrib/make_flys_release/README Fri May 03 18:03:41 2013 +0200 @@ -29,6 +29,14 @@ Prozess: ======== +Als erstes muss man eine halbwegs aktuelle version von artifacts-common +und artifacts-database in dem h2 verzeichnis verlinken. + +Beispiel: +cd h2 +ln -s ~/.m2/repository/org/dive4elements/artifacts-common/1.0-SNAPSHOT/artifacts-common-1.0-SNAPSHOT.jar +ln -s ~/.m2/repository/org/dive4elements/artifact-database/1.0-SNAPSHOT/artifact-database-1.0-SNAPSHOT.jar + Nachdem die Konfigurationen angepasst wurden, kann das Skript mittels sh make_release.sh VERSION von der Konsole gestartet werden. Anschließend werden die Quellen des diff -r 45dd4331cb6d -r 8698e3284b7a contrib/make_flys_release/bin/run.sh --- a/contrib/make_flys_release/bin/run.sh Fri May 03 16:16:04 2013 +0200 +++ b/contrib/make_flys_release/bin/run.sh Fri May 03 18:03:41 2013 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -APP=de.intevation.artifactdatabase.App +APP=org.dive4elements.artifactdatabase.App DIR=`dirname $0`/.. DIR=`readlink -f "$DIR"` diff -r 45dd4331cb6d -r 8698e3284b7a contrib/make_flys_release/h2/artifact-database-1.0-SNAPSHOT.jar Binary file contrib/make_flys_release/h2/artifact-database-1.0-SNAPSHOT.jar has changed diff -r 45dd4331cb6d -r 8698e3284b7a contrib/make_flys_release/h2/artifacts-common-1.0-SNAPSHOT.jar Binary file contrib/make_flys_release/h2/artifacts-common-1.0-SNAPSHOT.jar has changed diff -r 45dd4331cb6d -r 8698e3284b7a contrib/make_flys_release/make_release.sh --- a/contrib/make_flys_release/make_release.sh Fri May 03 16:16:04 2013 +0200 +++ b/contrib/make_flys_release/make_release.sh Fri May 03 18:03:41 2013 +0200 @@ -25,11 +25,11 @@ DEFAULT_WD=/tmp/flys-release DEVELOPER=aheinecke -ARTIFACTS_HG_REPO="http://wald.intevation.org/hg/dive4elements/artifacts" +ARTIFACTS_HG_REPO="http://wald.intevation.org/hg/dive4elements/framework" HTTPCLIIENT_HG_REPO="http://wald.intevation.org/hg/dive4elements/http-client" -FLYS_HG_REPO="http://wald.intevation.org/hg/dive4elements/flys" +FLYS_HG_REPO="http://wald.intevation.org/hg/dive4elements/river" -REPOS="artifacts http-client flys" +REPOS="river http-client framework" # Do not use spaces in path FLYS_SOURCE_DIR=/local-vol1/aheinecke/flys-release @@ -86,7 +86,7 @@ BACKENDUSER=${BACKENDUSER:-flys_dami} BACKENDPASS=${BACKENDPASS:-flys_dami} INITSQLS=${INITSQLS:-} -DGM_PATH=${DGM_PATH:-/opt/flys/gewaesser} +DGM_PATH=${DGM_PATH:-/opt/river/gewaesser} LOG_DIR=/var/log/flys OPTS=`getopt -o ?w:,t,o \ @@ -138,9 +138,9 @@ mkdir -p $FLYS_SOURCE_DIR echo "Cloning sources" cd $FLYS_SOURCE_DIR - hg clone $ARTIFACTS_HG_REPO artifacts + hg clone $ARTIFACTS_HG_REPO framework hg clone $HTTPCLIIENT_HG_REPO http-client - hg clone $FLYS_HG_REPO flys + hg clone $FLYS_HG_REPO river else echo "Updating sources / Reverting changes" cd $FLYS_SOURCE_DIR @@ -189,22 +189,22 @@ echo "[INFO]: Artifact Port: $ARTIFACT_PORT" #Needs to be done before the tomcat replacement below -sed -i -e "s@http://localhost:8888/flys/mapfish-print@https://localhost/flys-${VERSION}/flys/mapfish-print@g" \ - $FLYS_SOURCE_DIR/flys/flys-client/src/main/webapp/WEB-INF/web.xml +sed -i -e "s@http://localhost:8888/river/mapfish-print@https://localhost/flys-${VERSION}/river/mapfish-print@g" \ + $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/WEB-INF/web.xml sed -i -e "s@http://localhost:8181@http://localhost:$ARTIFACT_PORT@g" \ -e "s@http://localhost:8888@http://localhost:$TOMCAT_PORT@g" \ - $FLYS_SOURCE_DIR/flys/flys-client/src/main/webapp/WEB-INF/web.xml + $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/WEB-INF/web.xml sed -i -e "s@/tmp/flys-client.log@${LOG_DIR}/client-${VERSION}.log@g" \ - $FLYS_SOURCE_DIR/flys/flys-client/src/main/webapp/WEB-INF/log4j.properties + $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/WEB-INF/log4j.properties # XXX: Are they really used at runtime? -find $FLYS_SOURCE_DIR/flys/ -name \*.properties -o -name \*.xsl | \ +find $FLYS_SOURCE_DIR/river/ -name \*.properties -o -name \*.xsl | \ xargs sed -i "s@https://flys-intern.intevation.de@${WIKI_URL}@g"; sed -i -e "s@/usr/share/fonts/truetype/freefont@${FONT_PATH}@g" \ - $FLYS_SOURCE_DIR/flys/flys-client/src/main/webapp/WEB-INF/config.yaml + $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/WEB-INF/config.yaml if [ ! -f $FLYS_SOURCE_DIR/OpenLayers-2.11.tar.gz ]; then echo "INFO: download OpenLayers-2.11 for client" @@ -217,24 +217,24 @@ rm -rf OpenLayers-2.11/examples cd $WORK_DIR fi -cp -r $FLYS_SOURCE_DIR/OpenLayers-2.11 $FLYS_SOURCE_DIR/flys/flys-client/src/main/webapp/ +cp -r $FLYS_SOURCE_DIR/OpenLayers-2.11 $FLYS_SOURCE_DIR/river/gwt-client/src/main/webapp/ echo "INFO: compile and build sources" -mvn -f $FLYS_SOURCE_DIR/artifacts/pom.xml clean compile package install -mvn -f $FLYS_SOURCE_DIR/flys/flys-backend/pom.xml clean compile package install -mvn -f $FLYS_SOURCE_DIR/flys/flys-artifacts/pom.xml clean compile package dependency:copy-dependencies install +mvn -f $FLYS_SOURCE_DIR/framework/pom.xml clean compile package install +mvn -f $FLYS_SOURCE_DIR/river/backend/pom.xml clean compile package install +mvn -f $FLYS_SOURCE_DIR/river/artifacts/pom.xml clean compile package dependency:copy-dependencies install mvn -f $FLYS_SOURCE_DIR/http-client/pom.xml clean compile package install -mvn -f $FLYS_SOURCE_DIR/flys/flys-client/pom.xml clean compile package +mvn -f $FLYS_SOURCE_DIR/river/gwt-client/pom.xml clean compile package echo "INFO: copy dependencies and libs" -cp $FLYS_SOURCE_DIR/artifacts/artifact-database/target/artifact-database-1.0-SNAPSHOT.jar $WORK_DIR/server/bin/lib/own/ -cp $FLYS_SOURCE_DIR/artifacts/artifacts/target/artifacts-1.0-SNAPSHOT.jar $WORK_DIR/server/bin/lib/own/ -cp $FLYS_SOURCE_DIR/artifacts/artifacts-common/target/artifacts-common-1.0-SNAPSHOT.jar $WORK_DIR/server/bin/lib/own/ -cp $FLYS_SOURCE_DIR/flys/flys-backend/target/flys-backend-1.0-SNAPSHOT.jar $WORK_DIR/server/bin/lib/own/ -cp $FLYS_SOURCE_DIR/flys/flys-artifacts/target/flys-artifacts-1.0-SNAPSHOT.jar $WORK_DIR/server/bin/lib/own/ -cp $FLYS_SOURCE_DIR/flys/flys-client/target/FLYS-1.0-SNAPSHOT.war $WORK_DIR/client/flys-${VERSION}.war -cp $FLYS_SOURCE_DIR/flys/flys-artifacts/target/dependency/* $WORK_DIR/server/bin/lib/ +cp $FLYS_SOURCE_DIR/framework/artifact-database/target/artifact-database-1.0-SNAPSHOT.jar $WORK_DIR/server/bin/lib/own/ +cp $FLYS_SOURCE_DIR/framework/artifacts/target/artifacts-1.0-SNAPSHOT.jar $WORK_DIR/server/bin/lib/own/ +cp $FLYS_SOURCE_DIR/framework/artifacts-common/target/artifacts-common-1.0-SNAPSHOT.jar $WORK_DIR/server/bin/lib/own/ +cp $FLYS_SOURCE_DIR/river/backend/target/river-backend-1.0-SNAPSHOT.jar $WORK_DIR/server/bin/lib/own/ +cp $FLYS_SOURCE_DIR/river/artifacts/target/river-artifacts-1.0-SNAPSHOT.jar $WORK_DIR/server/bin/lib/own/ +cp $FLYS_SOURCE_DIR/river/gwt-client/target/gwt-client-1.0-SNAPSHOT.war $WORK_DIR/client/flys-${VERSION}.war +cp $FLYS_SOURCE_DIR/river/artifacts/target/dependency/* $WORK_DIR/server/bin/lib/ echo "INFO: copy scripts and libraries to target destination" cp ${SCRIPT_DIR}/bin/run.sh $WORK_DIR/server/bin/ @@ -265,7 +265,7 @@ # fetch the configuration stuff echo "INFO: copy default configuration to target destination" -cp -R $FLYS_SOURCE_DIR/flys/flys-artifacts/doc/conf $WORK_DIR/server/ +cp -R $FLYS_SOURCE_DIR/river/artifacts/doc/conf $WORK_DIR/server/ sed -i "s/8181/$ARTIFACT_PORT/g" \ $WORK_DIR/server/conf/rest-server.xml @@ -337,8 +337,8 @@ mkdir $WORK_DIR/artifactsdb mkdir $WORK_DIR/datacagedb -cp $FLYS_SOURCE_DIR/artifacts/artifact-database/doc/schema-h2.sql $WORK_DIR/artifactsdb/artifacts-h2.sql -cp $FLYS_SOURCE_DIR/flys/flys-artifacts/doc/conf/datacage.sql $WORK_DIR/datacagedb/datacage.sql +cp $FLYS_SOURCE_DIR/framework/artifact-database/doc/schema-h2.sql $WORK_DIR/artifactsdb/artifacts-h2.sql +cp $FLYS_SOURCE_DIR/river/artifacts/doc/conf/datacage.sql $WORK_DIR/datacagedb/datacage.sql echo "INFO: create h2 database for artifacts and datacage" $SCRIPT_DIR/h2/createArtifacts.sh $WORK_DIR/artifactsdb/artifacts-h2.sql