Next step after the next step's next step would be to try and move web.xml, err /WEB-INF/, to idp-war so that java-idp-testbed is itself an overlay of idp-war.