Changes to allow for ant defaults changing
Changed from the O'Reilly file upload to apache commons
Some more generics