After your latest commits, although it seems to work fine but I still get the following exception on server log, while upgrading from Alpha1 to Alpha2 for the first time. Then if I down the server and have it up again, no exception will be on server console.

Other than this problem, everything seems to be fine (here locally on HSQL database).

[java] 2003-10-23 18:46:36,842 ERROR [sf.hibernate.util.XMLHelper] Error parsing XML: hibernate.cfg.xml(27)
[java] org.xml.sax.SAXParseException: The content of element type "session-factory" must match "(property*,mapping+, (class-cache|collection-cache|jcs-class-cache|jcs-collection-cache)*)".
[java] at
org.apache.xerces.util.ErrorHandlerWrapper.createSAXParseException(Unkno
wn Source)
[java] at
org.apache.xerces.util.ErrorHandlerWrapper.error(Unknown Source)
[java] at
org.apache.xerces.impl.XMLErrorReporter.reportError(Unknown Source)
[java] at
org.apache.xerces.impl.XMLErrorReporter.reportError(Unknown Source)
[java] at
org.apache.xerces.impl.dtd.XMLDTDValidator.handleEndElement(Unknown
Source)
[java] at
org.apache.xerces.impl.dtd.XMLDTDValidator.endElement(Unknown Source)
[java] at
org.apache.xerces.impl.XMLNSDocumentScannerImpl.scanEndElement(Unknown
Source)
[java] at
org.apache.xerces.impl.XMLDocumentFragmentScannerImpl$FragmentContentDis
patcher.dispatch(Unknown Sour
ce)
[java] at
org.apache.xerces.impl.XMLDocumentFragmentScannerImpl.scanDocument(Unkno
wn Source)
[java] at
org.apache.xerces.parsers.DTDConfiguration.parse(Unknown Source)
[java] at
org.apache.xerces.parsers.DTDConfiguration.parse(Unknown Source)
[java] at org.apache.xerces.parsers.XMLParser.parse(Unknown
Source)
[java] at
org.apache.xerces.parsers.AbstractSAXParser.parse(Unknown Source)
[java] at org.dom4j.io.SAXReader.read(SAXReader.java:339)
[java] at
net.sf.hibernate.cfg.Configuration.configure(Configuration.java:818)
[java] at
net.sf.hibernate.cfg.Configuration.configure(Configuration.java:765)
[java] at
com.atlassian.confluence.setup.ConfluenceHibernateSetup.getConfluenceHib
ernateConfiguration(Confluenc
eHibernateSetup.java:68)
[java] at
com.atlassian.confluence.upgrade.impl.Build28UpgradeTask.dropUniquenessC
onstraintFromAttachmentFileNa
me(Build28UpgradeTask.java:163)
[java] at
com.atlassian.confluence.upgrade.impl.Build28UpgradeTask.doUpgrade(Build
28UpgradeTask.java:52)
[java] at
com.atlassian.confluence.upgrade.UpgradeLauncher.doUpgrade(UpgradeLaunch
er.java:48)
[java] at
com.atlassian.confluence.upgrade.UpgradeLauncher.doUpgrade(UpgradeLaunch
er.java:27)
[java] at
com.atlassian.confluence.upgrade.UpgradeLauncherServletContextListener.c
ontextInitialized(UpgradeLaun
cherServletContextListener.java:27)
[java] at
com.caucho.server.http.Application.init(Application.java:1843)
[java] at
com.caucho.server.http.VirtualHost.init(VirtualHost.java:728)
[java] at
com.caucho.server.http.ServletServer.initHosts(ServletServer.java:874)
[java] at
com.caucho.server.http.ServletServer.initInternal(ServletServer.java:719
)
[java] at
com.caucho.server.http.ServletServer.init(ServletServer.java:530)
[java] at
com.caucho.server.http.ResinServer.init(ResinServer.java:393)
[java] at
com.caucho.server.http.ResinServer.main(ResinServer.java:1154)
[java] at
com.caucho.server.http.HttpServer.main(HttpServer.java:103)
[java] 2003-10-23 18:46:39,217 WARN [sf.hibernate.impl.SessionFactoryObjectFactory] InitialContext did not implement EventContext
[java] http listening to *:8080
[java] MailQueueFlushJob.MailQueueFlushJob