cdi-1.1 Refactoring to make full use of cdi.

CdiConfiguration is now built totally on @Inject dependencies.