Mercurial > dive4elements > river
changeset 8160:bf890f7ab5b0
Moved external system entites back to conf.xml. Uncool.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Fri, 29 Aug 2014 12:27:35 +0200 |
| parents | 87161da4b444 |
| children | 12587ed181b8 |
| files | artifacts/doc/conf/conf.xml artifacts/doc/conf/generators/discharge-diagrams.xml artifacts/doc/conf/generators/generators.xml artifacts/doc/conf/generators/longitudinal-diagrams.xml |
| diffstat | 4 files changed, 4 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/conf.xml Fri Aug 29 11:56:10 2014 +0200 +++ b/artifacts/doc/conf/conf.xml Fri Aug 29 12:27:35 2014 +0200 @@ -13,6 +13,10 @@ <!ENTITY porosity-artifact SYSTEM "artifacts/porosity.xml"> <!ENTITY sedimentload-artifact SYSTEM "artifacts/sedimentload.xml"> <!ENTITY sedimentload-ls-artifact SYSTEM "artifacts/sedimentload-ls.xml"> + + <!ENTITY discharge-diagrams "generators/discharge-diagrams.xml"> + <!ENTITY longitudinal-diagrams "generators/longitudinal-diagrams.xml"> + <!ENTITY sqrelation-defaults SYSTEM "generators/sqrelation-diagram-defaults.xml"> ]> <artifact-database> <export-secret>YOUR_SECRET</export-secret>
--- a/artifacts/doc/conf/generators/discharge-diagrams.xml Fri Aug 29 11:56:10 2014 +0200 +++ b/artifacts/doc/conf/generators/discharge-diagrams.xml Fri Aug 29 12:27:35 2014 +0200 @@ -1,7 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE discharge-diagrams [ -<!ENTITY sqrelation-defaults SYSTEM "sqrelation-diagram-defaults.xml"> -]> <discharge-diagrams> <output-generator names="discharge_curve" class="org.dive4elements.river.exports.DischargeCurveGenerator"/> <output-generator names="discharge_curve_chartinfo" class="org.dive4elements.river.exports.DischargeCurveInfoGenerator"/>
--- a/artifacts/doc/conf/generators/generators.xml Fri Aug 29 11:56:10 2014 +0200 +++ b/artifacts/doc/conf/generators/generators.xml Fri Aug 29 12:27:35 2014 +0200 @@ -1,8 +1,4 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE output-generators [ -<!ENTITY discharge-diagrams "discharge-diagrams.xml"> -<!ENTITY longitudinal-diagrams "longitudinal-diagrams.xml"> -]> <output-generators> &longitudinal-diagrams; &discharge-diagrams;
--- a/artifacts/doc/conf/generators/longitudinal-diagrams.xml Fri Aug 29 11:56:10 2014 +0200 +++ b/artifacts/doc/conf/generators/longitudinal-diagrams.xml Fri Aug 29 12:27:35 2014 +0200 @@ -1,7 +1,4 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE longitudinal-diagrams [ - <!ENTITY longitudinal-defaults SYSTEM "longitudinal-diagram-defaults.xml"> -]> <longitudinal-diagrams> <output-generator names="longitudinal_section,longitudinal_section_chartinfo,discharge_longitudinal_section,discharge_longitudinal_section_chartinfo"