-- updated for JBoss 5 and 6