eliminated more jetty and hsqldb things; formatted xml