Glassfish, hsqldb and tomcat7 changes