[Dive4elements-commits] [PATCH] Improved build script

Wald Commits scm-commit at wald.intevation.org
Tue Nov 13 19:04:03 CET 2012


# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# 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 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <backend-database>
 
-    <user>flys29</user>
-    	<password>flys29</password>
+    <user>flys293</user>
+    	<password>flys293</password>
     	<dialect>org.hibernate.dialect.PostgreSQLDialect</dialect>
     	<driver>org.postgresql.Driver</driver>
     <url>jdbc:postgresql://czech-republic.atlas.intevation.de:5432/flys29</url>
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 @@
     <!-- This is the default SedDB db configuration. -->
     <user>seddb</user>
     <password>seddbpass</password>
-    <dialect>org.hibernatespatial.oracle.OracleSpatial10gDialect</dialect>
+    <dialect>org.hibernate.dialect.Oracle9iDialect</dialect>
     <driver>oracle.jdbc.driver.OracleDriver</driver>
     <url>jdbc:oracle:thin:@//czech-republic.atlas.intevation.de:1521/XE</url>
 </seddb-database>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
-
-    <context-param>
-        <param-name>server-url</param-name>
-        <param-value>http://localhost:8999</param-value>
-    </context-param>
-
-    <context-param>
-        <param-name>authentication</param-name>
-        <param-value>GGInA</param-value>
-    </context-param>
-
-    <context-param>
-        <param-name>features-file</param-name>
-        <param-value>/WEB-INF/features.xml</param-value>
-    </context-param>
-
-    <context-param>
-        <param-name>log4j-properties</param-name>
-        <param-value>/WEB-INF/log4j.properties</param-value>
-    </context-param>
-
-    <listener>
-        <listener-class>de.intevation.flys.client.server.BaseServletContextListener</listener-class>
-    </listener>
-
-
-  <!-- Servlets -->
-  <servlet>
-    <servlet-name>user</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.UserServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>user</servlet-name>
-    <url-pattern>/flys/user</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>artifact</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.ArtifactServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>artifact</servlet-name>
-    <url-pattern>/flys/artifact</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>getartifact</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.GetArtifactServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>getartifact</servlet-name>
-    <url-pattern>/flys/getartifact</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>cross-section-km</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.CrossSectionKMServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>cross-section-km</servlet-name>
-    <url-pattern>/flys/cross-section-km</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>create-collection</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.CreateCollectionServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>create-collection</servlet-name>
-    <url-pattern>/flys/create-collection</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>rivers</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.RiverServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>rivers</servlet-name>
-    <url-pattern>/flys/rivers</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>gaugeoverviewinfo</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.GaugeOverviewInfoServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>gaugeoverviewinfo</servlet-name>
-    <url-pattern>/flys/gaugeoverviewinfo</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>forward</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.StepForwardServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>forward</servlet-name>
-    <url-pattern>/flys/forward</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>feed</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.FeedServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>feed</servlet-name>
-    <url-pattern>/flys/feed</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>fixings-overview</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.FixingsOverviewServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>fixings-overview</servlet-name>
-    <url-pattern>/flys/fixings-overview</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>advance</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.AdvanceServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>advance</servlet-name>
-    <url-pattern>/flys/advance</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>add-artifact</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.AddArtifactServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>add-artifact</servlet-name>
-    <url-pattern>/flys/add-artifact</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>load-artifact</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.LoadArtifactServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>load-artifact</servlet-name>
-    <url-pattern>/flys/load-artifact</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>describe-collection</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.DescribeCollectionServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>describe-collection</servlet-name>
-    <url-pattern>/flys/describe-collection</url-pattern>
-  </servlet-mapping>
-
-    <servlet>
-    <servlet-name>user-collections</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.UserCollectionsServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>user-collections</servlet-name>
-    <url-pattern>/flys/user-collections</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>distanceinfo</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.DistanceInfoServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>distanceinfo</servlet-name>
-    <url-pattern>/flys/distanceinfo</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>dischargeinfo</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.DischargeInfoServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>dischargeinfo</servlet-name>
-    <url-pattern>/flys/dischargeinfo</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>DischargeInfoXML</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.DischargeInfoXML</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>DischargeInfoXML</servlet-name>
-    <url-pattern>/flys/dischargeinfoxml</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>meta-data</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.MetaDataServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>meta-data</servlet-name>
-    <url-pattern>/flys/meta-data</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>mainvalues</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.WQInfoServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>mainvalues</servlet-name>
-    <url-pattern>/flys/mainvalues</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>gaugeinfo</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.GaugeInfoServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>gaugeinfo</servlet-name>
-    <url-pattern>/flys/gaugeinfo</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>csv</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.CSVExportServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>csv</servlet-name>
-    <url-pattern>/flys/csv</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>ChartOutputService</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.ChartOutputServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>ChartOutputService</servlet-name>
-    <url-pattern>/flys/chart</url-pattern>
-  </servlet-mapping>
-
-  <!-- MapFish Print -->
-  <servlet>
-    <servlet-name>MapOutputService</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.MapOutputServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>MapOutputService</servlet-name>
-    <url-pattern>/flys/map</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>mapfish.print</servlet-name>
-    <servlet-class>org.mapfish.print.servlet.MapPrinterServlet</servlet-class>
-    <init-param>
-      <param-name>config</param-name>
-      <param-value>WEB-INF/config.yaml</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>mapfish.print</servlet-name>
-    <url-pattern>/flys/mapfish-print/*</url-pattern>
-  </servlet-mapping>
-
-  <!-- Servlet to bridge between MapFish Print and FLYS3 -->
-  <servlet>
-    <servlet-name>MapPrintService</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.MapPrintServiceImpl</servlet-class>
-    <init-param>
-      <param-name>config</param-name>
-      <param-value>WEB-INF/config.yaml</param-value>
-    </init-param>
-    <init-param>
-      <param-name>print-url</param-name>
-      <param-value>http://localhost:8888/flys/mapfish-print</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>MapPrintService</servlet-name>
-    <url-pattern>/flys/map-print</url-pattern>
-  </servlet-mapping>
-
-
-  <servlet>
-    <servlet-name>FixingsKMChartService</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.FixingsKMChartServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>FixingsKMChartService</servlet-name>
-    <url-pattern>/flys/fixings-km-chart</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>DistanceInfoXML</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.DistanceInfoXML</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>DistanceInfoXML</servlet-name>
-    <url-pattern>/flys/distanceinfoxml</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>ExportService</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.ExportServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>ExportService</servlet-name>
-    <url-pattern>/flys/export</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>CollectionAttributeService</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.CollectionAttributeServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>CollectionAttributeService</servlet-name>
-    <url-pattern>/flys/collection-attribute</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>CollectionItemAttributeService</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.CollectionItemAttributeServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>CollectionItemAttributeService</servlet-name>
-    <url-pattern>/flys/collection-item-attribute</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>ChartInfoService</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.ChartInfoServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>ChartInfoService</servlet-name>
-    <url-pattern>/flys/chart-info</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>ReportService</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.ReportServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>ReportService</servlet-name>
-    <url-pattern>/flys/report</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>SetCollectionNameService</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.SetCollectionNameServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>SetCollectionNameService</servlet-name>
-    <url-pattern>/flys/set-collectionname</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>SetCollectionTTLService</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.SetCollectionTTLServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>SetCollectionTTLService</servlet-name>
-    <url-pattern>/flys/set-collectionttl</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>DeleteCollectionService</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.DeleteCollectionServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>DeleteCollectionService</servlet-name>
-    <url-pattern>/flys/delete-collection</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>MapInfoService</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.MapInfoServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>MapInfoService</servlet-name>
-    <url-pattern>/flys/map-info</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>getfeatureinfo</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.GFIServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>getfeatureinfo</servlet-name>
-    <url-pattern>/flys/getfeatureinfo</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>getcapabilities</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.GCServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>getcapabilities</servlet-name>
-    <url-pattern>/flys/getcapabilities</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>DescribeArtifactService</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.DescribeArtifactServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>DescribeArtifactService</servlet-name>
-    <url-pattern>/flys/describe</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>remove-artifact</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.RemoveArtifactServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>remove-artifact</servlet-name>
-    <url-pattern>/flys/remove-artifact</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>GetWMSUrls</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.MapUrlServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>GetWMSUrls</servlet-name>
-    <url-pattern>/flys/map-urls</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>FileUpload</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.FileUploadServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>FileUpload</servlet-name>
-    <url-pattern>/flys/fileupload</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>themelisting</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.ThemeListingServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>themelisting</servlet-name>
-    <url-pattern>/flys/themelisting</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>SQKMChart</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.SQKMChartServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>SQKMChart</servlet-name>
-    <url-pattern>/flys/sq-km-chart</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>BedKMChart</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.BedKMChartServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>BedKMChart</servlet-name>
-    <url-pattern>/flys/bed-km-chart</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>BedloadKMChart</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.BedloadKMChartServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>BedloadKMChart</servlet-name>
-    <url-pattern>/flys/bedload-km-chart</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>login</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.LoginServlet</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>login</servlet-name>
-    <url-pattern>/flys/login</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>modules</servlet-name>
-    <servlet-class>de.intevation.flys.client.server.ModuleServiceImpl</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>modules</servlet-name>
-    <url-pattern>/flys/modules</url-pattern>
-  </servlet-mapping>
-
-  <filter>
-    <filter-name>GGInAFilter</filter-name>
-    <filter-class>de.intevation.flys.client.server.GGInAFilter</filter-class>
-    <init-param>
-        <param-name>deactivate</param-name>
-        <param-value>false</param-value>
-    </init-param>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>GGInAFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
-  <!-- Default page to serve -->
-  <welcome-file-list>
-    <welcome-file>FLYS.html</welcome-file>
-  </welcome-file-list>
-
-</web-app>
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 at http://localhost:8181 at http://localhost:$ARTEFACT_PORT at g " \
+       -e "a at http://localhost:8888 at http://localhost:$TOMCAT_PORT at 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 at http://czech-republic.intevation.de/@http://flys-devel.intevation.de/@g" \
+    "s at flys-default@flys-$RELEASE at 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


More information about the Dive4elements-commits mailing list