Merge pull request #4 from rotty3000/GERONIMO-6757

GERONIMO-6757 if we can avoid CDI.current by injecting, please do! otherwise go ahead.