Replaced DataServlet with data.xhtml