Moving to glassfish to use JSR-356