I tried building your first fix an hour ago, it didn't help (but I found that svn repo builds smoothly, while the source.zip does not complaining about (?) "injection" classes).
Now I tried the new nightly bits and it worked fine! Great!
I've also checked that method-signature="String f1()" now works fine too!
(Thanks to Jim :) )
[Message sent by forum member 'nzinoviev' (nzinoviev)]
http://forums.java.net/jive/thread.jspa?messageID=332778