Included logging and replaced log4j.xml.