Thorsten Scherler wrote: > David Crossley wrote: > ... > > I found the problem. It was the Cocoon configuration file. > > > > In my working setup, i had kept our old configuration > > by copying the content of our main/webapp/WEB-INF/xconf/forrest-core.xconf > > into main/webapp/WEB-INF/cocoon.xconf (see FOR-955). > > > > In your setup, i am not clear where you got the content from. > > Perhaps it was direct from the Cocoon-2.1 cocoon.xconf file > > or from its build/webapp/WEB-INF/cocoon.xconf which is produced > > after processing block configurations. > > Hmm, I thought that I did exactly this (copying the content from our > forrest-core.xconf).
Doing 'diff cocoon.xconf xconf/forrest-core.xconf' shows otherwise. > > So it has some different parameters to ours, e.g. > > the "catalog" parameter for "entity-resolver". > > Hence the error described above. > > Thanks very much to find the cause of the problem and fix it. Now you can remove your symbols-core-v10.ent copies. > > It also uses the "Cocoon properties" system to set some values, e.g. > > <parameter name="freememory" value="${store-janitor.freememory}"/> > > In the Cocoon-2.1 SVN those values come from > > src/webapp/WEB-INF/properties/core.properties > > A while ago i added that ability to Forrest (FOR-917) > > so we should now be able to set up something similar. > > I do not understand I can find > main/webapp/WEB-INF/properties/core.properties but there is no > store-janitor.freememory property in this file. No. See above. That property is in "Cocoon-2.1 SVN". Not ours yet. > If I understand correctly we should move this property (and I guess > other as well) to this properties file, right? Leave it. There are many more to attend to and we need to preserve our existing settings too. As i said, i will do it. > > I will work on this aspect of our upgrade. > > It is a big task. We need to find some way to make > > it easy to keep the configuration synchronised with > > that at Cocoon-2.1 and its blocks config, each time > > we upgrade our packaged Cocoon. > > In lenya there is a cocoon as svn:external that are used every time you > build. There we are patching the default cocoon files like > > <!-- Patch cocoon.xconf --> > <property name="patch.webapp" value="true"/> > <xpatch file="${build.webapp}/WEB-INF/cocoon.xconf" > srcdir="${build.patch}/cocoon-xconf" > includes="prepare/*.xconf" > addComments="true"/> > <xpatch file="${build.webapp}/WEB-INF/cocoon.xconf" > srcdir="${build.patch}/cocoon-xconf" > includes="**/*.xconf" > excludes="prepare/*.xconf" > addComments="false"/> > > Something similar may work for us when we update. The best would be to > use ant to do the update process for us. Thanks. I will investigate. -David