deploy changed to tomcat7, xsd improved