[PATCH 2 of 2] Entities will be resolved correctly if placeholder is given

Wald Commits scm-commit at wald.intevation.org
Thu Dec 24 19:05:54 CET 2015


# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1450980321 -3600
# Node ID 080ee1c73baba7bda1aa1210b6f283a277f1a5a7
# Parent  a58cbb1b7371b0b66980fb5a7e7343305579312c
Entities will be resolved correctly if placeholder is given.

Works since Rev f099f0b22e62 of framework.
Theme config is thus found regardless of working dir of server.

diff -r a58cbb1b7371 -r 080ee1c73bab artifacts/doc/conf/themes.xml
--- a/artifacts/doc/conf/themes.xml	Thu Dec 24 17:48:42 2015 +0100
+++ b/artifacts/doc/conf/themes.xml	Thu Dec 24 19:05:21 2015 +0100
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE themes [
-    <!ENTITY virtual-themes SYSTEM "conf/themes/virtual.xml">
-    <!ENTITY default-themes SYSTEM "conf/themes/default.xml">
-    <!ENTITY second-themes  SYSTEM "conf/themes/second.xml">
+    <!ENTITY virtual SYSTEM "${artifacts.config.dir}/themes/virtual.xml">
+    <!ENTITY default SYSTEM "${artifacts.config.dir}/themes/default.xml">
+    <!ENTITY second  SYSTEM "${artifacts.config.dir}/themes/second.xml">
 ]>
 <themes>
-    &virtual-themes;
-    &default-themes;
-    &second-themes;
+    &virtual;
+    &default;
+    &second;
 
     <!-- Mappings are following now. A mapping maps between a name of a facet
         and a theme. Always the first matching mapping is taken, so consider putting


More information about the Dive4Elements-commits mailing list