Corrected JNDI locations.
Fixed some demo code.