updated jndi, jaas and annotation tests to webapps.demo