restore 1.4RC4 -> 1.4 xml parsing error

Hi,

It looks like the backup formats are different from Confluence 1.4RC2 to Confluence 1.4 for the entities.xml file.

I've dug through both and here is one difference:

1.4RC2:
<property name="content">Return-Path: <dave@atlassian.com>
Received: from [192.168.0.71] (b128D.static.pacific.net.au [202.7.87.141])

1.4
<property name="content"><![CDATA[Return-Path: <charles@atlassian.com>
Received: from [192.168.0.56] (b128D.static.pacific.net.au [202.7.87.141])

This is one example of where the parser for 1.4 is choking on the restore.

We actually have some data in our 1.4RC2 instance. I know that RC2 was unsupported. Short of pointing out a fix for that could you offer any advice?

Attached are the two different files. Seach on <dave@atlassian.com> in an editor with XML highlighting (JEdit or whatever) and you'll quicly see the differences.

I went in to try and manually fix a few things but no luck. Copied below is the top of the exception:
-----------------------------------------------------
2005-05-25 16:17:25,421 ERROR [atlassian.confluence.util.ReverseDatabinder] Erro
r parsing entities.xml : line [859], col [44].
org.xml.sax.SAXParseException: Element type "dave" must be followed by either at
tribute specifications, ">" or "/>".
at org.apache.xerces.util.ErrorHandlerWrapper.createSAXParseException(Un
known Source)
at org.apache.xerces.util.ErrorHandlerWrapper.fatalError(Unknown Source)

at org.apache.xerces.impl.XMLErrorReporter.reportError(Unknown Source)
---------------------------------------------------