[daisy] Ahead warning: merging BRANCH_DOCID into trunk

[Bruno Dumon]

On Fri, 2006-07-07 at 19:35 +0200, Andreas Deininger wrote:
> 2006/7/6, Bruno Dumon <bruno at outerthought.org>:
> > On Thu, 2006-07-06 at 17:49 +0200, Bruno Dumon wrote:
> > > On Thu, 2006-07-06 at 16:24 +0200, Bruno Dumon wrote:
> > > > Hi,
> > > >
> > > > Since the most critical changes on BRANCH_DOCID are done and everything
> > > > compiles and runs again (as far as tested), I'm going to merge the
> > > > branch back to trunk so that development can continue there, without
> > > > having to care about the branch anymore.
> > > >
> > > > People looking for a more stable branch can use BRANCH_1_5_X.
> > > >
> > >
> > > OK, the merge is done now.
> > >
> > > For people working from SVN in development setup:
> > >
> > > * update myconfig.xml with the namespace config, see
> > >   the myconfig.xml.template for an example (just search
> > >   for 'namespace')
> > >
> > > * redo install (create database etc.), or:
> > >     - use database upgrade script (see begining of script
> > >       to customise namespace to same value as entered
> > >       in myconfig.xml -- for dev setup recommended to use DSY)
> > >     - drop fulltext index (and regenerate via jmx afterwards)
> > >     - optionally run docidconvertor tool
> > >
> > > If more information is needed or you run into troubles, just ask for
> > > help.
> 
> Following the instructions, I upgraded an 1.5 instance (more or less)
> successfully. I can run the repository server, however, if I try to
> start the wiki, I'm getting the error given below. Is the wiki ready
> to run with the new namespace-IDs?

Yes, though I still have to do thorough testing (both of the wiki &
repo). Any help is welcome of course :-)

> 
> ERROR [org.apache.catalina.core.ContainerBase.[Catalina].[daisydemo.deininger.net].[/].[Cocoon]]
> Servlet.service() for servlet Cocoon threw exception
> java.lang.NoSuchMethodError:
> org.outerx.daisy.x10.VariantKeyDocument$VariantKey.getDocumentId()J

It should be working.

Make sure you do a clean build, thus execute 'maven clean' or simply
find target -exec rm -rf {} \;

-- 
Bruno Dumon                             http://outerthought.org/
Outerthought - Open Source, Java & XML Competence Support Center
bruno at outerthought.org                          bruno at apache.org