I'll reply to your other points a little later, but you should know that WikiPage is *still* broken. Although I can compile the JSPs ok, I'm getting a NoClassDefFound error for org.apache.jspwiki.api.WikiPage when I access Wiki.jsp. I can't figure out how to fix it, and neither can Harry.
See: https://issues.apache.org/jira/browse/JSPWIKI-464 > That's my approach as well, but unfortunately, SVN merges are brittle, > especially with respect to renames of files (which I learned when I moved > WikiPage to *.api - which essentially broke everything.)
