gdamour 2005/09/10 10:49:07
Modified: modules/openejb-builder/src/test/org/openejb/deployment
CMPEntityBuilderTest.java
CMPEntityBuilderTestUtil.java
EarDeploymentTest.java
EjbJarModuleDeploymentTest.java
Log:
GERONIMO-710 Generating DDLs for CMP deployment.
o An Ant task to export the DDL associated to the CMP of an ejb-jar module.
o Refactor CMPEntityBuilder: all the logic specific to the creation of the
three TranQL schemata is refactored within SchemataBuilder.
Revision Changes Path
1.21 +16 -20
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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- CMPEntityBuilderTest.java 6 Sep 2005 08:29:36 -0000 1.20
+++ CMPEntityBuilderTest.java 10 Sep 2005 14:49:07 -0000 1.21
@@ -74,7 +74,6 @@
import org.openejb.deployment.pkgen.TranQLPKGenBuilder;
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarDocument;
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
-import org.tranql.cache.GlobalSchema;
import org.tranql.ejb.EJBSchema;
import org.tranql.schema.Association;
import org.tranql.schema.AssociationEnd;
@@ -82,8 +81,8 @@
import org.tranql.schema.Entity;
import org.tranql.schema.FKAttribute;
import org.tranql.schema.Association.JoinDefinition;
+import org.tranql.sql.SQLSchema;
import org.tranql.sql.Table;
-import org.tranql.sql.sql92.SQL92Schema;
/**
*
@@ -144,10 +143,6 @@
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
TranQLPKGenBuilder pkGen = new TranQLPKGenBuilder();
- GlobalSchema globalSchema = new GlobalSchema("Test");
- EJBSchema ejbSchema = new EJBSchema("Test");
- SQL92Schema sqlSchema = new SQL92Schema("Test", null, null);
-
File tempDir = DeploymentUtil.createTempDir();
try {
EARContext earContext = new EARContext(tempDir,
@@ -163,7 +158,10 @@
null, null);
J2eeContext moduleJ2eeContext = new
J2eeContextImpl("geronimo.server", "TestGeronimoServer", "null",
NameFactory.EJB_MODULE, "MockModule", null, null);
ClassLoader cl = Thread.currentThread().getContextClassLoader();
- builder.buildCMPSchema(earContext, moduleJ2eeContext,
ejbJarType, openejbJarType, cl, ejbSchema, sqlSchema, globalSchema, pkGen,
null);
+ Schemata schemata = builder.buildSchemata(earContext,
moduleJ2eeContext, "Test", ejbJarType, openejbJarType, cl, pkGen, null);
+
+ EJBSchema ejbSchema = schemata.getEjbSchema();
+ SQLSchema sqlSchema = schemata.getSqlSchema();
assertOneToOneEntity(ejbSchema.getEntity("A"),
ejbSchema.getEntity("B"));
assertOneToOneEntity(sqlSchema.getEntity("A"),
sqlSchema.getEntity("B"));
@@ -190,10 +188,6 @@
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
TranQLPKGenBuilder pkGen = new TranQLPKGenBuilder();
- GlobalSchema globalSchema = new GlobalSchema("Test");
- EJBSchema ejbSchema = new EJBSchema("Test");
- SQL92Schema sqlSchema = new SQL92Schema("Test", null, null);
-
File tempDir = DeploymentUtil.createTempDir();
try {
EARContext earContext = new EARContext(tempDir,
@@ -209,8 +203,11 @@
null, null);
J2eeContext moduleJ2eeContext = new
J2eeContextImpl("geronimo.server", "TestGeronimoServer", "null",
NameFactory.EJB_MODULE, "MockModule", null, null);
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- builder.buildCMPSchema(earContext, moduleJ2eeContext,
ejbJarType, openejbJarType, cl, ejbSchema, sqlSchema, globalSchema, pkGen,
null);
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ Schemata schemata = builder.buildSchemata(earContext,
moduleJ2eeContext, "Test", ejbJarType, openejbJarType, cl, pkGen, null);
+
+ EJBSchema ejbSchema = schemata.getEjbSchema();
+ SQLSchema sqlSchema = schemata.getSqlSchema();
assertOneToManyEntity(ejbSchema.getEntity("A"),
ejbSchema.getEntity("B"));
assertOneToManyEntity(sqlSchema.getEntity("A"),
sqlSchema.getEntity("B"));
@@ -237,10 +234,6 @@
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
TranQLPKGenBuilder pkGen = new TranQLPKGenBuilder();
- GlobalSchema globalSchema = new GlobalSchema("Test");
- EJBSchema ejbSchema = new EJBSchema("Test");
- SQL92Schema sqlSchema = new SQL92Schema("Test", null, null);
-
File tempDir = DeploymentUtil.createTempDir();
try {
EARContext earContext = new EARContext(tempDir,
@@ -256,8 +249,11 @@
null, null);
J2eeContext moduleJ2eeContext = new
J2eeContextImpl("geronimo.server", "TestGeronimoServer", "null",
NameFactory.EJB_MODULE, "MockModule", null, null);
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- builder.buildCMPSchema(earContext, moduleJ2eeContext,
ejbJarType, openejbJarType, cl, ejbSchema, sqlSchema, globalSchema, pkGen,
null);
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ Schemata schemata = builder.buildSchemata(earContext,
moduleJ2eeContext, "Test", ejbJarType, openejbJarType, cl, pkGen, null);
+
+ EJBSchema ejbSchema = schemata.getEjbSchema();
+ SQLSchema sqlSchema = schemata.getSqlSchema();
assertManyToManyEntity(ejbSchema.getEntity("A"),
ejbSchema.getEntity("B"));
assertManyToManyEntity(sqlSchema.getEntity("A"),
sqlSchema.getEntity("B"));
1.7 +3 -3
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CMPEntityBuilderTestUtil.java 7 Jul 2005 21:37:08 -0000 1.6
+++ CMPEntityBuilderTestUtil.java 10 Sep 2005 14:49:07 -0000 1.7
@@ -80,8 +80,8 @@
this.delegate = new CMPEntityBuilder(builder);
}
- public void buildCMPSchema(EARContext earContext, J2eeContext
moduleJ2eeContext, EjbJarType ejbJar, OpenejbOpenejbJarType openejbEjbJar,
ClassLoader cl, EJBSchema ejbSchema, SQLSchema sqlSchema, GlobalSchema
globalSchema, PKGenBuilder pkGen, DataSource dataSource) throws
DeploymentException {
- delegate.buildCMPSchema(earContext, moduleJ2eeContext, ejbJar,
openejbEjbJar, cl, ejbSchema, sqlSchema, globalSchema, pkGen, dataSource);
+ 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);
}
}
1.4 +1 -2
openejb/modules/openejb-builder/src/test/org/openejb/deployment/EarDeploymentTest.java
Index: EarDeploymentTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/EarDeploymentTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EarDeploymentTest.java 8 May 2005 19:37:14 -0000 1.3
+++ EarDeploymentTest.java 10 Sep 2005 14:49:07 -0000 1.4
@@ -51,7 +51,6 @@
import junit.framework.Test;
import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.Kernel;
/**
* @version $Revision$ $Date$
1.3 +1 -2
openejb/modules/openejb-builder/src/test/org/openejb/deployment/EjbJarModuleDeploymentTest.java
Index: EjbJarModuleDeploymentTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/EjbJarModuleDeploymentTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EjbJarModuleDeploymentTest.java 8 May 2005 19:37:14 -0000 1.2
+++ EjbJarModuleDeploymentTest.java 10 Sep 2005 14:49:07 -0000 1.3
@@ -51,7 +51,6 @@
import junit.framework.Test;
import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.Kernel;
/**
* @version $Revision$ $Date$
