modifications to use CDI and CODI for transactions - rjrjr