Mercurial > dive4elements > river
diff flys-artifacts/ChangeLog @ 1046:0a5eff5511b1
Fixed flys/issue262: Unified user and system datacage template
flys-artifacts/trunk@2508 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Fri, 19 Aug 2011 09:48:13 +0000 |
| parents | ba840385ad2e |
| children | 38088c982db6 |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Thu Aug 18 14:58:17 2011 +0000 +++ b/flys-artifacts/ChangeLog Fri Aug 19 09:48:13 2011 +0000 @@ -1,3 +1,20 @@ +2011-08-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + Fixed flys/issue262 + + * src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java: + Unified user and system tempate. + Looks for "/artifact-database/metadata/template/text()" + in conf.xml. Defaults to "${artifacts.config.dir}/meta-data.xml". If user id is + given its the default connection for contexts. + + * doc/conf/conf.xml: Adjusted + * doc/conf/meta-data-system.xml, doc/conf/meta-data-user.xml: Deleted. + * doc/conf/meta-data.xml: Unified version of user and system template. + + * src/main/java/de/intevation/flys/artifacts/datacage/templating/App.java: + Adjusted the test program. + 2011-08-18 Sascha L. Teichmann <sascha.teichmann@intevation.de> Fixed flys/issue260