Please find attached a patch to java-ant-2.eclass to support the moving of xml-rewrite-3.py, obviously we will figure out exactly where we are moving it too before I apply this.