[jboss-cvs] JBossAS SVN: r93599 - in branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798: server/src/main/org/jboss/ejb/plugins/cmp/jdbc2/schema and 10 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Sep 16 07:28:50 EDT 2009


Author: darran.lofthouse at jboss.com
Date: 2009-09-16 07:28:50 -0400 (Wed, 16 Sep 2009)
New Revision: 93599

Added:
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ABean.java
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ALocal.java
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ALocalHome.java
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/test/
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/test/JDBC2PmEjbStoreUnitTestCase.java
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/ejb-jar.xml
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/jboss.xml
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/jbosscmp-jdbc.xml
Removed:
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ABean.java
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ALocal.java
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ALocalHome.java
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/test/
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/test/JDBC2PmEjbStoreUnitTestCase.java
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/ejb-jar.xml
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/jboss.xml
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/jbosscmp-jdbc.xml
Modified:
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/server/src/main/org/jboss/ejb/GlobalTxEntityMap.java
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/server/src/main/org/jboss/ejb/plugins/cmp/jdbc2/schema/Schema.java
   branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/imports/sections/cmp.xml
Log:
[JBPAPP-2798] jdbc2 pm: ejbStore and db synchronization ordering.

Modified: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/server/src/main/org/jboss/ejb/GlobalTxEntityMap.java
===================================================================
--- branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/server/src/main/org/jboss/ejb/GlobalTxEntityMap.java	2009-09-16 09:38:34 UTC (rev 93598)
+++ branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/server/src/main/org/jboss/ejb/GlobalTxEntityMap.java	2009-09-16 11:28:50 UTC (rev 93599)
@@ -31,7 +31,10 @@
 import javax.transaction.SystemException;
 import javax.transaction.Transaction;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * This class provides a way to find out what entities are contained in
@@ -228,10 +231,7 @@
       }
    }
 
-   /**
-    * associate instance with transaction
-    */
-   private void associate(Transaction tx, EntityEnterpriseContext entity)
+   public GlobalTxSynchronization getGlobalSynchronization(Transaction tx)
       throws RollbackException, SystemException
    {
       GlobalTxSynchronization globalSync = (GlobalTxSynchronization) txSynch.get(tx);
@@ -241,7 +241,22 @@
          txSynch.set(tx, globalSync);
          tx.registerSynchronization(globalSync);
       }
+      return globalSync;
+   }
+   
+   public Transaction getTransaction()
+   {
+      return txSynch.getTransaction();
+   }
 
+   /**
+    * associate instance with transaction
+    */
+   private void associate(Transaction tx, EntityEnterpriseContext entity)
+      throws RollbackException, SystemException
+   {
+      GlobalTxSynchronization globalSync = getGlobalSynchronization(tx);
+
       //There should be only one thread associated with this tx at a time.
       //Therefore we should not need to synchronize on entityFifoList to ensure exclusive
       //access.  entityFifoList is correct since it was obtained in a synch block.
@@ -254,17 +269,49 @@
    /**
     * A list of instances associated with the transaction.
     */
-   private class GlobalTxSynchronization implements Synchronization
+   public static class GlobalTxSynchronization implements Synchronization
    {
       private Transaction tx;
       private List instances = new ArrayList();
       private boolean synchronizing;
 
+      private List<Synchronization> otherSync = Collections.emptyList();
+      private Map<Object, Object> txLocals = Collections.emptyMap();
+
       public GlobalTxSynchronization(Transaction tx)
       {
          this.tx = tx;
       }
 
+      public void addSynchronization(Synchronization sync)
+      {
+         if(otherSync.isEmpty())
+            otherSync = Collections.singletonList(sync);
+         else
+         {
+            if(otherSync.size() == 1)
+               otherSync = new ArrayList<Synchronization>(otherSync);
+            otherSync.add(sync);
+         }
+      }
+      
+      public void putTxLocal(Object key, Object value)
+      {
+         if(txLocals.isEmpty())
+            txLocals = Collections.singletonMap(key, value);
+         else
+          {
+            if(txLocals.size() == 1)
+               txLocals = new HashMap<Object, Object>(txLocals);
+            txLocals.put(key, value);
+          }
+      }
+
+      public Object getTxLocal(Object key)
+      {
+         return txLocals.get(key);
+      }
+
       public void associate(EntityEnterpriseContext ctx)
       {
          instances.add(ctx);
@@ -362,11 +409,19 @@
          // let the runtime exceptions fall out, so the committer can determine
          // the root cause of a rollback
          synchronize();
+
+         for(Synchronization sync : otherSync)
+         {
+            sync.beforeCompletion();
+         }
       }
 
       public void afterCompletion(int status)
       {
-         //no-op
+         for(Synchronization sync : otherSync)
+         {
+            sync.afterCompletion(status);
+         }
       }
    }
 }

Modified: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/server/src/main/org/jboss/ejb/plugins/cmp/jdbc2/schema/Schema.java
===================================================================
--- branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/server/src/main/org/jboss/ejb/plugins/cmp/jdbc2/schema/Schema.java	2009-09-16 09:38:34 UTC (rev 93598)
+++ branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/server/src/main/org/jboss/ejb/plugins/cmp/jdbc2/schema/Schema.java	2009-09-16 11:28:50 UTC (rev 93599)
@@ -21,6 +21,9 @@
  */
 package org.jboss.ejb.plugins.cmp.jdbc2.schema;
 
+import org.jboss.ejb.EntityContainer;
+import org.jboss.ejb.GlobalTxEntityMap;
+import org.jboss.ejb.GlobalTxEntityMap.GlobalTxSynchronization;
 import org.jboss.ejb.plugins.cmp.jdbc.metadata.JDBCEntityMetaData;
 import org.jboss.ejb.plugins.cmp.jdbc2.bridge.JDBCEntityBridge2;
 import org.jboss.ejb.plugins.cmp.jdbc2.bridge.JDBCCMRFieldBridge2;
@@ -28,10 +31,10 @@
 import org.jboss.tm.TransactionLocal;
 
 import javax.ejb.EJBException;
+import javax.transaction.RollbackException;
 import javax.transaction.Synchronization;
-import javax.transaction.RollbackException;
+import javax.transaction.Status;
 import javax.transaction.SystemException;
-import javax.transaction.Status;
 import javax.transaction.Transaction;
 import java.sql.SQLException;
 
@@ -41,41 +44,13 @@
  */
 public class Schema
 {
+   private static final String VIEWS_TX_LOCAL_KEY = "jdbc2pm.Schema.Views";
+
    private EntityTable[] entityTables;
    private RelationTable[] relationTables;
 
-   private TransactionLocal localViews = new TransactionLocal()
-   {
-      protected Object initialValue()
-      {
-         Transaction tx = getTransaction();
+   private GlobalTxEntityMap txLocal = EntityContainer.getGlobalTxEntityMap();
 
-         if(tx == null)
-         {
-            throw new IllegalStateException("An operation requires an active transaction!");
-         }
-
-         Views views = new Views(tx);
-         Synchronization sync = new SchemaSynchronization(views);
-
-         try
-         {
-            tx.registerSynchronization(sync);
-         }
-         catch(RollbackException e)
-         {
-            throw new EJBException("Transaction already marked to roll back: " + e.getMessage(), e);
-         }
-         catch(SystemException e)
-         {
-            e.printStackTrace();
-            throw new IllegalStateException("Failed to register transaction synchronization: " + e.getMessage());
-         }
-
-         return views;
-      }
-   };
-
    public EntityTable createEntityTable(JDBCEntityMetaData metadata, JDBCEntityBridge2 entity)
       throws DeploymentException
    {
@@ -116,7 +91,7 @@
 
    public Table.View getView(EntityTable table)
    {
-      Views views = (Views) localViews.get();
+      Views views = getViews();
       Table.View view = views.entityViews[table.getTableId()];
       if(view == null)
       {
@@ -128,7 +103,7 @@
 
    public Table.View getView(RelationTable table)
    {
-      Views views = (Views) localViews.get();
+      Views views = getViews();
       Table.View view = views.relationViews[table.getTableId()];
       if(view == null)
       {
@@ -140,7 +115,7 @@
 
    public void flush()
    {
-      Views views = (Views) localViews.get();
+      Views views = getViews();
 
       Table.View[] relationViews = views.relationViews;
       if(relationViews != null)
@@ -231,6 +206,36 @@
       }
    }
 
+   private Views getViews()
+   {
+      Transaction tx = txLocal.getTransaction();
+      GlobalTxSynchronization globalSync;
+      try
+      {
+         globalSync = txLocal.getGlobalSynchronization(tx);
+      }
+      catch(RollbackException e)
+      {
+         throw new EJBException("Transaction already marked to roll back: " + e.getMessage(), e);
+      }
+      catch(SystemException e)
+      {
+         throw new IllegalStateException("Failed to register transaction synchronization: " + e.getMessage());
+      }
+
+      if(globalSync == null)
+         throw new IllegalStateException("Global transaction synchronization is not available for transaction " + tx);
+      
+      Views views = (Views) globalSync.getTxLocal(VIEWS_TX_LOCAL_KEY);
+      if(views == null)
+      {
+         views = new Views(tx);
+         globalSync.putTxLocal(VIEWS_TX_LOCAL_KEY, views);
+         globalSync.addSynchronization(new SchemaSynchronization(views));
+      }
+      return views;
+   }
+
    // Inner
 
    public class Views

Modified: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/imports/sections/cmp.xml
===================================================================
--- branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/imports/sections/cmp.xml	2009-09-16 09:38:34 UTC (rev 93598)
+++ branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/imports/sections/cmp.xml	2009-09-16 11:28:50 UTC (rev 93599)
@@ -360,6 +360,19 @@
          tofile="${build.resources}/cmp2/jbas3541/META-INF/jboss.xml"
          overwrite="true"/>
 
+      <!-- build cmp2-jdbc2pm-ejbstore.jar -->
+      <jar destfile="${build.lib}/cmp2-jdbc2pm-ejbstore.jar">
+         <fileset dir="${build.classes}">
+            <patternset refid="jboss.test.util.ejb.set"/>
+            <include name="org/jboss/test/cmp2/jdbc2pm/ejbstore/**"/>
+         </fileset>
+         <fileset dir="${build.resources}/cmp2/jdbc2pm/ejbstore">
+            <include name="**/*.*"/>
+         </fileset>
+         <zipfileset src="${junit.junit.lib}/junit.jar"
+            includes="junit/**/*.*"/>
+      </jar>
+
       <!-- build cmp2-jbas979.jar -->
       <jar destfile="${build.lib}/cmp2-jbas979.jar">
          <fileset dir="${build.classes}">

Copied: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm (from rev 93381, branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm)

Copied: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore (from rev 93381, branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore)

Copied: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb (from rev 93381, branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb)

Deleted: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ABean.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ABean.java	2009-09-11 09:46:07 UTC (rev 93381)
+++ branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ABean.java	2009-09-16 11:28:50 UTC (rev 93599)
@@ -1,114 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.test.cmp2.jdbc2pm.ejbstore.ejb;
-
-
-import javax.ejb.EntityBean;
-import javax.ejb.EntityContext;
-import javax.ejb.RemoveException;
-import javax.ejb.CreateException;
-
-
-/**
- * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision: $</tt>
- */
-public abstract class ABean implements EntityBean
-{
-   // CMP accessors --------------------------------------------
-   /**
-    * @ejb.pk-field
-    * @ejb.persistent-field
-    * @ejb.interface-method
-    */
-   public abstract Long getId();
-
-   public abstract void setId(Long id);
-
-   /**
-    * @ejb.persistent-field
-    * @ejb.interface-method
-    */
-   public abstract Integer getIntField();
-
-  /**
-   * @ejb.interface-method
-   */
-   public abstract void setIntField(Integer i);
-
-   /**
-    * @ejb.persistent-field
-    * @ejb.interface-method
-    */
-   public abstract Integer getStoreCount();
-
-  /**
-   * @ejb.interface-method
-   */
-   public abstract void setStoreCount(Integer i);
-
-   /**
-    * @throws javax.ejb.CreateException
-    * @ejb.create-method
-    */
-   public Long ejbCreate(Long id, Integer i)
-      throws CreateException
-   {
-      setId(id);
-      setIntField(i);
-      setStoreCount(new Integer(0));
-      return null;
-   }
-
-   public void ejbPostCreate(Long id, Integer i)
-   {
-   }
-
-   public void setEntityContext(EntityContext ctx)
-   {
-   }
-
-   public void unsetEntityContext()
-   {
-   }
-
-   public void ejbActivate()
-   {
-   }
-
-   public void ejbLoad()
-   {
-   }
-
-   public void ejbPassivate()
-   {
-   }
-
-   public void ejbRemove() throws RemoveException
-   {
-   }
-
-   public void ejbStore()
-   {
-      setStoreCount(new Integer(getStoreCount().intValue() + 1));
-   }
-}

Copied: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ABean.java (from rev 93381, branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ABean.java)
===================================================================
--- branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ABean.java	                        (rev 0)
+++ branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ABean.java	2009-09-16 11:28:50 UTC (rev 93599)
@@ -0,0 +1,114 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.test.cmp2.jdbc2pm.ejbstore.ejb;
+
+
+import javax.ejb.EntityBean;
+import javax.ejb.EntityContext;
+import javax.ejb.RemoveException;
+import javax.ejb.CreateException;
+
+
+/**
+ * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
+ * @version <tt>$Revision: $</tt>
+ */
+public abstract class ABean implements EntityBean
+{
+   // CMP accessors --------------------------------------------
+   /**
+    * @ejb.pk-field
+    * @ejb.persistent-field
+    * @ejb.interface-method
+    */
+   public abstract Long getId();
+
+   public abstract void setId(Long id);
+
+   /**
+    * @ejb.persistent-field
+    * @ejb.interface-method
+    */
+   public abstract Integer getIntField();
+
+  /**
+   * @ejb.interface-method
+   */
+   public abstract void setIntField(Integer i);
+
+   /**
+    * @ejb.persistent-field
+    * @ejb.interface-method
+    */
+   public abstract Integer getStoreCount();
+
+  /**
+   * @ejb.interface-method
+   */
+   public abstract void setStoreCount(Integer i);
+
+   /**
+    * @throws javax.ejb.CreateException
+    * @ejb.create-method
+    */
+   public Long ejbCreate(Long id, Integer i)
+      throws CreateException
+   {
+      setId(id);
+      setIntField(i);
+      setStoreCount(new Integer(0));
+      return null;
+   }
+
+   public void ejbPostCreate(Long id, Integer i)
+   {
+   }
+
+   public void setEntityContext(EntityContext ctx)
+   {
+   }
+
+   public void unsetEntityContext()
+   {
+   }
+
+   public void ejbActivate()
+   {
+   }
+
+   public void ejbLoad()
+   {
+   }
+
+   public void ejbPassivate()
+   {
+   }
+
+   public void ejbRemove() throws RemoveException
+   {
+   }
+
+   public void ejbStore()
+   {
+      setStoreCount(new Integer(getStoreCount().intValue() + 1));
+   }
+}

Deleted: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ALocal.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ALocal.java	2009-09-11 09:46:07 UTC (rev 93381)
+++ branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ALocal.java	2009-09-16 11:28:50 UTC (rev 93599)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.test.cmp2.jdbc2pm.ejbstore.ejb;
-
-/**
- * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision: $</tt>
- */
-public interface ALocal
-   extends javax.ejb.EJBLocalObject
-{
-   public Long getId(  ) ;
-
-   public Integer getIntField(  ) ;
-
-   public void setIntField( Integer i ) ;
-   
-   public Integer getStoreCount();
-}

Copied: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ALocal.java (from rev 93381, branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ALocal.java)
===================================================================
--- branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ALocal.java	                        (rev 0)
+++ branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ALocal.java	2009-09-16 11:28:50 UTC (rev 93599)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.test.cmp2.jdbc2pm.ejbstore.ejb;
+
+/**
+ * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
+ * @version <tt>$Revision: $</tt>
+ */
+public interface ALocal
+   extends javax.ejb.EJBLocalObject
+{
+   public Long getId(  ) ;
+
+   public Integer getIntField(  ) ;
+
+   public void setIntField( Integer i ) ;
+   
+   public Integer getStoreCount();
+}

Deleted: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ALocalHome.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ALocalHome.java	2009-09-11 09:46:07 UTC (rev 93381)
+++ branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ALocalHome.java	2009-09-16 11:28:50 UTC (rev 93599)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.test.cmp2.jdbc2pm.ejbstore.ejb;
-
-
-/**
- * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision: $</tt>
- */
-public interface ALocalHome
-   extends javax.ejb.EJBLocalHome
-{
-   public ALocal create(Long id , Integer i)
-      throws javax.ejb.CreateException;
-
-   public ALocal findByPrimaryKey(Long pk)
-      throws javax.ejb.FinderException;
-}

Copied: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ALocalHome.java (from rev 93381, branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ALocalHome.java)
===================================================================
--- branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ALocalHome.java	                        (rev 0)
+++ branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/ejb/ALocalHome.java	2009-09-16 11:28:50 UTC (rev 93599)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.test.cmp2.jdbc2pm.ejbstore.ejb;
+
+
+/**
+ * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
+ * @version <tt>$Revision: $</tt>
+ */
+public interface ALocalHome
+   extends javax.ejb.EJBLocalHome
+{
+   public ALocal create(Long id , Integer i)
+      throws javax.ejb.CreateException;
+
+   public ALocal findByPrimaryKey(Long pk)
+      throws javax.ejb.FinderException;
+}

Copied: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/test (from rev 93381, branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/test)

Deleted: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/test/JDBC2PmEjbStoreUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/test/JDBC2PmEjbStoreUnitTestCase.java	2009-09-11 09:46:07 UTC (rev 93381)
+++ branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/test/JDBC2PmEjbStoreUnitTestCase.java	2009-09-16 11:28:50 UTC (rev 93599)
@@ -1,82 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.test.cmp2.jdbc2pm.ejbstore.test;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import org.jboss.test.JBossTestCase;
-import org.jboss.test.cmp2.jdbc2pm.ejbstore.ejb.ALocal;
-import org.jboss.test.cmp2.jdbc2pm.ejbstore.ejb.ALocalHome;
-import org.jboss.test.util.ejb.EJBTestCase;
-import junit.framework.Test;
-
-/**
- * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
- * @version <tt>$Revision: 44174 $</tt>
- */
-public class JDBC2PmEjbStoreUnitTestCase
-   extends EJBTestCase
-{
-   public static Test suite() throws Exception
-   {
-      return JBossTestCase.getDeploySetup(JDBC2PmEjbStoreUnitTestCase.class, "cmp2-jdbc2pm-ejbstore.jar");
-   }
-
-   public JDBC2PmEjbStoreUnitTestCase(String methodName)
-   {
-      super(methodName);
-   }
-
-   protected void setUp() throws Exception
-   {
-      getALocalHome().create(new Long(1), new Integer(2));
-   }
-
-   protected void tearDown() throws Exception
-   {
-      getALocalHome().remove(new Long(1));
-   }
-
-   // Tests
-
-   public void testMain() throws Throwable
-   {
-      ALocal a = getALocalHome().findByPrimaryKey(new Long(1));
-      int storeCount = a.getStoreCount().intValue();
-      a.setIntField(new Integer(a.getIntField().intValue() + 1));
-      assertEquals(storeCount + 1, a.getStoreCount().intValue());      
-   }
-
-   // Private
-
-   private ALocalHome getALocalHome()
-      throws NamingException
-   {
-      return (ALocalHome)lookup("ALocal");
-   }
-
-   private Object lookup(String name) throws NamingException
-   {
-      InitialContext ic = new InitialContext();
-      return ic.lookup(name);
-   }
-}

Copied: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/test/JDBC2PmEjbStoreUnitTestCase.java (from rev 93381, branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/test/JDBC2PmEjbStoreUnitTestCase.java)
===================================================================
--- branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/test/JDBC2PmEjbStoreUnitTestCase.java	                        (rev 0)
+++ branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/main/org/jboss/test/cmp2/jdbc2pm/ejbstore/test/JDBC2PmEjbStoreUnitTestCase.java	2009-09-16 11:28:50 UTC (rev 93599)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.test.cmp2.jdbc2pm.ejbstore.test;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import org.jboss.test.JBossTestCase;
+import org.jboss.test.cmp2.jdbc2pm.ejbstore.ejb.ALocal;
+import org.jboss.test.cmp2.jdbc2pm.ejbstore.ejb.ALocalHome;
+import org.jboss.test.util.ejb.EJBTestCase;
+import junit.framework.Test;
+
+/**
+ * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
+ * @version <tt>$Revision: 44174 $</tt>
+ */
+public class JDBC2PmEjbStoreUnitTestCase
+   extends EJBTestCase
+{
+   public static Test suite() throws Exception
+   {
+      return JBossTestCase.getDeploySetup(JDBC2PmEjbStoreUnitTestCase.class, "cmp2-jdbc2pm-ejbstore.jar");
+   }
+
+   public JDBC2PmEjbStoreUnitTestCase(String methodName)
+   {
+      super(methodName);
+   }
+
+   protected void setUp() throws Exception
+   {
+      getALocalHome().create(new Long(1), new Integer(2));
+   }
+
+   protected void tearDown() throws Exception
+   {
+      getALocalHome().remove(new Long(1));
+   }
+
+   // Tests
+
+   public void testMain() throws Throwable
+   {
+      ALocal a = getALocalHome().findByPrimaryKey(new Long(1));
+      int storeCount = a.getStoreCount().intValue();
+      a.setIntField(new Integer(a.getIntField().intValue() + 1));
+      assertEquals(storeCount + 1, a.getStoreCount().intValue());      
+   }
+
+   // Private
+
+   private ALocalHome getALocalHome()
+      throws NamingException
+   {
+      return (ALocalHome)lookup("ALocal");
+   }
+
+   private Object lookup(String name) throws NamingException
+   {
+      InitialContext ic = new InitialContext();
+      return ic.lookup(name);
+   }
+}

Copied: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm (from rev 93381, branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/cmp2/jdbc2pm)

Copied: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore (from rev 93381, branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/cmp2/jdbc2pm/ejbstore)

Copied: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF (from rev 93381, branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF)

Deleted: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/ejb-jar.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/ejb-jar.xml	2009-09-11 09:46:07 UTC (rev 93381)
+++ branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/ejb-jar.xml	2009-09-16 11:28:50 UTC (rev 93599)
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE ejb-jar PUBLIC
-   "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
-   "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
-
-<ejb-jar>
-   <enterprise-beans>
-      <session>
-         <description>JUnit Session Bean Test Runner</description>
-         <ejb-name>EJBTestRunnerEJB</ejb-name>
-         <home>org.jboss.test.util.ejb.EJBTestRunnerHome</home>
-         <remote>org.jboss.test.util.ejb.EJBTestRunner</remote>
-         <ejb-class>org.jboss.test.util.ejb.EJBTestRunnerBean</ejb-class>
-         <session-type>Stateless</session-type>
-         <transaction-type>Bean</transaction-type>
-      </session>
-      <entity >
-         <ejb-name>A</ejb-name>
-
-         <local-home>org.jboss.test.cmp2.jdbc2pm.ejbstore.ejb.ALocalHome</local-home>
-         <local>org.jboss.test.cmp2.jdbc2pm.ejbstore.ejb.ALocal</local>
-
-         <ejb-class>org.jboss.test.cmp2.jdbc2pm.ejbstore.ejb.ABean</ejb-class>
-         <persistence-type>Container</persistence-type>
-         <prim-key-class>java.lang.Long</prim-key-class>
-         <reentrant>false</reentrant>
-         <cmp-version>2.x</cmp-version>
-         <abstract-schema-name>A</abstract-schema-name>
-         <cmp-field >
-            <description><![CDATA[]]></description>
-            <field-name>id</field-name>
-         </cmp-field>
-         <cmp-field >
-            <description><![CDATA[]]></description>
-            <field-name>intField</field-name>
-         </cmp-field>
-         <cmp-field >
-            <description><![CDATA[]]></description>
-            <field-name>storeCount</field-name>
-         </cmp-field>
-         <primkey-field>id</primkey-field>
-      </entity>
-   </enterprise-beans>
-
-   <assembly-descriptor >
-      <container-transaction >
-         <method >
-            <ejb-name>A</ejb-name>
-            <method-name>getStoreCount</method-name>
-         </method>
-         <trans-attribute>RequiresNew</trans-attribute>
-      </container-transaction>
-      <container-transaction >
-         <method >
-            <ejb-name>A</ejb-name>
-            <method-name>setIntField</method-name>
-         </method>
-         <trans-attribute>RequiresNew</trans-attribute>
-      </container-transaction>
-   </assembly-descriptor>
-
-</ejb-jar>

Copied: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/ejb-jar.xml (from rev 93381, branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/ejb-jar.xml)
===================================================================
--- branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/ejb-jar.xml	                        (rev 0)
+++ branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/ejb-jar.xml	2009-09-16 11:28:50 UTC (rev 93599)
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<!DOCTYPE ejb-jar PUBLIC
+   "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
+   "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
+
+<ejb-jar>
+   <enterprise-beans>
+      <session>
+         <description>JUnit Session Bean Test Runner</description>
+         <ejb-name>EJBTestRunnerEJB</ejb-name>
+         <home>org.jboss.test.util.ejb.EJBTestRunnerHome</home>
+         <remote>org.jboss.test.util.ejb.EJBTestRunner</remote>
+         <ejb-class>org.jboss.test.util.ejb.EJBTestRunnerBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Bean</transaction-type>
+      </session>
+      <entity >
+         <ejb-name>A</ejb-name>
+
+         <local-home>org.jboss.test.cmp2.jdbc2pm.ejbstore.ejb.ALocalHome</local-home>
+         <local>org.jboss.test.cmp2.jdbc2pm.ejbstore.ejb.ALocal</local>
+
+         <ejb-class>org.jboss.test.cmp2.jdbc2pm.ejbstore.ejb.ABean</ejb-class>
+         <persistence-type>Container</persistence-type>
+         <prim-key-class>java.lang.Long</prim-key-class>
+         <reentrant>false</reentrant>
+         <cmp-version>2.x</cmp-version>
+         <abstract-schema-name>A</abstract-schema-name>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>id</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>intField</field-name>
+         </cmp-field>
+         <cmp-field >
+            <description><![CDATA[]]></description>
+            <field-name>storeCount</field-name>
+         </cmp-field>
+         <primkey-field>id</primkey-field>
+      </entity>
+   </enterprise-beans>
+
+   <assembly-descriptor >
+      <container-transaction >
+         <method >
+            <ejb-name>A</ejb-name>
+            <method-name>getStoreCount</method-name>
+         </method>
+         <trans-attribute>RequiresNew</trans-attribute>
+      </container-transaction>
+      <container-transaction >
+         <method >
+            <ejb-name>A</ejb-name>
+            <method-name>setIntField</method-name>
+         </method>
+         <trans-attribute>RequiresNew</trans-attribute>
+      </container-transaction>
+   </assembly-descriptor>
+
+</ejb-jar>

Deleted: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/jboss.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/jboss.xml	2009-09-11 09:46:07 UTC (rev 93381)
+++ branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/jboss.xml	2009-09-16 11:28:50 UTC (rev 93599)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<jboss>
-   <enterprise-beans>
-      <entity>
-         <ejb-name>A</ejb-name>
-         <local-jndi-name>ALocal</local-jndi-name>
-         <configuration-name>custom</configuration-name>
-      </entity>
-      <session>
-         <ejb-name>EJBTestRunnerEJB</ejb-name>
-         <jndi-name>ejb/EJBTestRunner</jndi-name>
-      </session>
-   </enterprise-beans>
-
-    <container-configurations>
-        <container-configuration extends="cmp2.x jdbc2 pm">
-            <container-name>custom</container-name>
-            <call-ejb-store-on-clean>false</call-ejb-store-on-clean>
-        </container-configuration>
-    </container-configurations>
-</jboss>

Copied: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/jboss.xml (from rev 93381, branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/jboss.xml)
===================================================================
--- branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/jboss.xml	                        (rev 0)
+++ branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/jboss.xml	2009-09-16 11:28:50 UTC (rev 93599)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<jboss>
+   <enterprise-beans>
+      <entity>
+         <ejb-name>A</ejb-name>
+         <local-jndi-name>ALocal</local-jndi-name>
+         <configuration-name>custom</configuration-name>
+      </entity>
+      <session>
+         <ejb-name>EJBTestRunnerEJB</ejb-name>
+         <jndi-name>ejb/EJBTestRunner</jndi-name>
+      </session>
+   </enterprise-beans>
+
+    <container-configurations>
+        <container-configuration extends="cmp2.x jdbc2 pm">
+            <container-name>custom</container-name>
+            <call-ejb-store-on-clean>false</call-ejb-store-on-clean>
+        </container-configuration>
+    </container-configurations>
+</jboss>

Deleted: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/jbosscmp-jdbc.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/jbosscmp-jdbc.xml	2009-09-11 09:46:07 UTC (rev 93381)
+++ branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/jbosscmp-jdbc.xml	2009-09-16 11:28:50 UTC (rev 93599)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jbosscmp-jdbc PUBLIC
-   "-//JBoss//DTD JBOSSCMP-JDBC 3.2//EN"
-   "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_2.dtd">
-<jbosscmp-jdbc>
-   <defaults>
-      <remove-table>true</remove-table>
-   </defaults>
-</jbosscmp-jdbc>

Copied: branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/jbosscmp-jdbc.xml (from rev 93381, branches/JBPAPP_4_2_0_GA_CP/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/jbosscmp-jdbc.xml)
===================================================================
--- branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/jbosscmp-jdbc.xml	                        (rev 0)
+++ branches/JBPAPP_4_3_0_GA_CP04_JBPAPP-2798/testsuite/src/resources/cmp2/jdbc2pm/ejbstore/META-INF/jbosscmp-jdbc.xml	2009-09-16 11:28:50 UTC (rev 93599)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jbosscmp-jdbc PUBLIC
+   "-//JBoss//DTD JBOSSCMP-JDBC 3.2//EN"
+   "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_2.dtd">
+<jbosscmp-jdbc>
+   <defaults>
+      <remove-table>true</remove-table>
+   </defaults>
+</jbosscmp-jdbc>




More information about the jboss-cvs-commits mailing list