Correctly list all the annotations supported and only use the @MessageLo...

...gger and @MessageBundle annotations.