fixed war/jndi names.