maguro 2004/11/10 15:25:10
Modified: modules/openejb-builder/src/test/org/openejb/deployment
CMPEntityBuilderTest.java EJBConfigBuilderTest.java
PlanParsingTest.java
Log:
Fixes for my GBeans.
Revision Changes Path
1.2 +5 -5
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CMPEntityBuilderTest.java 10 Nov 2004 01:35:10 -0000 1.1
+++ CMPEntityBuilderTest.java 10 Nov 2004 20:25:10 -0000 1.2
@@ -61,6 +61,7 @@
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
+import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.xbeans.j2ee.EjbJarDocument;
import org.apache.geronimo.xbeans.j2ee.EjbJarType;
import org.apache.xmlbeans.XmlObject;
@@ -104,7 +105,7 @@
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator);
+ OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(null,
defaultParentId, skeletonGenerator);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
GlobalSchema globalSchema = new GlobalSchema("Test");
@@ -151,7 +152,7 @@
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator);
+ OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(null,
defaultParentId, skeletonGenerator);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
GlobalSchema globalSchema = new GlobalSchema("Test");
@@ -199,7 +200,7 @@
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator);
+ OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(null,
defaultParentId, skeletonGenerator);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
GlobalSchema globalSchema = new GlobalSchema("Test");
@@ -395,5 +396,4 @@
fail("JoinDefinitions are misconfigured.");
}
}
-
}
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EJBConfigBuilderTest.java 10 Nov 2004 04:38:32 -0000 1.2
+++ EJBConfigBuilderTest.java 10 Nov 2004 20:25:10 -0000 1.3
@@ -162,7 +162,7 @@
OpenORBSkeletonGenerator skeletonGenerator = new
OpenORBSkeletonGenerator(cl);
skeletonGenerator.doStart();
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator);
+ OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(null,
defaultParentId, skeletonGenerator);
JarFile jarFile = DeploymentUtil.createJarFile(ejbJarFile);
Module module = moduleBuilder.createModule(null, jarFile);
@@ -210,7 +210,7 @@
OpenORBSkeletonGenerator skeletonGenerator = new
OpenORBSkeletonGenerator(cl);
skeletonGenerator.doStart();
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator);
+ OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(null,
defaultParentId, skeletonGenerator);
File tempDir = null;
try {
@@ -259,7 +259,7 @@
OpenORBSkeletonGenerator skeletonGenerator = new
OpenORBSkeletonGenerator(cl);
skeletonGenerator.doStart();
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator);
+ OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(null,
defaultParentId, skeletonGenerator);
File tempDir = null;
try {
1.2 +1 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PlanParsingTest.java 10 Nov 2004 01:35:10 -0000 1.1
+++ PlanParsingTest.java 10 Nov 2004 20:25:10 -0000 1.2
@@ -9,7 +9,7 @@
*/
public class PlanParsingTest extends TestCase {
- private OpenEJBModuleBuilder builder = new OpenEJBModuleBuilder(null,
null);
+ private OpenEJBModuleBuilder builder = new OpenEJBModuleBuilder(null,
null, null);
File basedir = new File(System.getProperty("basedir", "."));
public void testResourceRef() throws Exception {
