Blog/Wiki Software

I'm looking for software recommendations. I'm looking for something that's:

• Open-source
• Java-based
• Handles blogs and Wikis
• Preferably using HTML for markup

I've played with SnipSnap a fair bit, and I like it, but I'm not crazy about the Raedox mark-up. (HTML is a perfectly good markup language, I figure).

Also, I really like a lot of the features of Blojsom (especially the developers API), but it doesn't do Wikis.

Anyone tried anything else?