Portal 2.2.1 fails to deploy on jboss-4.0.4

Portal 2.2.1 fails to deploy on 4.0.4 (latest Branch_4_0), From the server.log:

2006-05-12 11:22:16,353 DEBUG [org.hibernate.impl.SessionFactoryImpl] instantiating session factory with properties:...(I took those off)
2006-05-12 11:22:16,363 WARN [org.jboss.system.ServiceController] Problem starting service portal:service=Hibernate
java.lang.IllegalAccessError: tried to access method net.sf.ehcache.CacheManager.<init>()V from class org.hibernate.cache.EhCacheProvider
at org.hibernate.cache.EhCacheProvider.start(EhCacheProvider.java:124)
at org.hibernate.impl.SessionFactoryImpl.<init>(SessionFactoryImpl.java:180)
at org.hibernate.cfg.Configuration.buildSessionFactory(Configuration.java:1213)
at org.jboss.portal.core.hibernate.SessionFactoryBinder$3.run(SessionFactoryBinder.java:509)
at org.jboss.portal.common.transaction.Transactions.apply(Transactions.java:199)
at org.jboss.portal.common.transaction.Transactions.notSupported(Transactions.java:245)
at org.jboss.portal.core.hibernate.SessionFactoryBinder.createSessionFactory(SessionFactoryBinder.java:505)
at org.jboss.portal.core.hibernate.SessionFactoryBinder.startService(SessionFactoryBinder.java:291)
at org.jboss.system.ServiceMBeanSupport.jbossInternalStart(ServiceMBeanSupport.java:289)