You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by da...@apache.org on 2006/12/05 21:59:36 UTC

svn commit: r482779 - in /incubator/openejb/trunk/openejb3: ./ assembly/openejb-itests-webapp/src/main/webapp/META-INF/ container/openejb-core/ container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/ container/openejb-core/...

Author: dain
Date: Tue Dec  5 12:59:32 2006
New Revision: 482779

URL: http://svn.apache.org/viewvc?view=rev&rev=482779
Log:
CMP 1.x using JPA is now working

Added:
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngineFactory.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/
    incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/
    incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/jpa.mapping.xml
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/temp-persistence.xml
Removed:
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpTxPolicy.java
Modified:
    incubator/openejb/trunk/openejb3/assembly/openejb-itests-webapp/src/main/webapp/META-INF/openejb-jar.xml
    incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCmpEngine.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/AbstractDeploymentFactory.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpEngine.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf
    incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/openejb-jar.xml
    incubator/openejb/trunk/openejb3/container/openejb-persistence/pom.xml
    incubator/openejb/trunk/openejb3/container/openejb-persistence/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
    incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/resources/META-INF/persistence.xml
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/openejb-jar.xml
    incubator/openejb/trunk/openejb3/pom.xml

Modified: incubator/openejb/trunk/openejb3/assembly/openejb-itests-webapp/src/main/webapp/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/assembly/openejb-itests-webapp/src/main/webapp/META-INF/openejb-jar.xml?view=diff&rev=482779&r1=482778&r2=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/assembly/openejb-itests-webapp/src/main/webapp/META-INF/openejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb3/assembly/openejb-itests-webapp/src/main/webapp/META-INF/openejb-jar.xml Tue Dec  5 12:59:32 2006
@@ -27,7 +27,7 @@
                 </method-params>
             </query-method>
             <object-ql>
-                SELECT o FROM org.apache.openejb.test.entity.cmp.BasicCmpBean o WHERE o.lastName = $1
+                SELECT o FROM BasicCmpBean o WHERE o.lastName = ?1
             </object-ql>
         </query> 
     </ejb-deployment>

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml?view=diff&rev=482779&r1=482778&r2=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml Tue Dec  5 12:59:32 2006
@@ -131,6 +131,11 @@
       <artifactId>openejb-jee</artifactId>
       <version>${pom.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>openejb-persistence</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
     <!-- ActiveMQ -->
     <dependency>
       <groupId>org.apache.activemq</groupId>
@@ -157,6 +162,11 @@
     <!-- end castor deps -->
 
     <dependency>
+        <groupId>org.apache.openjpa</groupId>
+        <artifactId>openjpa-persistence-jdbc</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-connector</artifactId>
     </dependency>
@@ -271,6 +281,20 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+      <version>1.2.1</version>
+      <scope>test</scope>
+    </dependency>
+    <!-- used by dbcp -->
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.1</version>
+      <scope>test</scope>
     </dependency>
 
     <!-- Spring dependencies -->

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCmpEngine.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCmpEngine.java?view=diff&rev=482779&r1=482778&r2=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCmpEngine.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/containers/castor_cmp11/CastorCmpEngine.java Tue Dec  5 12:59:32 2006
@@ -23,14 +23,12 @@
 import org.apache.openejb.core.ThreadContext;
 import org.apache.openejb.core.cmp.CmpCallback;
 import org.apache.openejb.core.cmp.CmpEngine;
-import org.apache.openejb.resource.jdbc.JdbcConnectionFactory;
 import org.apache.openejb.util.Logger;
 import org.exolab.castor.jdo.Database;
 import org.exolab.castor.jdo.JDOManager;
 import org.exolab.castor.jdo.OQLQuery;
 import org.exolab.castor.jdo.PersistenceException;
 import org.exolab.castor.jdo.QueryResults;
-import org.exolab.castor.jdo.TransactionNotInProgressException;
 import org.exolab.castor.mapping.AccessMode;
 import org.exolab.castor.persist.spi.CallbackInterceptor;
 import org.exolab.castor.persist.spi.InstanceFactory;
@@ -43,7 +41,7 @@
 import javax.ejb.FinderException;
 import javax.ejb.RemoveException;
 import javax.naming.InitialContext;
-import javax.persistence.EntityTransaction;
+import javax.sql.DataSource;
 import javax.transaction.TransactionManager;
 import java.io.File;
 import java.io.IOException;
@@ -57,17 +55,19 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.StringTokenizer;
 
 public class CastorCmpEngine implements CmpEngine {
     private static final Logger logger = Logger.getInstance("OpenEJB", "org.apache.openejb.core.cmp");
     private static final Object[] NO_ARGS = new Object[0];
     private static final String TRANSACTION_MANAGER_JNDI_NAME = "java:openejb/TransactionManager";
 
-    private final JDOManager localJdoManager;
     private final JDOManager globalJdoManager;
     private final CmpCallback cmpCallback;
     private final JndiTxReference txReference;
 
+    private final Map<String,String> abstractSchemaMap = new HashMap<String,String>();
+
     public CastorCmpEngine(String jarPath, CmpCallback cmpCallback, TransactionManager transactionManager, String engine, String connectorName, ClassLoader classLoader) throws OpenEJBException {
         this.cmpCallback = cmpCallback;
 
@@ -115,7 +115,7 @@
             }
 
             String jdbcName = "java:openejb/connector/" + connectorName;
-            JdbcConnectionFactory connectionFactory = (JdbcConnectionFactory) new InitialContext().lookup(jdbcName);
+            DataSource connectionFactory = (DataSource) new InitialContext().lookup(jdbcName);
             if (connectionFactory == null) {
                 throw new OpenEJBException(jdbcName + " does not exist");
             }
@@ -124,10 +124,6 @@
             globalJdoManager.setDatabasePooling(true);
             globalJdoManager.setCallbackInterceptor(new CastorCallbackInterceptor());
             globalJdoManager.setInstanceFactory(new CastorInstanceFactory());
-
-            localJdoManager = jdoManagerBuilder.buildLocalJDOManager(connectionFactory.getJdbcDriver(), connectionFactory.getJdbcUrl(), connectionFactory.getDefaultUserName(), connectionFactory.getDefaultPassword());
-            localJdoManager.setCallbackInterceptor(new CastorCallbackInterceptor());
-            localJdoManager.setInstanceFactory(new CastorInstanceFactory());
         } catch (Exception e) {
             e.printStackTrace();
             throw new OpenEJBException("Unable to construct the Castor JDOManager objects: " + e.getClass().getName() + ": " + e.getMessage(), e);
@@ -137,23 +133,14 @@
     public void deploy(CoreDeploymentInfo deploymentInfo) throws SystemException {
         bindTransactionManagerReference(deploymentInfo);
         configureKeyGenerator(deploymentInfo);
-    }
-
-    public EntityTransaction getTransaction() {
-        try {
-            Database database = localJdoManager.getDatabase();
-            return new CastorEntityTransaction(database);
-        } catch (PersistenceException e) {
-            throw new javax.persistence.PersistenceException(e);
-        }
+        String beanClassName = deploymentInfo.getBeanClass().getName();
+        String abstractSchemaName = beanClassName.substring(beanClassName.lastIndexOf('.') + 1);
+        abstractSchemaMap.put(abstractSchemaName, beanClassName);
     }
 
     public Object createBean(EntityBean bean, ThreadContext callContext) throws CreateException {
         try {
-            Database db = getDatabase(callContext);
-
-            // Create a Castor Transaction if there isn't one in progress
-            if (!db.isActive()) db.begin();
+            Database db = getDatabase();
 
             // Use Castor JDO to insert the entity bean into the database
             db.create(bean);
@@ -173,7 +160,7 @@
 
     public Object loadBean(ThreadContext callContext, Object primaryKey) {
         try {
-            Database db = getDatabase(callContext);
+            Database db = getDatabase();
 
             Object castorPrimaryKey = getCastorPrimaryKey(callContext, primaryKey);
             Object bean = db.load(callContext.getDeploymentInfo().getBeanClass(), castorPrimaryKey);
@@ -185,9 +172,7 @@
 
     public void removeBean(ThreadContext callContext) {
         try {
-            Database db = getDatabase(callContext);
-
-            if (!db.isActive()) db.begin();
+            Database db = getDatabase();
 
             Object primaryKey = getCastorPrimaryKey(callContext, callContext.getPrimaryKey());
             Object bean = db.load(callContext.getDeploymentInfo().getBeanClass(), primaryKey);
@@ -198,11 +183,10 @@
     }
 
     public List<Object> queryBeans(ThreadContext callContext, String queryString, Object[] args) throws FinderException {
+        // EJB-QL and OQL are close enough we try to support both for basic queries
+        queryString = preprocessQuery(queryString);
         try {
-            Database db = getDatabase(callContext);
-
-            // Create a Castor Transaction if there isn't one in progress
-            if (!db.isActive()) db.begin();
+            Database db = getDatabase();
 
             /*
               Obtain a OQLQuery object based on the String query
@@ -279,6 +263,58 @@
         }
     }
 
+    private String preprocessQuery(String queryString) {
+        // OQL uses FQN for abstract schema name so replace abstract
+        // schema name with FQN
+        String lowerCase = queryString.toLowerCase();
+        int fromStart = lowerCase.indexOf("from") + 4;
+        int fromEnd = lowerCase.indexOf("where", fromStart);
+        if (fromEnd < 0) {
+            fromEnd = lowerCase.indexOf("group", fromStart);
+        }
+        if (fromEnd < 0) {
+            fromEnd = lowerCase.indexOf("order", fromStart);
+        }
+        if (fromEnd < 0) {
+            fromEnd = lowerCase.indexOf("limit", fromStart);
+        }
+        String selectClause = queryString.substring(0, fromStart);
+        String fromClause = queryString.substring(fromStart, fromEnd);
+        String remaining = queryString.substring(fromEnd);
+
+        StringBuilder newFromClause = new StringBuilder(fromClause.length() * 2);
+        for (StringTokenizer iteratorDefTokenizer = new StringTokenizer(fromClause, ","); iteratorDefTokenizer.hasMoreTokens();) {
+            String iteratorDef = iteratorDefTokenizer.nextToken();
+            boolean isFirst = true;
+            for (StringTokenizer tokenizer = new StringTokenizer(iteratorDef); tokenizer.hasMoreTokens();) {
+                String identifier = tokenizer.nextToken();
+                if (isFirst) {
+                    String newIdentifier = abstractSchemaMap.get(identifier);
+                    if (newIdentifier != null) {
+                        identifier = newIdentifier;
+                    }
+                    isFirst = false;
+                }
+                newFromClause.append(identifier);
+                if (tokenizer.hasMoreTokens()) {
+                    newFromClause.append(" ");
+                }
+            }
+            if (iteratorDefTokenizer.hasMoreTokens()) {
+                newFromClause.append(",");
+            }
+        }
+
+        String newQueryString = selectClause + " " + newFromClause + " " + remaining;
+
+        // OQL uses $N for parameters and EJBQL uses ?N, so lets replace any
+        // occurance of ? with $ which works since ? is an illegal character
+        // in an OQL query
+        newQueryString = newQueryString.replace('?', '$');
+
+        return newQueryString;
+    }
+
     private Object getCastorPrimaryKey(ThreadContext callContext, Object primaryKey) {
         KeyGenerator kg = callContext.getDeploymentInfo().getKeyGenerator();
         if (kg.isKeyComplex()) {
@@ -288,32 +324,8 @@
         }
     }
 
-    private Database getDatabase(ThreadContext callContext) throws PersistenceException {
-        CastorEntityTransaction castorEntityTransaction = (CastorEntityTransaction) callContext.getUnspecified();
-        if (castorEntityTransaction != null) {
-            return castorEntityTransaction.database;
-        } else {
-            /*
-             BIG PROBLEM: Transacitons should use the same Database object.
-             If Thomas won't put this into JDO then I'll have to put into the
-             container.
-
-             1. Check thread to see if current transacion is mapped to any
-                existing Database object.
-
-             2. If it is, return that Database object.
-
-             3. If not obtain new Database object
-
-             4. Register the Tranaction and Database object in a hashmap keyed
-                by tx.
-
-             5. When transaction completes, remove tx-to-database mapping from
-                hashmap.
-
-             */
-            return globalJdoManager.getDatabase();
-        }
+    private Database getDatabase() throws PersistenceException {
+        return globalJdoManager.getDatabase();
     }
 
     /**
@@ -393,64 +405,6 @@
         }
 
         public void updated(Object bean) {
-        }
-    }
-
-    public static class CastorEntityTransaction implements EntityTransaction {
-        private final Database database;
-        private boolean rollbackOnly;
-
-        public CastorEntityTransaction(Database database) {
-            this.database = database;
-        }
-
-        public Database getDatabase() {
-            return database;
-        }
-
-        public void begin() {
-            if (database.isActive()) throw new IllegalStateException("Transaction already in progress");
-
-            try {
-                database.begin();
-            } catch (PersistenceException e) {
-                throw new javax.persistence.PersistenceException(e);
-            }
-        }
-
-        public void commit() {
-            try {
-                if (rollbackOnly) {
-                    database.rollback();
-                    throw new javax.persistence.RollbackException();
-                } else {
-                    database.commit();
-                }
-            } catch (TransactionNotInProgressException e) {
-                throw new IllegalStateException("Transaction not in progress");
-            } catch (PersistenceException e) {
-                throw new javax.persistence.PersistenceException(e);
-            }
-        }
-
-        public void rollback() {
-            try {
-                database.rollback();
-            } catch (TransactionNotInProgressException e) {
-                throw new IllegalStateException("Transaction not in progress");
-            }
-        }
-
-        public boolean isActive() {
-            return database.isActive();
-        }
-
-        public void setRollbackOnly() {
-            rollbackOnly = true;
-        }
-
-        public boolean getRollbackOnly() {
-            return rollbackOnly;
         }
     }
 }

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/AbstractDeploymentFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/AbstractDeploymentFactory.java?view=diff&rev=482779&r1=482778&r2=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/AbstractDeploymentFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/AbstractDeploymentFactory.java Tue Dec  5 12:59:32 2006
@@ -195,7 +195,21 @@
         if (path.startsWith("jar:")){
             path = path.replaceFirst("^jar:","");
             path = path.replaceFirst("!.*","");
+        } else {
+            try {
+                URI uri = new URI(path);
+                File file = new File(uri).getParentFile();
+                for (byte b : name.getBytes()) {
+                    if (b == '/') {
+                        file = file.getParentFile();
+                    }
+                }
+                return file.getAbsolutePath();
+            } catch (URISyntaxException e) {
+                return null;
+            }
         }
+
         try {
             URI uri = new URI(path);
             File file = new File(uri);

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java?view=diff&rev=482779&r1=482778&r2=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreDeploymentInfo.java Tue Dec  5 12:59:32 2006
@@ -40,7 +40,6 @@
 import org.apache.openejb.InterfaceType;
 import org.apache.openejb.DeploymentInfo;
 import org.apache.openejb.BeanType;
-import org.apache.openejb.core.cmp.CmpTxPolicy;
 import org.apache.openejb.alt.containers.castor_cmp11.KeyGenerator;
 import org.apache.openejb.core.entity.EntityEjbHomeHandler;
 import org.apache.openejb.core.ivm.EjbHomeProxyHandler;
@@ -231,8 +230,8 @@
                 policy = new TxNotSupported((TransactionContainer) container);
                 policy = new StatefulContainerManagedTxPolicy(policy);
             } else if (componentType == BeanType.CMP_ENTITY) {
-                policy = new TxNotSupported((TransactionContainer) container);
-                policy = new CmpTxPolicy(policy);
+                // default cmp policy is required
+                policy = new TxRequired((TransactionContainer) container);
             } else {
                 policy = new TxNotSupported((TransactionContainer) container);
             }
@@ -466,9 +465,6 @@
 
                 policy = new StatefulContainerManagedTxPolicy(policy);
             }
-
-        } else if (componentType == BeanType.CMP_ENTITY) {
-            policy = new CmpTxPolicy(policy);
         }
         methodTransactionAttributes.put(method, byteValue);
         methodTransactionPolicies.put(method, policy);

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java?view=diff&rev=482779&r1=482778&r2=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpContainer.java Tue Dec  5 12:59:32 2006
@@ -30,6 +30,9 @@
 import org.apache.openejb.core.transaction.TransactionContainer;
 import org.apache.openejb.core.transaction.TransactionPolicy;
 import org.apache.openejb.core.transaction.TransactionContext;
+import org.apache.openejb.core.transaction.TxRequired;
+import org.apache.openejb.core.transaction.TxManditory;
+import org.apache.openejb.core.transaction.TxRequiresNew;
 import org.apache.openejb.core.CoreDeploymentInfo;
 import org.apache.openejb.core.ThreadContext;
 import org.apache.openejb.core.Operations;
@@ -423,6 +426,9 @@
         Object primaryKey = null;
 
         TransactionPolicy txPolicy = deploymentInfo.getTransactionPolicy(callMethod);
+        if (!(txPolicy instanceof TxRequired) && !(txPolicy instanceof TxRequiresNew) && !(txPolicy instanceof TxManditory)) {
+            throw new IllegalArgumentException("Only required, requires new, and manditory transaction policies are supported for CMP beans: " + txPolicy.getClass().getName());
+        }
         TransactionContext txContext = new TransactionContext(callContext, transactionManager);
 
         txPolicy.beforeInvoke(bean, txContext);

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpEngine.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpEngine.java?view=diff&rev=482779&r1=482778&r2=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpEngine.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/CmpEngine.java Tue Dec  5 12:59:32 2006
@@ -29,7 +29,6 @@
 import java.lang.reflect.Method;
 
 public interface CmpEngine {
-    EntityTransaction getTransaction();
 
     Object createBean(EntityBean entity, ThreadContext callContext) throws CreateException;
 

Added: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java?view=auto&rev=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java (added)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngine.java Tue Dec  5 12:59:32 2006
@@ -0,0 +1,354 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.openejb.core.cmp.jpa;
+
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.SystemException;
+import org.apache.openejb.alt.containers.castor_cmp11.JndiTxReference;
+import org.apache.openejb.alt.containers.castor_cmp11.KeyGenerator;
+import org.apache.openejb.alt.containers.castor_cmp11.KeyGeneratorFactory;
+import org.apache.openejb.core.CoreDeploymentInfo;
+import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.core.cmp.CmpCallback;
+import org.apache.openejb.core.cmp.CmpEngine;
+import org.apache.openejb.persistence.PersistenceUnitInfoImpl;
+import org.apache.openejb.resource.jdbc.JdbcConnectionFactory;
+import org.apache.openejb.util.Logger;
+import org.apache.openjpa.event.AbstractLifecycleListener;
+import org.apache.openjpa.event.LifecycleEvent;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+
+import javax.ejb.CreateException;
+import javax.ejb.EntityBean;
+import javax.ejb.FinderException;
+import javax.ejb.RemoveException;
+import javax.ejb.EJBObject;
+import javax.naming.InitialContext;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceException;
+import javax.persistence.Query;
+import javax.persistence.spi.PersistenceProvider;
+import javax.persistence.spi.PersistenceUnitTransactionType;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.WeakHashMap;
+
+public class JpaCmpEngine implements CmpEngine {
+    private static final Logger logger = Logger.getInstance("OpenEJB", "org.apache.openejb.core.cmp");
+    private static final Object[] NO_ARGS = new Object[0];
+    private static final String JAVA_TRANSACTION_MANAGER = "java:TransactionManager";
+
+    private final CmpCallback cmpCallback;
+    private final TransactionManager transactionManager;
+    private final JndiTxReference txReference;
+    private final EntityManager entityManager;
+
+    private final Map<Transaction, Object> transactionData = new WeakHashMap<Transaction, Object>();
+
+    public JpaCmpEngine(CmpCallback cmpCallback, TransactionManager transactionManager, String connectorName, ClassLoader classLoader) throws OpenEJBException {
+        this.cmpCallback = cmpCallback;
+        this.transactionManager = transactionManager;
+
+        txReference = new JndiTxReference(transactionManager);
+
+        try {
+            JdbcConnectionFactory dataSource;
+            String jdbcName = "java:openejb/connector/" + connectorName;
+            dataSource = (JdbcConnectionFactory) new InitialContext().lookup(jdbcName);
+            if (dataSource == null) {
+                throw new OpenEJBException(jdbcName + " does not exist");
+            }
+
+            PersistenceUnitInfoImpl unitInfo = new PersistenceUnitInfoImpl();
+            unitInfo.setPersistenceUnitName("CMP");
+            unitInfo.setPersistenceProviderClassName("org.apache.openjpa.persistence.PersistenceProviderImpl");
+            unitInfo.setClassLoader(classLoader);
+            unitInfo.setExcludeUnlistedClasses(false);
+//            unitInfo.setJarFileUrls(pu.getJarFile());
+
+            unitInfo.setJtaDataSource(dataSource);
+
+//        unitInfo.setManagedClassNames(pu.getClazz());
+            unitInfo.setMappingFileNames(Collections.singletonList("META-INF/jpa.mapping.xml"));
+
+            // Handle Properties
+            Properties properties = new Properties();
+            unitInfo.setProperties(properties);
+
+            unitInfo.setTransactionType(PersistenceUnitTransactionType.JTA);
+
+            // Non JTA Datasource
+//            DataSource nonJtaDataSource = dataSourceResolver.getDataSource(dataSource);
+//            unitInfo.setNonJtaDataSource(nonJtaDataSource);
+
+//            String rootUrlPath = url.toExternalForm().replaceFirst("!?META-INF/persistence.xml$","");
+//            unitInfo.setPersistenceUnitRootUrl(new URL(rootUrlPath));
+
+            // TODO - What do we do here?
+            // unitInfo.setNewTempClassLoader(???);
+
+            String persistenceProviderClassName = unitInfo.getPersistenceProviderClassName();
+            Class clazz = classLoader.loadClass(persistenceProviderClassName);
+            PersistenceProvider persistenceProvider = (PersistenceProvider) clazz.newInstance();
+            EntityManagerFactory emf = persistenceProvider.createContainerEntityManagerFactory(unitInfo, new HashMap());
+            new InitialContext().bind(JAVA_TRANSACTION_MANAGER, transactionManager);
+            entityManager = emf.createEntityManager();
+
+            if (entityManager instanceof OpenJPAEntityManager) {
+                OpenJPAEntityManager openjpaEM = (OpenJPAEntityManager) entityManager;
+                openjpaEM.addLifecycleListener(new OpenJPALifecycleListener(), (Class[])null);
+            }
+
+        } catch (Exception e) {
+            throw new OpenEJBException(e);
+        }
+        if (!entityManager.isOpen()) {
+            throw new OpenEJBException("failed");
+        }
+    }
+
+    public void deploy(CoreDeploymentInfo deploymentInfo) throws SystemException {
+        bindTransactionManagerReference(deploymentInfo);
+        configureKeyGenerator(deploymentInfo);
+    }
+
+    private EntityManager getEntityManager() {
+        try {
+            Transaction transaction = transactionManager.getTransaction();
+            if (!transactionData.containsKey(transaction)) {
+                entityManager.joinTransaction();
+                transactionData.put(transaction, new Object());
+            }
+        } catch (javax.transaction.SystemException e) {
+            throw new RuntimeException(e);
+        }
+        return entityManager;
+    }
+
+    public Object createBean(EntityBean bean, ThreadContext callContext) throws CreateException {
+        EntityManager entityManager = getEntityManager();
+        entityManager.persist(bean);
+
+        // extract the primary key from the bean
+        CoreDeploymentInfo deploymentInfo = callContext.getDeploymentInfo();
+        KeyGenerator kg = deploymentInfo.getKeyGenerator();
+        Object primaryKey = kg.getPrimaryKey(bean);
+
+        return primaryKey;
+    }
+
+    public Object loadBean(ThreadContext callContext, Object primaryKey) {
+        Class<?> beanClass = callContext.getDeploymentInfo().getBeanClass();
+        EntityManager entityManager = getEntityManager();
+        Object bean = entityManager.find(beanClass, primaryKey);
+        return bean;
+    }
+
+    public void removeBean(ThreadContext callContext) {
+        Class<?> beanClass = callContext.getDeploymentInfo().getBeanClass();
+
+        EntityManager entityManager = getEntityManager();
+        Object bean = entityManager.find(beanClass, callContext.getPrimaryKey());
+        entityManager.remove(bean);
+    }
+
+    public List<Object> queryBeans(ThreadContext callContext, String queryString, Object[] args) throws FinderException {
+        logger.error("Executing query " + queryString);
+        EntityManager entityManager = getEntityManager();
+        Query query = entityManager.createQuery(queryString);
+        // process args
+        if (args == null) {
+            args = NO_ARGS;
+        }
+        for (int i = 0; i < args.length; i++) {
+            Object arg = args[i];
+                if (arg instanceof EJBObject) {
+                    // todo replace EjbObject arg with actual bean instance from EjbObject
+//                    try {
+//                        Object pk = ((EJBObject) arg).getPrimaryKey();
+//                        Object bean = entityManager.find(beanClass, pk);
+//                        arg = bean;
+//                    } catch (RemoteException re) {
+//                        throw new FinderException("Could not extract primary key from EJBObject reference; argument number " + i);
+//                    }
+                }
+            query.setParameter(i + 1, arg);
+        }
+
+        // todo results should not be iterated over, but should insted
+        // perform all work in a wrapper list on demand by the application code
+        List results = query.getResultList();
+        for (Object value : results) {
+            if (value instanceof EntityBean) {
+                // todo don't activate beans already activated
+                EntityBean entity = (EntityBean) value;
+                cmpCallback.ejbActivate(entity);
+            }
+        }
+        return results;
+    }
+
+    private void bindTransactionManagerReference(CoreDeploymentInfo deploymentInfo) throws SystemException {
+        // todo remove when openjpa tx starts working again
+        try {
+            deploymentInfo.getJndiEnc().bind(JAVA_TRANSACTION_MANAGER, txReference);
+        } catch (Exception e) {
+            logger.error("Unable to bind TransactionManager to deployment id = " + deploymentInfo.getDeploymentID() + " using JNDI name = \"" + JAVA_TRANSACTION_MANAGER + "\"", e);
+            throw new SystemException("Unable to bind TransactionManager to deployment id = " + deploymentInfo.getDeploymentID() + " using JNDI name = \"" + JAVA_TRANSACTION_MANAGER + "\"", e);
+        }
+    }
+
+    private void configureKeyGenerator(CoreDeploymentInfo di) throws SystemException {
+        try {
+            KeyGenerator kg = KeyGeneratorFactory.createKeyGenerator(di);
+            di.setKeyGenerator(kg);
+        } catch (Exception e) {
+            logger.error("Unable to create KeyGenerator for deployment id = " + di.getDeploymentID(), e);
+            throw new SystemException("Unable to create KeyGenerator for deployment id = " + di.getDeploymentID(), e);
+        }
+    }
+
+    private class OpenJPALifecycleListener extends AbstractLifecycleListener {
+//        protected void eventOccurred(LifecycleEvent event) {
+//            int type = event.getType();
+//            switch (type) {
+//                case LifecycleEvent.BEFORE_PERSIST:
+//                    System.out.println("BEFORE_PERSIST");
+//                    break;
+//                case LifecycleEvent.AFTER_PERSIST:
+//                    System.out.println("AFTER_PERSIST");
+//                    break;
+//                case LifecycleEvent.AFTER_LOAD:
+//                    System.out.println("AFTER_LOAD");
+//                    break;
+//                case LifecycleEvent.BEFORE_STORE:
+//                    System.out.println("BEFORE_STORE");
+//                    break;
+//                case LifecycleEvent.AFTER_STORE:
+//                    System.out.println("AFTER_STORE");
+//                    break;
+//                case LifecycleEvent.BEFORE_CLEAR:
+//                    System.out.println("BEFORE_CLEAR");
+//                    break;
+//                case LifecycleEvent.AFTER_CLEAR:
+//                    System.out.println("AFTER_CLEAR");
+//                    break;
+//                case LifecycleEvent.BEFORE_DELETE:
+//                    System.out.println("BEFORE_DELETE");
+//                    break;
+//                case LifecycleEvent.AFTER_DELETE:
+//                    System.out.println("AFTER_DELETE");
+//                    break;
+//                case LifecycleEvent.BEFORE_DIRTY:
+//                    System.out.println("BEFORE_DIRTY");
+//                    break;
+//                case LifecycleEvent.AFTER_DIRTY:
+//                    System.out.println("AFTER_DIRTY");
+//                    break;
+//                case LifecycleEvent.BEFORE_DIRTY_FLUSHED:
+//                    System.out.println("BEFORE_DIRTY_FLUSHED");
+//                    break;
+//                case LifecycleEvent.AFTER_DIRTY_FLUSHED:
+//                    System.out.println("AFTER_DIRTY_FLUSHED");
+//                    break;
+//                case LifecycleEvent.BEFORE_DETACH:
+//                    System.out.println("BEFORE_DETACH");
+//                    break;
+//                case LifecycleEvent.AFTER_DETACH:
+//                    System.out.println("AFTER_DETACH");
+//                    break;
+//                case LifecycleEvent.BEFORE_ATTACH:
+//                    System.out.println("BEFORE_ATTACH");
+//                    break;
+//                case LifecycleEvent.AFTER_ATTACH:
+//                    System.out.println("AFTER_ATTACH");
+//                    break;
+//                case LifecycleEvent.AFTER_REFRESH:
+//                    System.out.println("AFTER_REFRESH");
+//                    break;
+//                default:
+//                    System.out.println("default");
+//                    break;
+//            }
+//            super.eventOccurred(event);
+//        }
+
+        public void afterLoad(LifecycleEvent lifecycleEvent) {
+            eventOccurred(lifecycleEvent);
+            Object bean = lifecycleEvent.getSource();
+            // This may seem a bit strange to call ejbActivate immedately followed by ejbLoad,
+            // but it is completely legal.  Since the ejbActivate method is not allowed to access
+            // persistent state of the bean (EJB 3.0fr 8.5.2) there should be no concern that the
+            // call back method clears the bean state before ejbLoad is called.
+            cmpCallback.ejbActivate((EntityBean) bean);
+            cmpCallback.ejbLoad((EntityBean) bean);
+        }
+
+        public void beforeStore(LifecycleEvent lifecycleEvent) {
+            eventOccurred(lifecycleEvent);
+            Object bean = lifecycleEvent.getSource();
+            cmpCallback.ejbStore((EntityBean) bean);
+        }
+
+        public void afterAttach(LifecycleEvent lifecycleEvent) {
+            eventOccurred(lifecycleEvent);
+            Object bean = lifecycleEvent.getSource();
+            cmpCallback.setEntityContext((EntityBean) bean);
+        }
+
+        public void beforeDelete(LifecycleEvent lifecycleEvent) {
+            eventOccurred(lifecycleEvent);
+            try {
+                Object bean = lifecycleEvent.getSource();
+                cmpCallback.ejbRemove((EntityBean) bean);
+            } catch (RemoveException e) {
+                throw new PersistenceException(e);
+            }
+        }
+
+        public void afterDetach(LifecycleEvent lifecycleEvent) {
+            eventOccurred(lifecycleEvent);
+            // todo detach is called after ejbRemove which does not need ejbPassivate
+            Object bean = lifecycleEvent.getSource();
+            cmpCallback.ejbPassivate((EntityBean) bean);
+            cmpCallback.unsetEntityContext((EntityBean) bean);
+        }
+
+        public void beforePersist(LifecycleEvent lifecycleEvent) {
+            eventOccurred(lifecycleEvent);
+        }
+
+        public void afterRefresh(LifecycleEvent lifecycleEvent) {
+            eventOccurred(lifecycleEvent);
+        }
+
+        public void beforeDetach(LifecycleEvent lifecycleEvent) {
+            eventOccurred(lifecycleEvent);
+        }
+
+        public void beforeAttach(LifecycleEvent lifecycleEvent) {
+            eventOccurred(lifecycleEvent);
+        }
+    }
+}

Added: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngineFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngineFactory.java?view=auto&rev=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngineFactory.java (added)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/jpa/JpaCmpEngineFactory.java Tue Dec  5 12:59:32 2006
@@ -0,0 +1,86 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.openejb.core.cmp.jpa;
+
+import org.apache.openejb.core.cmp.CmpEngineFactory;
+import org.apache.openejb.core.cmp.CmpCallback;
+import org.apache.openejb.core.cmp.CmpEngine;
+import org.apache.openejb.OpenEJBException;
+
+import javax.transaction.TransactionManager;
+
+public class JpaCmpEngineFactory implements CmpEngineFactory {
+    private String jarPath;
+    private TransactionManager transactionManager;
+    private String engine;
+    private String connectorName;
+    private CmpCallback cmpCallback;
+    private ClassLoader classLoader;
+
+    public String getJarPath() {
+        return jarPath;
+    }
+
+    public void setJarPath(String jarPath) {
+        this.jarPath = jarPath;
+    }
+
+    public TransactionManager getTransactionManager() {
+        return transactionManager;
+    }
+
+    public void setTransactionManager(TransactionManager transactionManager) {
+        this.transactionManager = transactionManager;
+    }
+
+    public String getEngine() {
+        return engine;
+    }
+
+    public void setEngine(String engine) {
+        this.engine = engine;
+    }
+
+    public String getConnectorName() {
+        return connectorName;
+    }
+
+    public void setConnectorName(String connectorName) {
+        this.connectorName = connectorName;
+    }
+
+    public CmpCallback getCmpCallback() {
+        return cmpCallback;
+    }
+
+    public void setCmpCallback(CmpCallback cmpCallback) {
+        this.cmpCallback = cmpCallback;
+    }
+
+    public ClassLoader getClassLoader() {
+        return classLoader;
+    }
+
+    public void setClassLoader(ClassLoader classLoader) {
+        this.classLoader = classLoader;
+    }
+
+    public CmpEngine create() throws OpenEJBException {
+        return new JpaCmpEngine(cmpCallback, transactionManager, connectorName, classLoader);
+    }
+}

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?view=diff&rev=482779&r1=482778&r2=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml Tue Dec  5 12:59:32 2006
@@ -53,7 +53,8 @@
                    constructor="id, transactionManager, securityService, deployments, CmpEngineFactory, Engine, ConnectorName"
                    class-name="org.apache.openejb.core.cmp.CmpContainer">
 
-    CmpEngineFactory org.apache.openejb.alt.containers.castor_cmp11.CastorCmpEngineFactory
+    #CmpEngineFactory org.apache.openejb.alt.containers.castor_cmp11.CastorCmpEngineFactory
+    CmpEngineFactory org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
 
     #Engine  derby
     Engine  instantdb

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml?view=diff&rev=482779&r1=482778&r2=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring.xml Tue Dec  5 12:59:32 2006
@@ -78,7 +78,8 @@
   <o:cmpContainer id="Default CMP Container" depends-on="jndiBinding">
     id=Default CMP Container
 
-    cmpEngineFactory org.apache.openejb.alt.containers.castor_cmp11.CastorCmpEngineFactory
+    #cmpEngineFactory org.apache.openejb.alt.containers.castor_cmp11.CastorCmpEngineFactory
+    cmpEngineFactory org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
 
     #engine derby
     engine instantdb
@@ -265,8 +266,7 @@
               transactionManager="#transactionManager" assembly="#assembly" reentrant="false"
               pkClass="java.lang.Integer" primKeyField="primaryKey">
             <o:queries>
-              <o:query method="findByLastName(java.lang.String)">SELECT o FROM org.apache.openejb.test.entity.cmp.BasicCmpBean
-                o WHERE o.lastName = $1</o:query>
+              <o:query method="findByLastName(java.lang.String)">SELECT o FROM BasicCmpBean o WHERE o.lastName = ?1</o:query>
             </o:queries>
             <o:jndiContext>
               <o:enc>
@@ -620,16 +620,16 @@
     <o:transaction transAttribute="Supports">
       <o:method deploymentId="client/tests/stateless/BasicStatelessHome"/>
     </o:transaction>
-    <o:transaction transAttribute="Supports">
+    <o:transaction transAttribute="Required">
       <o:method deploymentId="client/tests/entity/cmp/BasicCmpHome"/>
     </o:transaction>
-    <o:transaction transAttribute="Supports">
+    <o:transaction transAttribute="Required">
       <o:method deploymentId="client/tests/entity/cmp/allowed_operations/EntityHome"/>
     </o:transaction>
-    <o:transaction transAttribute="Supports">
+    <o:transaction transAttribute="Required">
       <o:method deploymentId="client/tests/entity/cmp/EncBean"/>
     </o:transaction>
-    <o:transaction transAttribute="Never">
+    <o:transaction transAttribute="Required">
       <o:method deploymentId="client/tests/entity/cmp/RMI-over-IIOP/EJBHome"/>
     </o:transaction>
     <o:transaction transAttribute="Supports">

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml?view=diff&rev=482779&r1=482778&r2=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/spring2.xml Tue Dec  5 12:59:32 2006
@@ -75,7 +75,8 @@
   <o:cmpContainer id="Default CMP Container" depends-on="jndiBinding">
     id=Default CMP Container
 
-    cmpEngineFactory org.apache.openejb.alt.containers.castor_cmp11.CastorCmpEngineFactory
+    #cmpEngineFactory org.apache.openejb.alt.containers.castor_cmp11.CastorCmpEngineFactory
+    cmpEngineFactory org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
 
     #engine derby
     engine instantdb

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf?view=diff&rev=482779&r1=482778&r2=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf Tue Dec  5 12:59:32 2006
@@ -23,7 +23,8 @@
 <openejb>
 
 <Container id="Default CMP Container" ctype="CMP_ENTITY">
-    CmpEngineFactory org.apache.openejb.alt.containers.castor_cmp11.CastorCmpEngineFactory
+    #CmpEngineFactory org.apache.openejb.alt.containers.castor_cmp11.CastorCmpEngineFactory
+    CmpEngineFactory org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
 
     #Engine  instantdb
     Engine  derby

Added: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java?view=auto&rev=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java (added)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java Tue Dec  5 12:59:32 2006
@@ -0,0 +1,362 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.openejb.core.cmp.jpa;
+
+import junit.framework.TestCase;
+import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
+import org.apache.openejb.core.ContainerSystem;
+import org.apache.openejb.persistence.PersistenceUnitInfoImpl;
+import org.apache.openejb.resource.SharedLocalConnectionManager;
+import org.apache.openejb.resource.jdbc.JdbcManagedConnectionFactory;
+import org.apache.openejb.test.entity.cmp.BasicCmpBean;
+import org.apache.openjpa.event.AbstractLifecycleListener;
+import org.apache.openjpa.event.LifecycleEvent;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.PersistenceProviderImpl;
+
+import javax.naming.InitialContext;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.EntityTransaction;
+import javax.persistence.spi.PersistenceProvider;
+import javax.persistence.spi.PersistenceUnitTransactionType;
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Properties;
+
+public class JpaTest extends TestCase {
+    private PersistenceUnitTransactionType transactionType;
+    private EntityTransaction transaction;
+    private TransactionManager transactionManager;
+    private EntityManager entityManager;
+    private DataSource dataSource;
+
+    public void setUp() throws Exception {
+        super.setUp();
+
+        // initialize naming
+        System.setProperty(javax.naming.Context.URL_PKG_PREFIXES, "org.apache.openejb.core.ivm.naming");
+        ContainerSystem containerSystem = new ContainerSystem();
+        assertNotNull(containerSystem);
+
+        // setup tx mgr
+        transactionManager = new GeronimoTransactionManager();
+        new InitialContext().bind("java:TransactionManager", transactionManager);
+
+        dataSource = createDataSource(transactionManager);
+        initializeDatabase(dataSource);
+    }
+
+    public void testJta() throws Exception {
+        transactionType = PersistenceUnitTransactionType.JTA;
+        jpaLifecycle();
+    }
+
+    public void testResourceLocal() throws Exception {
+        transactionType = PersistenceUnitTransactionType.RESOURCE_LOCAL;
+        jpaLifecycle();
+    }
+
+    public void jpaLifecycle() throws Exception {
+
+        createEntityManager();
+        assertTrue(entityManager.isOpen());
+
+        beginTx();
+
+        BasicCmpBean david = entityManager.find(BasicCmpBean.class, 55);
+        assertTrue(entityManager.contains(david));
+
+        assertEquals(david.primaryKey, 55);
+        assertEquals(david.firstName, "David");
+        assertEquals(david.lastName, "Blevins");
+        commitTx();
+
+        entityManager.clear();
+        beginTx();
+
+        david = entityManager.find(BasicCmpBean.class, 55);
+        assertTrue(entityManager.contains(david));
+
+        assertEquals(david.primaryKey, 55);
+        assertEquals(david.firstName, "David");
+        assertEquals(david.lastName, "Blevins");
+
+        commitTx();
+        beginTx();
+
+        david = (BasicCmpBean) entityManager.createQuery("select o from BasicCmpBean o where o.firstName='David'").getSingleResult();
+        assertTrue(entityManager.contains(david));
+
+        assertEquals(david.primaryKey, 55);
+        assertEquals(david.firstName, "David");
+        assertEquals(david.lastName, "Blevins");
+
+        commitTx();
+        beginTx();
+
+        entityManager.remove(david);
+        assertFalse(entityManager.contains(david));
+        david = entityManager.find(BasicCmpBean.class, 55);
+        assertNull(david);
+
+        commitTx();
+        beginTx();
+
+        BasicCmpBean dain = new BasicCmpBean();
+        dain.primaryKey = 42;
+        dain.firstName = "Dain";
+        dain.lastName = "Sundstrom";
+        assertFalse(entityManager.contains(dain));
+
+        entityManager.persist(dain);
+        assertTrue(entityManager.contains(dain));
+
+        commitTx();
+        beginTx();
+
+        dain = entityManager.find(BasicCmpBean.class, 42);
+        assertTrue(entityManager.contains(dain));
+
+        assertEquals(dain.primaryKey, 42);
+        assertEquals(dain.firstName, "Dain");
+        assertEquals(dain.lastName, "Sundstrom");
+
+        commitTx();
+        beginTx();
+
+        dain = (BasicCmpBean) entityManager.createQuery("select o from BasicCmpBean o").getSingleResult();
+        assertTrue(entityManager.contains(dain));
+
+        assertEquals(dain.primaryKey, 42);
+        assertEquals(dain.firstName, "Dain");
+        assertEquals(dain.lastName, "Sundstrom");
+        commitTx();
+
+
+        entityManager.close();
+        assertFalse(entityManager.isOpen());
+
+    }
+
+    private void createEntityManager() {
+        PersistenceUnitInfoImpl unitInfo = new PersistenceUnitInfoImpl();
+        unitInfo.setPersistenceUnitName("CMP");
+        unitInfo.setPersistenceProviderClassName(PersistenceProviderImpl.class.getName());
+        unitInfo.setClassLoader(getClass().getClassLoader());
+        unitInfo.setExcludeUnlistedClasses(false);
+        unitInfo.setJtaDataSource(dataSource);
+
+        unitInfo.setMappingFileNames(Collections.singletonList("META-INF/jpa.mapping.xml"));
+
+        // Handle Properties
+        Properties properties = new Properties();
+        unitInfo.setProperties(properties);
+
+        unitInfo.setTransactionType(transactionType);
+
+        PersistenceProvider persistenceProvider = new PersistenceProviderImpl();
+        EntityManagerFactory emf = persistenceProvider.createContainerEntityManagerFactory(unitInfo, new HashMap());
+        entityManager = emf.createEntityManager();
+
+        OpenJPAEntityManager openjpaEM = (OpenJPAEntityManager) entityManager;
+        openjpaEM.addLifecycleListener(new OpenJPALifecycleListener(), (Class[])null);
+    }
+
+    private void beginTx() throws Exception {
+        String msg = "BEGIN_TX";
+        log(msg);
+        if (transactionType == PersistenceUnitTransactionType.JTA) {
+            transactionManager.begin();
+            entityManager.joinTransaction();
+        } else {
+            transaction = entityManager.getTransaction();
+            transaction.begin();
+        }
+    }
+
+    private void log(String msg) {
+//        System.out.println(msg);
+    }
+
+    private void commitTx() throws Exception {
+        log("  BEFORE_COMMIT_TX");
+        try {
+            if (transactionType == PersistenceUnitTransactionType.JTA) {
+                transactionManager.commit();
+            } else {
+                transaction.commit();
+            }
+        } finally {
+            log("AFTER_COMMIT_TX");
+        }
+    }
+
+    private void initializeDatabase(DataSource dataSource) throws SQLException {
+        try {
+            execute(dataSource, "DROP TABLE entity");
+        } catch (Exception ignored) {
+        }
+        execute(dataSource, "CREATE TABLE entity ( id INT PRIMARY KEY, first_name CHAR(20), last_name CHAR(20))");
+        execute(dataSource, "INSERT INTO entity (id, first_name, last_name) VALUES (55, 'David', 'Blevins')");
+    }
+
+    private DataSource createDataSource(TransactionManager transactionManager) throws Exception {
+        if (transactionType == PersistenceUnitTransactionType.JTA) {
+            JdbcManagedConnectionFactory mcf = new JdbcManagedConnectionFactory();
+            mcf.setDefaultUserName("Admin");
+            mcf.setDefaultPassword("pass");
+            mcf.setUrl("jdbc:idb:conf/instantdb.properties");
+            mcf.setDriver("org.enhydra.instantdb.jdbc.idbDriver");
+            mcf.start();
+
+            SharedLocalConnectionManager connectionManager = new SharedLocalConnectionManager();
+            connectionManager.setTransactionManager(transactionManager);
+
+            DataSource connectionFactory = (DataSource) mcf.createConnectionFactory(connectionManager);
+            return connectionFactory;
+        } else {
+            BasicDataSource ds = new BasicDataSource();
+            ds.setDriverClassName("org.enhydra.instantdb.jdbc.idbDriver");
+            ds.setUrl("jdbc:idb:src/test/resources/conf/instantdb.properties");
+            ds.setUsername("Admin");
+            ds.setPassword("pass");
+            ds.setMaxActive(100);
+            ds.setMaxWait(10000);
+            ds.setTestOnBorrow(true);
+            return ds;
+        }
+    }
+
+
+    public boolean execute(DataSource ds, String statement) throws java.sql.SQLException {
+        boolean retval;
+        Connection connection = null;
+        try {
+            connection = ds.getConnection();
+
+            Statement stmt = connection.createStatement();
+            try {
+                retval = stmt.execute(statement);
+            } finally {
+                stmt.close();
+            }
+        } finally {
+            if (connection != null) {
+                connection.close();
+            }
+        }
+        return retval;
+    }
+
+    private class OpenJPALifecycleListener extends AbstractLifecycleListener {
+        protected void eventOccurred(LifecycleEvent event) {
+            int type = event.getType();
+            switch (type) {
+                case LifecycleEvent.BEFORE_PERSIST:
+                    log("  BEFORE_PERSIST");
+                    break;
+                case LifecycleEvent.AFTER_PERSIST:
+                    log("  AFTER_PERSIST");
+                    break;
+                case LifecycleEvent.AFTER_LOAD:
+                    log("  AFTER_LOAD");
+                    break;
+                case LifecycleEvent.BEFORE_STORE:
+                    log("  BEFORE_STORE");
+                    break;
+                case LifecycleEvent.AFTER_STORE:
+                    log("  AFTER_STORE");
+                    break;
+                case LifecycleEvent.BEFORE_CLEAR:
+                    log("  BEFORE_CLEAR");
+                    break;
+                case LifecycleEvent.AFTER_CLEAR:
+                    log("  AFTER_CLEAR");
+                    break;
+                case LifecycleEvent.BEFORE_DELETE:
+                    log("  BEFORE_DELETE");
+                    break;
+                case LifecycleEvent.AFTER_DELETE:
+                    log("  AFTER_DELETE");
+                    break;
+                case LifecycleEvent.BEFORE_DIRTY:
+                    log("  BEFORE_DIRTY");
+                    break;
+                case LifecycleEvent.AFTER_DIRTY:
+                    log("  AFTER_DIRTY");
+                    break;
+                case LifecycleEvent.BEFORE_DIRTY_FLUSHED:
+                    log("  BEFORE_DIRTY_FLUSHED");
+                    break;
+                case LifecycleEvent.AFTER_DIRTY_FLUSHED:
+                    log("  AFTER_DIRTY_FLUSHED");
+                    break;
+                case LifecycleEvent.BEFORE_DETACH:
+                    log("  BEFORE_DETACH");
+                    break;
+                case LifecycleEvent.AFTER_DETACH:
+                    log("  AFTER_DETACH");
+                    break;
+                case LifecycleEvent.BEFORE_ATTACH:
+                    log("  BEFORE_ATTACH");
+                    break;
+                case LifecycleEvent.AFTER_ATTACH:
+                    log("  AFTER_ATTACH");
+                    break;
+                case LifecycleEvent.AFTER_REFRESH:
+                    log("  AFTER_REFRESH");
+                    break;
+                default:
+                    log("  default");
+                    break;
+            }
+            super.eventOccurred(event);
+        }
+
+        public void beforePersist(LifecycleEvent event) {
+            eventOccurred(event);
+        }
+
+        public void afterRefresh(LifecycleEvent event) {
+            eventOccurred(event);
+        }
+
+        public void beforeDetach(LifecycleEvent event) {
+            eventOccurred(event);
+        }
+
+        public void afterDetach(LifecycleEvent event) {
+            eventOccurred(event);
+        }
+
+        public void beforeAttach(LifecycleEvent event) {
+            eventOccurred(event);
+        }
+
+        public void afterAttach(LifecycleEvent event) {
+            eventOccurred(event);
+        }
+    }
+}

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/openejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/openejb-jar.xml?view=diff&rev=482779&r1=482778&r2=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/openejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/openejb-jar.xml Tue Dec  5 12:59:32 2006
@@ -10,7 +10,7 @@
                 </method-params>
             </query-method>
             <object-ql>
-                SELECT o FROM org.apache.openejb.test.entity.cmp.BasicCmpBean o WHERE o.lastName = $1
+                SELECT o FROM BasicCmpBean o WHERE o.lastName = ?1
             </object-ql>
         </query>
     </ejb-deployment>

Modified: incubator/openejb/trunk/openejb3/container/openejb-persistence/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-persistence/pom.xml?view=diff&rev=482779&r1=482778&r2=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-persistence/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-persistence/pom.xml Tue Dec  5 12:59:32 2006
@@ -111,7 +111,6 @@
     <dependency>
       <groupId>org.apache.openjpa</groupId>
       <artifactId>openjpa-persistence-jdbc</artifactId>
-      <version>0.9.0-incubating-SNAPSHOT</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

Modified: incubator/openejb/trunk/openejb3/container/openejb-persistence/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-persistence/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java?view=diff&rev=482779&r1=482778&r2=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-persistence/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-persistence/src/main/java/org/apache/openejb/persistence/PersistenceUnitInfoImpl.java Tue Dec  5 12:59:32 2006
@@ -55,19 +55,19 @@
     
     private ClassLoader tempClassLoader = null;
 
-    void setExcludeUnlistedClasses(boolean excludeUnlistedClasses) {
+    public void setExcludeUnlistedClasses(boolean excludeUnlistedClasses) {
         this.excludeUnlistedClasses = excludeUnlistedClasses;
     }
 
-    void setProperties(Properties vendorProperties) {
+    public void setProperties(Properties vendorProperties) {
         this.vendorProperties = vendorProperties;
     }
 
-    void setClassLoader(ClassLoader classLoader) {
+    public void setClassLoader(ClassLoader classLoader) {
         this.classLoader = classLoader;
     }
 
-    void setJarFileUrls(List<String> jarFiles) throws MalformedURLException {
+    public void setJarFileUrls(List<String> jarFiles) throws MalformedURLException {
         if (jarFileUrls == null) {
             jarFileUrls = new ArrayList<URL>();
         }
@@ -77,26 +77,26 @@
         }
     }
 
-    void setJtaDataSource(DataSource jtaDataSource) {
+    public void setJtaDataSource(DataSource jtaDataSource) {
         this.jtaDataSource = jtaDataSource;
     }
 
-    void setManagedClassNames(List<String> managedClassNames) {
+    public void setManagedClassNames(List<String> managedClassNames) {
         this.managedClassNames = managedClassNames;
     }
 
-    void addManagedClassName(String className) {
+    public void addManagedClassName(String className) {
         if (managedClassNames == null) {
             managedClassNames = new ArrayList<String>();
         }
         managedClassNames.add(className);
     }
 
-    void setMappingFileNames(List<String> mappingFileNames) {
+    public void setMappingFileNames(List<String> mappingFileNames) {
         this.mappingFileNames = mappingFileNames;
     }
 
-    void addMappingFileName(String mappingFileName) {
+    public void addMappingFileName(String mappingFileName) {
         if (mappingFileNames == null) {
             mappingFileNames = new ArrayList<String>();
         }

Modified: incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/resources/META-INF/persistence.xml?view=diff&rev=482779&r1=482778&r2=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/resources/META-INF/persistence.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-persistence/src/test/resources/META-INF/persistence.xml Tue Dec  5 12:59:32 2006
@@ -16,7 +16,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<persistence>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
   <!--<persistence-unit name="TestUnit">-->
     <!--<description>-->
       <!--This is just a description-->
@@ -38,8 +38,8 @@
   <persistence-unit transaction-type="RESOURCE_LOCAL" name="openjpa-test-unit">
 
     <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-    <class>org.apache.openejb.persistence.AllFieldTypes</class>
     <non-jta-data-source>jdbc/MyDataSource</non-jta-data-source>
+    <class>org.apache.openejb.persistence.AllFieldTypes</class>
 
     <properties>
       <property name="openjpa.jdbc.SynchronizeMappings"

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml?view=diff&rev=482779&r1=482778&r2=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml Tue Dec  5 12:59:32 2006
@@ -17,12 +17,12 @@
     limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.openejb</groupId>
     <version>3.0-incubating-SNAPSHOT</version>
-    </parent>
+  </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-itests-beans</artifactId>
   <packaging>jar</packaging>
@@ -37,5 +37,48 @@
       <artifactId>junit</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+        <groupId>org.apache.openjpa</groupId>
+        <artifactId>openjpa-persistence-jdbc</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>xerces</groupId>
+        <artifactId>xercesImpl</artifactId>
+        <version>2.6.2</version>
+    </dependency>
+
+    <dependency>
+        <groupId>xerces</groupId>
+        <artifactId>xmlParserAPIs</artifactId>
+        <version>2.2.1</version>
+    </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>compile</phase>
+            <configuration>
+              <tasks>
+                <java classname="org.apache.openjpa.enhance.PCEnhancer">
+                  <arg value="-p"/>
+                  <arg value="${basedir}/src/temp-persistence.xml"/>
+                  <classpath>
+                    <path refid="maven.dependency.classpath"/>
+                    <path refid="maven.compile.classpath"/>
+                  </classpath>
+                </java>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml?view=diff&rev=482779&r1=482778&r2=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/ejb-jar.xml Tue Dec  5 12:59:32 2006
@@ -1051,28 +1051,28 @@
                 <ejb-name>BasicCmpBean</ejb-name>
                 <method-name>*</method-name>
             </method>
-            <trans-attribute>Supports</trans-attribute>
+            <trans-attribute>Required</trans-attribute>
         </container-transaction>
         <container-transaction>
             <method>
                 <ejb-name>AOBasicCmpBean</ejb-name>
                 <method-name>*</method-name>
             </method>
-            <trans-attribute>Supports</trans-attribute>
+            <trans-attribute>Required</trans-attribute>
         </container-transaction>
         <container-transaction>
             <method>
                 <ejb-name>EncCmpBean</ejb-name>
                 <method-name>*</method-name>
             </method>
-            <trans-attribute>Supports</trans-attribute>
+            <trans-attribute>Required</trans-attribute>
         </container-transaction>
         <container-transaction>
             <method>
                 <ejb-name>Cmp RMI-IIOP Bean</ejb-name>
                 <method-name>*</method-name>
             </method>
-            <trans-attribute>Never</trans-attribute>
+            <trans-attribute>Required</trans-attribute>
         </container-transaction>
         <container-transaction>
             <method>

Added: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/jpa.mapping.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/jpa.mapping.xml?view=auto&rev=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/jpa.mapping.xml (added)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/jpa.mapping.xml Tue Dec  5 12:59:32 2006
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" version="1.0">
+  <entity class="org.apache.openejb.test.entity.cmp.BasicCmpBean" access="FIELD">
+    <description>Simple Entity Bean</description>
+
+    <table name="entity"/>
+
+    <attributes>
+      <id name="primaryKey">
+        <column name="id"/>
+      </id>
+      <basic name="firstName">
+        <column name="first_name"/>
+      </basic>
+      <basic name="lastName">
+        <column name="last_name"/>
+      </basic>
+      <transient name="allowedOperationsTable"/>
+    </attributes>
+  </entity>
+
+  <!--  Mapping for AllowedOperationsCmpBean  -->
+  <entity class="org.apache.openejb.test.entity.cmp.AllowedOperationsCmpBean">
+    <description>Simple Entity Bean</description>
+
+    <table name="entity"/>
+
+    <attributes>
+      <id name="primaryKey">
+        <column name="id"/>
+      </id>
+      <basic name="firstName">
+        <column name="first_name"/>
+      </basic>
+      <basic name="lastName">
+        <column name="last_name"/>
+      </basic>
+      <transient name="allowedOperationsTable"/>
+    </attributes>
+  </entity>
+
+  <entity class="org.apache.openejb.test.entity.cmp.EncCmpBean">
+    <description>Simple Entity Bean</description>
+
+    <table name="entity"/>
+
+    <attributes>
+      <id name="primaryKey">
+        <column name="id"/>
+      </id>
+      <basic name="firstName">
+        <column name="first_name"/>
+      </basic>
+      <basic name="lastName">
+        <column name="last_name"/>
+      </basic>
+    </attributes>
+  </entity>
+
+
+  <entity class="org.apache.openejb.test.entity.cmp.RmiIiopCmpBean">
+    <description>Simple Entity Bean</description>
+
+    <table name="entity"/>
+    <attributes>
+      <id name="primaryKey">
+        <column name="id"/>
+      </id>
+      <basic name="firstName">
+        <column name="first_name"/>
+      </basic>
+      <basic name="lastName">
+        <column name="last_name"/>
+      </basic>
+    </attributes>
+  </entity>
+
+</entity-mappings>

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/openejb-jar.xml?view=diff&rev=482779&r1=482778&r2=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/openejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/openejb-jar.xml Tue Dec  5 12:59:32 2006
@@ -27,7 +27,7 @@
             </method-params>
         </query-method>
         <object-ql>
-            SELECT o FROM org.apache.openejb.test.entity.cmp.BasicCmpBean o WHERE o.lastName = $1
+            SELECT o FROM BasicCmpBean o WHERE o.lastName = ?1
         </object-ql>
     </query>
     <query>
@@ -36,7 +36,7 @@
             <method-params/>
         </query-method>
         <object-ql>
-            SELECT o FROM org.apache.openejb.test.entity.cmp.BasicCmpBean o WHERE 'true' = 'false'
+            SELECT o FROM BasicCmpBean o WHERE 'true' = 'false'
         </object-ql>
     </query>
     </ejb-deployment>
@@ -50,7 +50,7 @@
             </method-params>
         </query-method>
         <object-ql>
-            SELECT o FROM org.apache.openejb.test.entity.cmp.BasicCmpBean o WHERE o.lastName = $1
+            SELECT o FROM AllowedOperationsCmpBean o WHERE o.lastName = ?1
         </object-ql>
     </query>
     <query>
@@ -59,7 +59,7 @@
             <method-params/>
         </query-method>
         <object-ql>
-            SELECT o FROM org.apache.openejb.test.entity.cmp.BasicCmpBean o WHERE 'true' = 'false'
+            SELECT o FROM AllowedOperationsCmpBean o WHERE 'true' = 'false'
         </object-ql>
     </query>
 	</ejb-deployment>

Added: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/temp-persistence.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/temp-persistence.xml?view=auto&rev=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/temp-persistence.xml (added)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/temp-persistence.xml Tue Dec  5 12:59:32 2006
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
+  <persistence-unit transaction-type="JTA" name="CMP">
+    <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+    <mapping-file>META-INF/jpa.mapping.xml</mapping-file>
+    <class>org.apache.openejb.test.entity.cmp.BasicCmpBean</class>
+  </persistence-unit>
+</persistence>

Modified: incubator/openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/pom.xml?view=diff&rev=482779&r1=482778&r2=482779
==============================================================================
--- incubator/openejb/trunk/openejb3/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/pom.xml Tue Dec  5 12:59:32 2006
@@ -237,6 +237,17 @@
         <enabled>true</enabled>
       </snapshots>
     </repository>
+    <repository>
+      <id>apache-incubating-repository</id>
+      <name>Apache Incubating Repository</name>
+      <url>http://people.apache.org/repo/m2-incubating-repository</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
     <!--<repository>-->
       <!--<id>apache-m1-snapshot</id>-->
       <!--<name>Apache Repository</name>-->
@@ -695,6 +706,11 @@
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-servlet_2.4_spec</artifactId>
         <version>1.0.1</version>
+      </dependency>
+      <dependency>
+          <groupId>org.apache.openjpa</groupId>
+          <artifactId>openjpa-persistence-jdbc</artifactId>
+          <version>0.9.6-incubating</version>
       </dependency>
       <dependency>
         <groupId>org.apache.xbean</groupId>