adjusted JNDI name lookup technique
removed Java 7 generic syntax
added tx attributes
Merge branch 'working' into ejb-working