Glassfish, hsqldb and tomcat7 changes
Merge pull request #2 from anr-ru/alex-dev

Glassfish, hsqldb and tomcat7 changes