Removed deprecated log4j API. Added hypersonic support for a demo. Minor tweaks.