Reporting app not working in Tomcat

Hello.
 
I'm hoping you can help me.
 
I have a config XML and several delegating build scripts that worked fine 
under Java 5, Tomcat 5.5 and CruiseControl 2.7.1.  Due to a hardware failure, 
I had to move all the software to a new box.  Now we are using Java 6 
(1.6.0_16), Tomcat 6.0 and CruiseControl 2.8.4 under Windows XP SP3.  I 
compiled the source fine - both the build loop and the reporting jsp.  
However, when I deployed the CruiseControl reporting app (cruisecontrol.war) 
to Tomcat, I get an error 500 (type: exception report; description: The server 
encountered an internal error () that prevented it from fulfilling this 
request) in Tomcat and this in the stack trace as the cause of the exception:
NavigationTagExtraInfo cannot be cast to javax.servlet.jsp.tagext.TagExtraInfo
 
I looked this error up and a few posts said something about to not use 
Tomcat's jsp-api.jar in its /lib directory.  So I deleted it, restarted Tomcat 
and now it can't find one of the classes it needs.

I've also tried copying the jsp-api-2.1.jar in reporting\jsp\lib to Tomcat's 
\lib and restarting Tomcat with no luck.

So it looks like I'm stuck.  But there must be something I'm missing.  Can 
anyone shed some light on this for me?
 
Thanks,
 
Larry



------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in  U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store 
http://p.sf.net/sfu/nokia-dev2dev