Get the gradle build working and able to drive the ant test.
Correct the mistakes of my last check-in