getComponent Spring Application context has not been set

We're moving from 2.3.3 to 2.9.1. I'm pointing to an existing "data" dir. but have removed the confluence.cfg.xml so that the setup license action would fire. When attempting to access Confluence, I get the following error. I see there's a applicationContext.xml in the confluence-2.9.1.jar inside our war file. We are using the WAR version where we add our own extensions with edit-webapp, then use the Confluence build.xml to create the war deployment. What am I missing?

Thanks,
Jim

2008-09-29 18:00:12,223 INFO [com.atlassian.confluence.lifecycle] contextInitialized Starting Confluence 2.9.1 (build #1418) 2008-09-29 18:00:17,566 FATAL [atlassian.spring.container.SpringContainerContext] getComponent Spring Application context has not been set 2008-09-29 18:00:17,597 FATAL [atlassian.spring.container.SpringContainerContext] getComponent Spring Application context has not been set 2008-09-29 18:00:17,597 FATAL [atlassian.spring.container.SpringContainerContext] getComponent Spring Application context has not been set 2008-09-29 18:00:17,644 INFO [com.atlassian.confluence.lifecycle] init Confluence is ready to serve
.......

2008-09-29 18:03:44,784 FATAL [atlassian.spring.container.SpringContainerContext] getComponent Spring Application context has not been set
2008-09-29 18:03:44,800 ERROR [opensymphony.webwork.dispatcher.VelocityResult] doExecute Unable to render Velocity Template, '/setup/setuplicense.vm'
java.lang.IllegalStateException: Spring Application context has not been set
at com.atlassian.spring.container.SpringContainerContext.getComponent(SpringContainerContext.java:48)
at com.atlassian.spring.container.ContainerManager.getComponent(ContainerManager.java:32)
at com.atlassian.confluence.setup.velocity.DynamicPluginResourceLoader.getResourceStream(DynamicPluginResourceLoader.java:28)
at com.atlassian.confluence.util.velocity.ResourceLoaderWrapper.getResourceStream(ResourceLoaderWrapper.java:75)
at com.atlassian.confluence.util.velocity.Velocity13CompatibleResourceLoader.getResourceStream(Velocity13CompatibleResourceLoader.java:36)
at com.atlassian.confluence.util.velocity.ResourceLoaderWrapper.getResourceStream(ResourceLoaderWrapper.java:75)
at com.atlassian.confluence.util.velocity.ConfluenceVelocityResourceManager$DecoratorFilteredResourceLoader.getResourceStream(ConfluenceVeloci
tyResourceManager.java:122)
at org.apache.velocity.Template.process(Template.java:93)
at com.atlassian.confluence.util.velocity.ConfigurableResourceManager.loadResource(ConfigurableResourceManager.java:363)
at com.atlassian.confluence.util.velocity.ConfigurableResourceManager.getResource(ConfigurableResourceManager.java:304)
at org.apache.velocity.runtime.RuntimeInstance.getTemplate(RuntimeInstance.java:1102)
at org.apache.velocity.runtime.RuntimeInstance.getTemplate(RuntimeInstance.java:1077)
at org.apache.velocity.app.VelocityEngine.getTemplate(VelocityEngine.java:528)
at com.opensymphony.webwork.dispatcher.VelocityResult.getTemplate(VelocityResult.java:146)
at com.atlassian.xwork.results.ProfiledVelocityResult.getTemplate(ProfiledVelocityResult.java:34)
at com.opensymphony.webwork.dispatcher.VelocityResult.doExecute(VelocityResult.java:75)
at com.atlassian.xwork.results.ProfiledVelocityResult.doExecute(ProfiledVelocityResult.java:21)
at com.opensymphony.webwork.dispatcher.WebWorkResultSupport.execute(WebWorkResultSupport.java:116)
at com.opensymphony.xwork.DefaultActionInvocation.executeResult(DefaultActionInvocation.java:263)
at com.opensymphony.xwork.DefaultActionInvocation.invoke(DefaultActionInvocation.java:187)