djencks 2004/12/22 03:29:54
Modified: modules/openejb-builder/src/test/org/openejb/deployment
CMPEntityBuilderTest.java EJBConfigBuilderTest.java
PlanParsingTest.java
Log:
slight update of role auto-mapping to deploy time, but it doesn't work at the
moment
Revision Changes Path
1.4 +5 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CMPEntityBuilderTest.java 2 Dec 2004 23:14:00 -0000 1.3
+++ CMPEntityBuilderTest.java 22 Dec 2004 08:29:54 -0000 1.4
@@ -88,6 +88,7 @@
public class CMPEntityBuilderTest extends TestCase {
private URI defaultParentId = null;
private SkeletonGenerator skeletonGenerator = null;
+ private Kernel kernel = null;
private static final File basedir = new
File(System.getProperty("basedir", System.getProperty("user.dir")));
@@ -105,7 +106,7 @@
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(null,
defaultParentId, skeletonGenerator);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator, kernel);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
GlobalSchema globalSchema = new GlobalSchema("Test");
@@ -152,7 +153,7 @@
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(null,
defaultParentId, skeletonGenerator);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator, kernel);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
GlobalSchema globalSchema = new GlobalSchema("Test");
@@ -200,7 +201,7 @@
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(null,
defaultParentId, skeletonGenerator);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator, kernel);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
GlobalSchema globalSchema = new GlobalSchema("Test");
1.8 +4 -4
openejb/modules/openejb-builder/src/test/org/openejb/deployment/EJBConfigBuilderTest.java
Index: EJBConfigBuilderTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/EJBConfigBuilderTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- EJBConfigBuilderTest.java 6 Dec 2004 06:32:33 -0000 1.7
+++ EJBConfigBuilderTest.java 22 Dec 2004 08:29:54 -0000 1.8
@@ -175,7 +175,7 @@
OpenORBSkeletonGenerator skeletonGenerator = new
OpenORBSkeletonGenerator(cl);
skeletonGenerator.doStart();
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(null,
defaultParentId, skeletonGenerator);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator, kernel);
JarFile jarFile = DeploymentUtil.createJarFile(ejbJarFile);
Module module = moduleBuilder.createModule(null, jarFile);
@@ -223,7 +223,7 @@
OpenORBSkeletonGenerator skeletonGenerator = new
OpenORBSkeletonGenerator(cl);
skeletonGenerator.doStart();
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(null,
defaultParentId, skeletonGenerator);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator, kernel);
File tempDir = null;
try {
@@ -272,7 +272,7 @@
OpenORBSkeletonGenerator skeletonGenerator = new
OpenORBSkeletonGenerator(cl);
skeletonGenerator.doStart();
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(null,
defaultParentId, skeletonGenerator);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator, kernel);
File tempDir = null;
try {
1.3 +3 -1
openejb/modules/openejb-builder/src/test/org/openejb/deployment/PlanParsingTest.java
Index: PlanParsingTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/PlanParsingTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PlanParsingTest.java 10 Nov 2004 20:25:10 -0000 1.2
+++ PlanParsingTest.java 22 Dec 2004 08:29:54 -0000 1.3
@@ -4,12 +4,14 @@
import junit.framework.TestCase;
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
+import org.apache.geronimo.kernel.Kernel;
/**
*/
public class PlanParsingTest extends TestCase {
+ private Kernel kernel = null;
- private OpenEJBModuleBuilder builder = new OpenEJBModuleBuilder(null,
null, null);
+ private OpenEJBModuleBuilder builder = new OpenEJBModuleBuilder(null,
null, kernel);
File basedir = new File(System.getProperty("basedir", "."));
public void testResourceRef() throws Exception {
