Index: ejb3/.classpath
===================================================================
--- ejb3/.classpath	(revision 81697)
+++ ejb3/.classpath	(working copy)
@@ -23,5 +23,6 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-jpa-deployers/lib/jboss-jpa-deployers.jar" sourcepath="/thirdparty/jboss/jboss-jpa-deployers/lib/jboss-jpa-deployers-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-transactions/lib/jboss-ejb3-transactions.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-transactions/lib/jboss-ejb3-transactions-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-common/lib/jboss-ejb3-common.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>
Index: ejb3/src/main/org/jboss/as/ejb3/connectionmanager/CachedConnectionManagerBridge.java
===================================================================
--- ejb3/src/main/org/jboss/as/ejb3/connectionmanager/CachedConnectionManagerBridge.java	(revision 0)
+++ ejb3/src/main/org/jboss/as/ejb3/connectionmanager/CachedConnectionManagerBridge.java	(revision 0)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.as.ejb3.connectionmanager;
+
+import java.util.Set;
+
+import javax.resource.ResourceException;
+
+import org.jboss.beans.metadata.api.annotations.Inject;
+import org.jboss.ejb3.connectionmanager.CachedConnectionManager;
+
+/**
+ * @author <a href="mailto:cdewolf@redhat.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class CachedConnectionManagerBridge implements CachedConnectionManager
+{
+   private org.jboss.resource.connectionmanager.CachedConnectionManager delegate;
+
+   public CachedConnectionManagerBridge()
+   {
+   }
+   
+   public void popMetaDataAwareObject(Set<String> unsharableResources) throws ResourceException
+   {
+      delegate.popMetaAwareObject(unsharableResources);
+   }
+
+   public void pushMetaDataAwareObject(Object key, Set<String> unsharableResources) throws ResourceException
+   {
+      delegate.pushMetaAwareObject(key, unsharableResources);
+   }
+   
+   @Inject
+   public void setDelegate(org.jboss.resource.connectionmanager.CachedConnectionManager ccm)
+   {
+      this.delegate = ccm;
+   }
+}
Index: ejb3/build.xml
===================================================================
--- ejb3/build.xml	(revision 81697)
+++ ejb3/build.xml	(working copy)
@@ -143,6 +143,7 @@
          <path refid="jboss.common.logging.log4j.classpath"/>
          <path refid="jboss.common.logging.jdk.classpath"/>
          <path refid="jboss.cluster.classpath"/>
+         <path refid="jboss.jca.classpath"/>
          <path refid="jboss.main.classpath"/>
          <path refid="jboss.system.classpath"/>
          <path refid="jboss.systemjmx.classpath"/>
@@ -342,6 +343,7 @@
       </copy>
       <copy todir="${build.lib}">
          <fileset dir="output/resources">
+            <include name="ejb3-container-jboss-beans.xml"/>
             <include name="ejb3-timer-service.xml"/>
             <include name="ejb3-connectors-jboss-beans.xml"/>
             <include name="ejb3-interceptors-aop.xml"/>