* JANNE_BRANCH and JSPWIKI_ARJ_BRANCH: What do you do with them? Are these your personal development branches?
Obsolete branches, used to try things out.
* MULTIWIKI_BRANCH: What's this? Just a forgotten outdated thing?
This is a branch which supports multiple wikis, a test on what should be done. It's quite usable, but it does not support the latest functionality.
Generally, I wonder how you manage JSPWiki 3 development in the repository. Seems as if there will be changing nearly everything :-) Andrew is switching the whole GUI to the Stripes Framework according to http://www.jspwiki.org/wiki/JSPWiki3 Is this isolated work or how do the others synchronize with it, while it isn't completely implemented?
It's isolated work, and won't be a base for the JSPWiki work. We will slowly integrate bits and pieces from it (like JDK5) into the trunk.
We like to share our development code as well. Unfortunately it does mean multiple branches...
Background: I'm thinking about which way will be the best for me to develop some JCR functionality (take a snapshot of which branch).
Trunk, or JSPWIKI_2_6_BRANCH, once we do that in a few days. /Janne
