I would very much appreciate it if you could post your solution. I ran into the same problem and after a long search, I resigned myself to editing the generated source files to correct the return type...
[Message sent by forum member 'popala' (popala)]
http://forums.java.net/jive/thread.jspa?messageID=234741