WINK-388 - Applying patch from Gerhard Petracek that reworks cdi integration

git-svn-id: https://svn.apache.org/repos/asf/wink/trunk@1506382 13f79535-47bb-0310-9956-ffa450edef68
36 files changed