Change junit dependency to junit-dep.  This avoids some classpath problem when using junit-jndi with hamcrest.
implement some additional context methods to make hibernate happy