Update Agorava version.
Simplified code to use Agorava and Deltaspike features
Refactoring