Update for glassfish4 and java
Merge pull request #1 from mattiashem/master

Update for glassfish4 and java