Also added some 5-second timeouts in various places to build.xml because (expected) exceptions were causing ant to hang for a long time, then inexplicably continue.
Code from download was broken -- fixed that but discovered that code from book is different, so included that as well as the main file.
