# HG changeset patch # User Sascha L. Teichmann # Date 1352829839 -3600 # Node ID 7e82d51c5a27c01668c035ef82e22c1d5bd37bc3 # Parent cc632340164386a0e3f6de319fb8b2aa60588cd1 Improved build script diff -r cc6323401643 -r 7e82d51c5a27 contrib/make_flys_release/bin/run.sh --- a/contrib/make_flys_release/bin/run.sh Tue Nov 13 16:52:01 2012 +0100 +++ b/contrib/make_flys_release/bin/run.sh Tue Nov 13 19:03:59 2012 +0100 @@ -14,9 +14,8 @@ exec java -Xmx256m \ -server \ - -Dflys.datacage.recommendations.development=true \ - -Dcom.sun.management.jmxremote.port=1229 \ - -Dcom.sun.management.jmxremote.authenticate=false \ + -Djava.awt.headless=true \ + -Dflys.datacage.recommendations.development=false \ -Djava.io.tmpdir="$DIR/cache" \ -Dflys.backend.enablejmx=true \ -Dflys.uesk.keep.artifactsdir=false \ diff -r cc6323401643 -r 7e82d51c5a27 contrib/make_flys_release/confs/backend-db.xml --- a/contrib/make_flys_release/confs/backend-db.xml Tue Nov 13 16:52:01 2012 +0100 +++ b/contrib/make_flys_release/confs/backend-db.xml Tue Nov 13 19:03:59 2012 +0100 @@ -1,8 +1,8 @@ - flys29 - flys29 + flys293 + flys293 org.hibernate.dialect.PostgreSQLDialect org.postgresql.Driver jdbc:postgresql://czech-republic.atlas.intevation.de:5432/flys29 diff -r cc6323401643 -r 7e82d51c5a27 contrib/make_flys_release/confs/seddb-db.xml --- a/contrib/make_flys_release/confs/seddb-db.xml Tue Nov 13 16:52:01 2012 +0100 +++ b/contrib/make_flys_release/confs/seddb-db.xml Tue Nov 13 19:03:59 2012 +0100 @@ -3,7 +3,7 @@ seddb seddbpass - org.hibernatespatial.oracle.OracleSpatial10gDialect + org.hibernate.dialect.Oracle9iDialect oracle.jdbc.driver.OracleDriver jdbc:oracle:thin:@//czech-republic.atlas.intevation.de:1521/XE diff -r cc6323401643 -r 7e82d51c5a27 contrib/make_flys_release/confs/web.xml --- a/contrib/make_flys_release/confs/web.xml Tue Nov 13 16:52:01 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,558 +0,0 @@ - - - - - - - server-url - http://localhost:8999 - - - - authentication - GGInA - - - - features-file - /WEB-INF/features.xml - - - - log4j-properties - /WEB-INF/log4j.properties - - - - de.intevation.flys.client.server.BaseServletContextListener - - - - - - user - de.intevation.flys.client.server.UserServiceImpl - - - - user - /flys/user - - - - artifact - de.intevation.flys.client.server.ArtifactServiceImpl - - - - artifact - /flys/artifact - - - - getartifact - de.intevation.flys.client.server.GetArtifactServiceImpl - - - - getartifact - /flys/getartifact - - - - cross-section-km - de.intevation.flys.client.server.CrossSectionKMServiceImpl - - - - cross-section-km - /flys/cross-section-km - - - - create-collection - de.intevation.flys.client.server.CreateCollectionServiceImpl - - - - create-collection - /flys/create-collection - - - - rivers - de.intevation.flys.client.server.RiverServiceImpl - - - - rivers - /flys/rivers - - - - gaugeoverviewinfo - de.intevation.flys.client.server.GaugeOverviewInfoServiceImpl - - - - gaugeoverviewinfo - /flys/gaugeoverviewinfo - - - - forward - de.intevation.flys.client.server.StepForwardServiceImpl - - - - forward - /flys/forward - - - - feed - de.intevation.flys.client.server.FeedServiceImpl - - - - feed - /flys/feed - - - - fixings-overview - de.intevation.flys.client.server.FixingsOverviewServiceImpl - - - - fixings-overview - /flys/fixings-overview - - - - advance - de.intevation.flys.client.server.AdvanceServiceImpl - - - - advance - /flys/advance - - - - add-artifact - de.intevation.flys.client.server.AddArtifactServiceImpl - - - - add-artifact - /flys/add-artifact - - - - load-artifact - de.intevation.flys.client.server.LoadArtifactServiceImpl - - - - load-artifact - /flys/load-artifact - - - - describe-collection - de.intevation.flys.client.server.DescribeCollectionServiceImpl - - - - describe-collection - /flys/describe-collection - - - - user-collections - de.intevation.flys.client.server.UserCollectionsServiceImpl - - - - user-collections - /flys/user-collections - - - - distanceinfo - de.intevation.flys.client.server.DistanceInfoServiceImpl - - - - distanceinfo - /flys/distanceinfo - - - - dischargeinfo - de.intevation.flys.client.server.DischargeInfoServiceImpl - - - - dischargeinfo - /flys/dischargeinfo - - - - DischargeInfoXML - de.intevation.flys.client.server.DischargeInfoXML - - - - DischargeInfoXML - /flys/dischargeinfoxml - - - - meta-data - de.intevation.flys.client.server.MetaDataServiceImpl - - - - meta-data - /flys/meta-data - - - - mainvalues - de.intevation.flys.client.server.WQInfoServiceImpl - - - - mainvalues - /flys/mainvalues - - - - gaugeinfo - de.intevation.flys.client.server.GaugeInfoServiceImpl - - - - gaugeinfo - /flys/gaugeinfo - - - - csv - de.intevation.flys.client.server.CSVExportServiceImpl - - - - csv - /flys/csv - - - - ChartOutputService - de.intevation.flys.client.server.ChartOutputServiceImpl - - - - ChartOutputService - /flys/chart - - - - - MapOutputService - de.intevation.flys.client.server.MapOutputServiceImpl - - - - MapOutputService - /flys/map - - - - mapfish.print - org.mapfish.print.servlet.MapPrinterServlet - - config - WEB-INF/config.yaml - - - - - mapfish.print - /flys/mapfish-print/* - - - - - MapPrintService - de.intevation.flys.client.server.MapPrintServiceImpl - - config - WEB-INF/config.yaml - - - print-url - http://localhost:8888/flys/mapfish-print - - - - - MapPrintService - /flys/map-print - - - - - FixingsKMChartService - de.intevation.flys.client.server.FixingsKMChartServiceImpl - - - - FixingsKMChartService - /flys/fixings-km-chart - - - - DistanceInfoXML - de.intevation.flys.client.server.DistanceInfoXML - - - - DistanceInfoXML - /flys/distanceinfoxml - - - - ExportService - de.intevation.flys.client.server.ExportServiceImpl - - - - ExportService - /flys/export - - - - CollectionAttributeService - de.intevation.flys.client.server.CollectionAttributeServiceImpl - - - - CollectionAttributeService - /flys/collection-attribute - - - - CollectionItemAttributeService - de.intevation.flys.client.server.CollectionItemAttributeServiceImpl - - - - CollectionItemAttributeService - /flys/collection-item-attribute - - - - ChartInfoService - de.intevation.flys.client.server.ChartInfoServiceImpl - - - - ChartInfoService - /flys/chart-info - - - - ReportService - de.intevation.flys.client.server.ReportServiceImpl - - - - ReportService - /flys/report - - - - SetCollectionNameService - de.intevation.flys.client.server.SetCollectionNameServiceImpl - - - - SetCollectionNameService - /flys/set-collectionname - - - - SetCollectionTTLService - de.intevation.flys.client.server.SetCollectionTTLServiceImpl - - - - SetCollectionTTLService - /flys/set-collectionttl - - - - DeleteCollectionService - de.intevation.flys.client.server.DeleteCollectionServiceImpl - - - - DeleteCollectionService - /flys/delete-collection - - - - MapInfoService - de.intevation.flys.client.server.MapInfoServiceImpl - - - - MapInfoService - /flys/map-info - - - - getfeatureinfo - de.intevation.flys.client.server.GFIServiceImpl - - - - getfeatureinfo - /flys/getfeatureinfo - - - - getcapabilities - de.intevation.flys.client.server.GCServiceImpl - - - - getcapabilities - /flys/getcapabilities - - - - DescribeArtifactService - de.intevation.flys.client.server.DescribeArtifactServiceImpl - - - - DescribeArtifactService - /flys/describe - - - - remove-artifact - de.intevation.flys.client.server.RemoveArtifactServiceImpl - - - - remove-artifact - /flys/remove-artifact - - - - GetWMSUrls - de.intevation.flys.client.server.MapUrlServiceImpl - - - - GetWMSUrls - /flys/map-urls - - - - FileUpload - de.intevation.flys.client.server.FileUploadServiceImpl - - - - FileUpload - /flys/fileupload - - - - themelisting - de.intevation.flys.client.server.ThemeListingServiceImpl - - - - themelisting - /flys/themelisting - - - - SQKMChart - de.intevation.flys.client.server.SQKMChartServiceImpl - - - - SQKMChart - /flys/sq-km-chart - - - - BedKMChart - de.intevation.flys.client.server.BedKMChartServiceImpl - - - - BedKMChart - /flys/bed-km-chart - - - - BedloadKMChart - de.intevation.flys.client.server.BedloadKMChartServiceImpl - - - - BedloadKMChart - /flys/bedload-km-chart - - - - login - de.intevation.flys.client.server.LoginServlet - - - - login - /flys/login - - - - modules - de.intevation.flys.client.server.ModuleServiceImpl - - - - modules - /flys/modules - - - - GGInAFilter - de.intevation.flys.client.server.GGInAFilter - - deactivate - false - - - - - GGInAFilter - /* - - - - - FLYS.html - - - diff -r cc6323401643 -r 7e82d51c5a27 contrib/make_flys_release/make_release.sh --- a/contrib/make_flys_release/make_release.sh Tue Nov 13 16:52:01 2012 +0100 +++ b/contrib/make_flys_release/make_release.sh Tue Nov 13 19:03:59 2012 +0100 @@ -1,10 +1,9 @@ -#!/bin/sh -HG_USER=YOURNAME +#!/bin/bash echo "INFO: define required variables" -ARTIFACTS_HG_REPO="ssh://$HG_USER@hg.wald.intevation.org/hg/dive4elements/artifacts" -HTTPCLIIENT_HG_REPO="ssh://$HG_USER@hg.wald.intevation.org/hg/dive4elements/http-client" -FLYS_HG_REPO="ssh://$HG_USER@hg.wald.intevation.org/hg/dive4elements/flys" +ARTIFACTS_HG_REPO="http://wald.intevation.org/hg/dive4elements/artifacts" +HTTPCLIIENT_HG_REPO="http://wald.intevation.org/hg/dive4elements/http-client" +FLYS_HG_REPO="http://wald.intevation.org/hg/dive4elements/flys" ARTIFACTS_HG="hg.artifacts" HTTPCLIENT_HG="hg.http-client" @@ -15,6 +14,9 @@ RELEASE_DATE=`date +'%Y-%m-%d'` DIRECTORY=$PREFIX$RELEASE_DATE +ARTEFACT_PORT=9002 +TOMCAT_PORT=8005 + echo "INFO: create server directories" mkdir -p $DIRECTORY/server/bin/lib/own mkdir $DIRECTORY/server/shapefiles @@ -22,20 +24,27 @@ echo "INFO: checkout sources" echo " ... checkout $ARTIFACTS_HG_REPO" + +rm -rf $ARTIFACTS_HG hg clone $ARTIFACTS_HG_REPO $ARTIFACTS_HG (cd $ARTIFACTS_HG && hg co $RELEASE) echo " ... checkout $HTTPCLIIENT_HG_REPO" +rm -rf $HTTPCLIENT_HG hg clone $HTTPCLIIENT_HG_REPO $HTTPCLIENT_HG (cd $HTTPCLIENT_HG && hg co $RELEASE) echo " ... checkout $FLYS_HG_REPO" +rm -rf $FLYS_HG hg clone $FLYS_HG_REPO $FLYS_HG (cd $FLYS_HG && hg co $RELEASE) # adapt client configuration echo "INFO: prepare configuration of web client" -cp confs/web.xml $FLYS_HG/flys-client/src/main/webapp/WEB-INF/web.xml + +sed -i -e "s@http://localhost:8181@http://localhost:$ARTEFACT_PORT@g " \ + -e "a@http://localhost:8888@http://localhost:$TOMCAT_PORT@g" \ + $FLYS_HG/flys-client/src/main/webapp/WEB-INF/web.xml echo "INFO: download OpenLayers-2.11 for client" curl -O http://openlayers.org/download/OpenLayers-2.11.tar.gz @@ -48,8 +57,8 @@ # compile and build our code stuff echo "INFO: compile and build sources" -mvn -f $ARTIFACTS_HG/pom.xml clean compile package -mvn -f $FLYS_HG/flys-backend/pom.xml clean compile package +mvn -f $ARTIFACTS_HG/pom.xml clean compile package install +mvn -f $FLYS_HG/flys-backend/pom.xml clean compile package install mvn -f $FLYS_HG/flys-artifacts/pom.xml clean compile package dependency:copy-dependencies mvn -f $HTTPCLIENT_HG/pom.xml clean compile package install mvn -f $FLYS_HG/flys-client/pom.xml clean compile package @@ -61,7 +70,7 @@ cp $ARTIFACTS_HG/artifacts-common/target/artifacts-common-1.0-SNAPSHOT.jar $DIRECTORY/server/bin/lib/own/ cp $FLYS_HG/flys-backend/target/flys-backend-1.0-SNAPSHOT.jar $DIRECTORY/server/bin/lib/own/ cp $FLYS_HG/flys-artifacts/target/flys-artifacts-1.0-SNAPSHOT.jar $DIRECTORY/server/bin/lib/own/ -cp $FLYS_HG/flys-client/target/FLYS-1.0-SNAPSHOT.war $DIRECTORY/client/ +cp $FLYS_HG/flys-client/target/FLYS-1.0-SNAPSHOT.war $DIRECTORY/client/flys-${RELEASE}.war cp $FLYS_HG/flys-artifacts/target/dependency/* $DIRECTORY/server/bin/lib/ echo "INFO: copy scripts and libraries to target destination" @@ -80,7 +89,28 @@ # fetch the configuration stuff echo "INFO: copy default configuration to target destination" cp -R $FLYS_HG/flys-artifacts/doc/conf $DIRECTORY/server/ -cp confs/* $DIRECTORY/server/conf/ + +#cp confs/* $DIRECTORY/server/conf/ +mkdir -o $DIRECTORY/server/conf + +sed "s/8999/$ARTEFACT_PORT/g" \ + confs/rest-server.xml \ + > $DIRECTORY/server/conf/rest-server.xml + +sed "s@http://czech-republic.intevation.de/@http://flys-devel.intevation.de/@g" \ + "s@flys-default@flys-$RELEASE@g" \ + confs/floodmap.xml \ + > $DIRECTORY/server/conf/floodmap.xml + +sed "s@/tmp/flys-server-default.log@/tmp/flys-server-${RELEASE}.log" \ + confs/log4j.properties \ + > $DIRECTORY/server/conf/log4j.properties + +# TODO: Use templating here +cp confs/seddb-db.xml $DIRECTORY/server/conf/seddb-db.xml +cp confs/backend-db.xml $DIRECTORY/server/conf/backend-db.xml +cp confs/artifact-db.xml $DIRECTORY/server/conf/artifact-db.xml +cp confs/datacage-db.xml $DIRECTORY/server/conf/datacage-db.xml cp $ARTIFACTS_HG/artifact-database/doc/schema-h2.sql h2/artifacts-h2.sql cp $FLYS_HG/flys-artifacts/doc/conf/datacage.sql h2/datacage.sql