# HG changeset patch # User Ingo Weinzierl # Date 1315236551 0 # Node ID e6dd52342eb7d104c27c9bd9d992885245257380 # Parent da3c3e286c881348abeb36f34ea1c31c2afd2aa7 Trigger the mapfile creation after WSPLGEN jobs have finished. flys-artifacts/trunk@2645 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r da3c3e286c88 -r e6dd52342eb7 flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Mon Sep 05 14:04:03 2011 +0000 +++ b/flys-artifacts/ChangeLog Mon Sep 05 15:29:11 2011 +0000 @@ -1,3 +1,12 @@ +2011-09-05 Ingo Weinzierl + + * doc/conf/mapserver/layer.vm, + doc/conf/mapserver/mapfile.vm: Small bugfixes and style improvements. + + * src/main/java/de/intevation/flys/wsplgen/JobExecutor.java: Trigger the + MapfileGenerator after a WSPLGEN job has finished regardless if it has + been finished successfully or not. + 2011-09-05 Ingo Weinzierl * pom.xml: Added Apache Velocity 1.7 for templating support. diff -r da3c3e286c88 -r e6dd52342eb7 flys-artifacts/doc/conf/mapserver/layer.vm --- a/flys-artifacts/doc/conf/mapserver/layer.vm Mon Sep 05 14:04:03 2011 +0000 +++ b/flys-artifacts/doc/conf/mapserver/layer.vm Mon Sep 05 15:29:11 2011 +0000 @@ -1,6 +1,6 @@ LAYER NAME "$LAYER.getIdentifier()" - TYPE "$LAYER.getType()" + TYPE $LAYER.getType() DATA "$LAYER.getIdentifier()/$LAYER.getData()" STATUS ON TEMPLATE map.html @@ -15,9 +15,8 @@ CLASS NAME "Layer" STYLE - SYMBOl 'point' SIZE 5 - COLOR "#FFFF00" + COLOR "#66CCFF" END END END diff -r da3c3e286c88 -r e6dd52342eb7 flys-artifacts/doc/conf/mapserver/mapfile.vm --- a/flys-artifacts/doc/conf/mapserver/mapfile.vm Mon Sep 05 14:04:03 2011 +0000 +++ b/flys-artifacts/doc/conf/mapserver/mapfile.vm Mon Sep 05 15:29:11 2011 +0000 @@ -3,7 +3,7 @@ STATUS ON SIZE 600 400 MAXSIZE 4000 - EXTENT -1 53 11 58 + EXTENT -90 -180 90 180 UNITS DD SHAPEPATH $SHAPEFILEPATH FONTSET "fontset.txt" @@ -30,6 +30,7 @@ "wms_contactvoicetelephone" "Any's telephone number" "wms_srs" "EPSG:4326 EPSG:31466 EPSG:31467" "wms_feature_info_mime_type" "text/html" + "ows_enable_request" "*" END END diff -r da3c3e286c88 -r e6dd52342eb7 flys-artifacts/src/main/java/de/intevation/flys/wsplgen/JobExecutor.java --- a/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/JobExecutor.java Mon Sep 05 14:04:03 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/wsplgen/JobExecutor.java Mon Sep 05 15:29:11 2011 +0000 @@ -10,6 +10,8 @@ import de.intevation.flys.artifacts.model.WSPLGENJob; +import de.intevation.flys.utils.MapfileGenerator; + public class JobExecutor { @@ -78,6 +80,8 @@ logger.info("WSPLGEN exit value: " + process.exitValue()); + MapfileGenerator.getInstance().update(); + return; } }