adjusted JNDI name lookup technique
removed Java 7 generic syntax