can't restart confluence after previously trying to upload a plugin

I tried to upload a confluence plugin a few days ago. I don't think it worked right.
But I didn't write down any useful details.

Then today, I upgraded our jira to 3.4.1. It was the first time I restarted confluence since the plugin issue.

Jira seems fine. Yaay!
But my confluence won't start.

There's an error in the catalina.out ...

2005-11-16 04:39:45,338 ERROR [ContainerBase.[Standalone-Confluence].[localhost].[/]] Exception sending context initialized ev
ent to listener instance of class com.atlassian.confluence.util.ConfluenceContextLoaderListener
java.lang.NoClassDefFoundError: org/randombits/confluence/utilities/ConfluenceMacro
at java.lang.ClassLoader.defineClass0(Native Method)
at java.lang.ClassLoader.defineClass(ClassLoader.java:539)
at java.lang.ClassLoader.defineClass(ClassLoader.java:448)
at com.atlassian.plugin.loaders.classloading.PluginsClassLoader.findClass(PluginsClassLoader.java:73)
at java.lang.ClassLoader.loadClass(ClassLoader.java:289)
at com.atlassian.plugin.loaders.classloading.PluginsClassLoader.loadClass(PluginsClassLoader.java:52)
at java.lang.ClassLoader.loadClass(ClassLoader.java:235)
at com.atlassian.plugin.impl.DynamicPlugin.loadClass(DynamicPlugin.java:21)
at com.atlassian.plugin.descriptors.AbstractModuleDescriptor.init(AbstractModuleDescriptor.java:37)
at com.atlassian.plugin.loaders.AbstractXmlPluginLoader.createModuleDescriptor(AbstractXmlPluginLoader.java:90)
at com.atlassian.plugin.loaders.AbstractXmlPluginLoader.configurePlugin(AbstractXmlPluginLoader.java:159)
at com.atlassian.plugin.loaders.ClassLoadingPluginLoader.deployPluginFromUnit(ClassLoadingPluginLoader.java:82)
at com.atlassian.plugin.loaders.ClassLoadingPluginLoader.loadAllPlugins(ClassLoadingPluginLoader.java:51)
at com.atlassian.plugin.DefaultPluginManager.init(DefaultPluginManager.java:42)
at com.atlassian.confluence.plugin.ConfluencePluginManager.onApplicationEvent(ConfluencePluginManager.java:63)
at org.springframework.context.event.SimpleApplicationEventMulticaster.multicastEvent(SimpleApplicationEventMulticaster.java:68)
at org.springframework.context.support.AbstractApplicationContext.publishEvent(AbstractApplicationContext.java:201)
at bucket.container.SpringContainerContext.contextReloaded(SpringContainerContext.java:180)
at bucket.container.ContainerContextLoaderListener.contextInitialized(ContainerContextLoaderListener.java:40)
at org.apache.catalina.core.StandardContext.listenerStart(StandardContext.java:3669)
at org.apache.catalina.core.StandardContext.start(StandardContext.java:4104)
at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1012)
at org.apache.catalina.core.StandardHost.start(StandardHost.java:718)
at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1012)
at org.apache.catalina.core.StandardEngine.start(StandardEngine.java:442)
at org.apache.catalina.core.StandardService.start(StandardService.java:450)
at org.apache.catalina.core.StandardServer.start(StandardServer.java:683)
at org.apache.catalina.startup.Catalina.start(Catalina.java:537)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:324)
at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:271)
at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:409)
Nov 16, 2005 4:39:45 AM org.apache.catalina.core.StandardContext start
SEVERE: Error listenerStart
Nov 16, 2005 4:39:45 AM org.apache.catalina.core.StandardContext start
SEVERE: Context [] startup failed due to previous errors

Any ideas? what should I do ?