Have you run into problems with just using JNDI?

InitialContext initialContext = new InitialContext();
javax.sql.DataSource ds = (javax.sql.DataSource) initialContext.lookup(datasourcejndiname);
Connection c = ds.getConnection();