I manually synchronised our cocoon.xconf with that generated when we build Cocoon-2.1 configured for our blocks. I still have more to do. Also need to add configurable values. Will get to that tomorrow.
In forrest trunk we have two config files, almost the same but the one used in webapp mode has a different value for "forrest.plugins" parameter. Need to find a way to handle that. -David
