gdamour 2005/09/13 09:05:00
Modified: modules/openejb-builder/src/test/org/openejb/deployment
CMPEntityBuilderTest.java
CMPEntityBuilderTestUtil.java
Log:
GERONIMO-1004 SequenceTablePrimaryKeyGenerator transaction handling is broken
(Tranql)
As pointed out by David J, a TransactionManager needs to be passed to
SequenceTablePrimaryKeyGenerator in order to suspend and resume in-flight
transactions while retrieving the next ids.
Revision Changes Path
1.22 +4 -4
openejb/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java
Index: CMPEntityBuilderTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- CMPEntityBuilderTest.java 10 Sep 2005 14:49:07 -0000 1.21
+++ CMPEntityBuilderTest.java 13 Sep 2005 13:05:00 -0000 1.22
@@ -158,7 +158,7 @@
null, null);
J2eeContext moduleJ2eeContext = new
J2eeContextImpl("geronimo.server", "TestGeronimoServer", "null",
NameFactory.EJB_MODULE, "MockModule", null, null);
ClassLoader cl = Thread.currentThread().getContextClassLoader();
- Schemata schemata = builder.buildSchemata(earContext,
moduleJ2eeContext, "Test", ejbJarType, openejbJarType, cl, pkGen, null);
+ Schemata schemata = builder.buildSchemata(earContext,
moduleJ2eeContext, "Test", ejbJarType, openejbJarType, cl, pkGen, null, null);
EJBSchema ejbSchema = schemata.getEjbSchema();
SQLSchema sqlSchema = schemata.getSqlSchema();
@@ -204,7 +204,7 @@
J2eeContext moduleJ2eeContext = new
J2eeContextImpl("geronimo.server", "TestGeronimoServer", "null",
NameFactory.EJB_MODULE, "MockModule", null, null);
ClassLoader cl = Thread.currentThread().getContextClassLoader();
- Schemata schemata = builder.buildSchemata(earContext,
moduleJ2eeContext, "Test", ejbJarType, openejbJarType, cl, pkGen, null);
+ Schemata schemata = builder.buildSchemata(earContext,
moduleJ2eeContext, "Test", ejbJarType, openejbJarType, cl, pkGen, null, null);
EJBSchema ejbSchema = schemata.getEjbSchema();
SQLSchema sqlSchema = schemata.getSqlSchema();
@@ -250,7 +250,7 @@
J2eeContext moduleJ2eeContext = new
J2eeContextImpl("geronimo.server", "TestGeronimoServer", "null",
NameFactory.EJB_MODULE, "MockModule", null, null);
ClassLoader cl = Thread.currentThread().getContextClassLoader();
- Schemata schemata = builder.buildSchemata(earContext,
moduleJ2eeContext, "Test", ejbJarType, openejbJarType, cl, pkGen, null);
+ Schemata schemata = builder.buildSchemata(earContext,
moduleJ2eeContext, "Test", ejbJarType, openejbJarType, cl, pkGen, null, null);
EJBSchema ejbSchema = schemata.getEjbSchema();
SQLSchema sqlSchema = schemata.getSqlSchema();
1.8 +2 -2
openejb/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTestUtil.java
Index: CMPEntityBuilderTestUtil.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTestUtil.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CMPEntityBuilderTestUtil.java 10 Sep 2005 14:49:07 -0000 1.7
+++ CMPEntityBuilderTestUtil.java 13 Sep 2005 13:05:00 -0000 1.8
@@ -81,7 +81,7 @@
}
public Schemata buildCMPSchema(EARContext earContext, J2eeContext
moduleJ2eeContext, EjbJarType ejbJar, OpenejbOpenejbJarType openejbEjbJar,
ClassLoader cl, PKGenBuilder pkGen, DataSource dataSource) throws
DeploymentException {
- return delegate.buildSchemata(earContext, moduleJ2eeContext, "Test",
ejbJar, openejbEjbJar, cl, pkGen, dataSource);
+ return delegate.buildSchemata(earContext, moduleJ2eeContext, "Test",
ejbJar, openejbEjbJar, cl, pkGen, dataSource, null);
}
}
