djencks 2004/12/26 15:30:03
Modified: modules/openejb-builder/src/test/org/openejb/deployment
CMPEntityBuilderTest.java EJBConfigBuilderTest.java
PlanParsingTest.java
Log:
replace use of GBeanAdaptors with namespaced elements
Revision Changes Path
1.5 +6 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CMPEntityBuilderTest.java 22 Dec 2004 08:29:54 -0000 1.4
+++ CMPEntityBuilderTest.java 26 Dec 2004 20:30:03 -0000 1.5
@@ -62,6 +62,7 @@
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.repository.Repository;
import org.apache.geronimo.xbeans.j2ee.EjbJarDocument;
import org.apache.geronimo.xbeans.j2ee.EjbJarType;
import org.apache.xmlbeans.XmlObject;
@@ -88,6 +89,7 @@
public class CMPEntityBuilderTest extends TestCase {
private URI defaultParentId = null;
private SkeletonGenerator skeletonGenerator = null;
+ private Repository repository = null;
private Kernel kernel = null;
private static final File basedir = new
File(System.getProperty("basedir", System.getProperty("user.dir")));
@@ -106,7 +108,7 @@
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator, kernel);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator, repository, kernel);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
GlobalSchema globalSchema = new GlobalSchema("Test");
@@ -153,7 +155,7 @@
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator, kernel);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator, repository, kernel);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
GlobalSchema globalSchema = new GlobalSchema("Test");
@@ -201,7 +203,7 @@
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator, kernel);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator, repository, kernel);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
GlobalSchema globalSchema = new GlobalSchema("Test");
1.9 +6 -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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- EJBConfigBuilderTest.java 22 Dec 2004 08:29:54 -0000 1.8
+++ EJBConfigBuilderTest.java 26 Dec 2004 20:30:03 -0000 1.9
@@ -81,6 +81,7 @@
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.j2ee.management.impl.J2EEServerImpl;
import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.repository.Repository;
import org.apache.geronimo.kernel.management.State;
import org.apache.geronimo.system.serverinfo.ServerInfo;
import org.openejb.ContainerIndex;
@@ -94,6 +95,7 @@
private static final String j2eeDomainName = "openejb.server";
private static final String j2eeServerName = "TestOpenEJBServer";
+ private Repository repository = null;
private Kernel kernel;
private ResourceReferenceBuilder resourceReferenceBuilder = new
ResourceReferenceBuilder() {
@@ -175,7 +177,7 @@
OpenORBSkeletonGenerator skeletonGenerator = new
OpenORBSkeletonGenerator(cl);
skeletonGenerator.doStart();
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator, kernel);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator, repository, kernel);
JarFile jarFile = DeploymentUtil.createJarFile(ejbJarFile);
Module module = moduleBuilder.createModule(null, jarFile);
@@ -223,7 +225,7 @@
OpenORBSkeletonGenerator skeletonGenerator = new
OpenORBSkeletonGenerator(cl);
skeletonGenerator.doStart();
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator, kernel);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator, repository, kernel);
File tempDir = null;
try {
@@ -272,7 +274,7 @@
OpenORBSkeletonGenerator skeletonGenerator = new
OpenORBSkeletonGenerator(cl);
skeletonGenerator.doStart();
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator, kernel);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator, repository, kernel);
File tempDir = null;
try {
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PlanParsingTest.java 22 Dec 2004 08:29:54 -0000 1.3
+++ PlanParsingTest.java 26 Dec 2004 20:30:03 -0000 1.4
@@ -5,13 +5,15 @@
import junit.framework.TestCase;
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.repository.Repository;
/**
*/
public class PlanParsingTest extends TestCase {
+ private Repository repository = null;
private Kernel kernel = null;
- private OpenEJBModuleBuilder builder = new OpenEJBModuleBuilder(null,
null, kernel);
+ private OpenEJBModuleBuilder builder = new OpenEJBModuleBuilder(null,
null, repository, kernel);
File basedir = new File(System.getProperty("basedir", "."));
public void testResourceRef() throws Exception {
