update for WFLY8 and Java EE 7