complete Dijkstra:
minor changes
update build.xml and META-INF
extract a TestSetting