Updated to not depend on jbossas7.