Threads best practices books/sites?

Hey all,

I'm working on a fairly large (~1M LOC) project that far too many
threads (30+).  We're running into an occasional deadlock situation and
although I'm fairly competent in the basics (double checked locking,
groups etc) I'm on the lookout for some books and or sites describing
best practices for dealing with multi threaded Java applications.  I'm
also interested in hearing about what tooling you've used to resolve or
debug deadlocks, Eclipse just doesn't seem to be up to the task.  Most
of our threading issues have to deal with device interfaces server side.

Any recommendations would be most welcome.

Thanks,

        -Fred-