Updated to work purely with jboss 7 and jdk 7