EJB v2 and EJB v3 conflict when deploying .ear

Hello all, I'm trying to deploy an .ear, but ran into troubles. Resin
seems to think that I'd like to use EJB v3 (Amber) when I'm not.

Please see the following console paste:

Resin-3.0.s060614 (built Wed, 14 Jun 2006 11:25:12 PDT)
Copyright(c) 1998-2006 Caucho Technology.  All rights reserved.

Starting Resin on Wed, 05 Jul 2006 12:24:01 +0300 (EEST)

[12:24:02.983] Proxy Cache disk-size=1024M memory-size=8M
[12:24:03.358] Server[] starting
[12:24:03.358]
[12:24:03.358] Windows XP 5.1 x86
[12:24:03.358] Java 1.5.0_06-b05, 32, mixed mode, sharing, Cp1252, fi, Sun Microsystems Inc.
[12:24:03.358] resin.home = C:\Java\resin-pro-3.0.s060614
[12:24:03.358] server.root = C:\Java\resin-pro-3.0.s060614
[12:24:03.358]
[snip]
[12:24:04.108] Host[] starting
[12:24:04.248] com.caucho.config.ConfigException: Expected <ejb-server> configured at 'java:comp/env/cmp'
[12:24:04.373] com.caucho.config.ConfigException: Expected <ejb-server> configured at 'java:comp/env/cmp'
[12:24:04.498] com.caucho.config.ConfigException: Expected <ejb-server> configured at 'java:comp/env/cmp'
[12:24:04.545] WebApp[http://localhost:80] starting
[12:24:04.889] WebApp[http://localhost:80/resin-doc] starting
[12:24:04.967] Loaded Socket JNI library.
[12:24:04.967] http listening to *:80
[12:24:04.983] hmux listening to localhost:6800
[12:24:04.983] Resin started in 2625ms
[12:24:40.061] `java:comp/env/persistence/PersistenceUnit/resin-ejb' is a conflicting JNDI resource for `com.caucho.amber.manager.FactoryProxy@14acfcd'
[12:24:40.061] `java:comp/env/persistence/PersistenceContext/resin-ejb' is a conflicting JNDI resource for `com.caucho.amber.manager.EntityManagerNamingProxy@19113f8'
[12:24:40.311] WebApp[http://localhost:80/hallinta] starting
[12:24:40.639] action: init
[12:24:40.686] Initializing, config='org.apache.struts.util.LocalStrings', returnNull=true
[12:24:40.686] Initializing, config='org.apache.struts.action.ActionResources', returnNull=true
[12:24:41.279] Initializing, config='ApplicationResources', returnNull=true
[12:24:41.311] Loading validation rules file from '/WEB-INF/validator-rules.xml'
[12:24:41.873] Tiles definition factory loaded for module ''.
[12:24:41.873] Expected <ejb-server> configured at 'java:comp/env/cmp'

This is how I've got ejb-server block set up in my resin-web.xml:

<ejb-server>
  <config-directory>WEB-INF</config-directory>
</ejb-server>

Is there a way to declare which EJB version to use in ejb-server tag or
so?

Any pointers or suggestions how to fix this?

TIA,

-- Tero