djencks 2004/11/07 12:30:54
Modified: modules/core/src/test/org/openejb/deployment
CMPEntityBuilderTest.java EJBConfigBuilderTest.java
PlanParsingTest.java
Log:
implement GERONIMO-435. Every builder can specify the default parentId. For
services, a module can specify the empty string parentId="" to get no parent.
Revision Changes Path
1.6 +8 -5
openejb/modules/core/src/test/org/openejb/deployment/CMPEntityBuilderTest.java
Index: CMPEntityBuilderTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/deployment/CMPEntityBuilderTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CMPEntityBuilderTest.java 5 Nov 2004 19:14:03 -0000 1.5
+++ CMPEntityBuilderTest.java 7 Nov 2004 17:30:54 -0000 1.6
@@ -60,11 +60,11 @@
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
-import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.xbeans.j2ee.EjbJarDocument;
import org.apache.geronimo.xbeans.j2ee.EjbJarType;
import org.apache.xmlbeans.XmlObject;
+import org.openejb.corba.compiler.SkeletonGenerator;
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarDocument;
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
import org.tranql.cache.GlobalSchema;
@@ -85,6 +85,9 @@
*
* */
public class CMPEntityBuilderTest extends TestCase {
+ private URI defaultParentId = null;
+ private SkeletonGenerator skeletonGenerator = null;
+
private static final File basedir = new
File(System.getProperty("basedir", System.getProperty("user.dir")));
public void testOneToOne() throws Exception {
@@ -101,7 +104,7 @@
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder();
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
GlobalSchema globalSchema = new GlobalSchema("Test");
@@ -148,7 +151,7 @@
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder();
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
GlobalSchema globalSchema = new GlobalSchema("Test");
@@ -196,7 +199,7 @@
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder();
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
GlobalSchema globalSchema = new GlobalSchema("Test");
1.40 +16 -21
openejb/modules/core/src/test/org/openejb/deployment/EJBConfigBuilderTest.java
Index: EJBConfigBuilderTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/deployment/EJBConfigBuilderTest.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- EJBConfigBuilderTest.java 5 Nov 2004 23:41:43 -0000 1.39
+++ EJBConfigBuilderTest.java 7 Nov 2004 17:30:54 -0000 1.40
@@ -54,6 +54,7 @@
import java.io.ObjectInputStream;
import java.net.URL;
import java.net.URLClassLoader;
+import java.net.URI;
import java.sql.Connection;
import java.sql.Statement;
import java.util.Collections;
@@ -77,16 +78,13 @@
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-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.management.State;
import org.apache.geronimo.system.serverinfo.ServerInfo;
import org.openejb.ContainerIndex;
-import org.openejb.corba.compiler.SkeletonGenerator;
-import org.openejb.corba.compiler.OpenORBSkeletonGenerator;
import org.openejb.corba.compiler.AntCompiler;
-
+import org.openejb.corba.compiler.OpenORBSkeletonGenerator;
import org.tranql.sql.jdbc.JDBCUtil;
/**
@@ -118,6 +116,7 @@
};
private J2eeContext j2eeContext = new J2eeContextImpl(j2eeDomainName,
j2eeServerName, NameFactory.NULL, "testejbmodule", "testapp",
NameFactory.J2EE_APPLICATION);
+ private URI defaultParentId;
// public void testCreateResourceAdapterNameQuery() throws Exception {
// File tempDir = null;
@@ -157,10 +156,9 @@
String j2eeApplicationName = "null";
String j2eeModuleName = "org/openejb/deployment/test";
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder();
- OpenORBSkeletonGenerator generator = new OpenORBSkeletonGenerator();
- generator.setCompiler(new AntCompiler());
- moduleBuilder.setSkeletonGenerator(generator);
+ OpenORBSkeletonGenerator skeletonGenerator = new
OpenORBSkeletonGenerator();
+ skeletonGenerator.setCompiler(new AntCompiler());
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator);
ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
ClassLoader cl = new URLClassLoader(new URL[]{ejbJarFile.toURL()},
oldCl);
@@ -204,10 +202,9 @@
String j2eeApplicationName = "null";
String j2eeModuleName = "org/openejb/deployment/test";
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder();
- OpenORBSkeletonGenerator generator = new OpenORBSkeletonGenerator();
- generator.setCompiler(new AntCompiler());
- moduleBuilder.setSkeletonGenerator(generator);
+ OpenORBSkeletonGenerator skeletonGenerator = new
OpenORBSkeletonGenerator();
+ skeletonGenerator.setCompiler(new AntCompiler());
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator);
File earFile = new File("target/test-ejb-jar.jar");
@@ -219,8 +216,7 @@
File tempDir = null;
try {
tempDir = DeploymentUtil.createTempDir();
- EARConfigBuilder earConfigBuilder = new EARConfigBuilder(
- new ObjectName(j2eeDomainName +
":j2eeType=J2EEServer,name=" + j2eeServerName),
+ EARConfigBuilder earConfigBuilder = new
EARConfigBuilder(defaultParentId, new ObjectName(j2eeDomainName +
":j2eeType=J2EEServer,name=" + j2eeServerName),
DeploymentHelper.TRANSACTIONCONTEXTMANAGER_NAME,
DeploymentHelper.TRACKEDCONNECTIONASSOCIATOR_NAME,
DeploymentHelper.TRANSACTIONALTIMER_NAME,
@@ -255,10 +251,9 @@
String j2eeApplicationName =
"org/apache/geronimo/j2ee/deployment/test";
String j2eeModuleName = "test-ejb-jar.jar";
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder();
- OpenORBSkeletonGenerator generator = new OpenORBSkeletonGenerator();
- generator.setCompiler(new AntCompiler());
- moduleBuilder.setSkeletonGenerator(generator);
+ OpenORBSkeletonGenerator skeletonGenerator = new
OpenORBSkeletonGenerator();
+ skeletonGenerator.setCompiler(new AntCompiler());
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(defaultParentId, skeletonGenerator);
File earFile = new File("target/test-ear.ear");
@@ -270,8 +265,7 @@
File tempDir = null;
try {
tempDir = DeploymentUtil.createTempDir();
- EARConfigBuilder earConfigBuilder = new EARConfigBuilder(
- new ObjectName(j2eeDomainName +
":j2eeType=J2EEServer,name=" + j2eeServerName),
+ EARConfigBuilder earConfigBuilder = new
EARConfigBuilder(defaultParentId, new ObjectName(j2eeDomainName +
":j2eeType=J2EEServer,name=" + j2eeServerName),
DeploymentHelper.TRANSACTIONCONTEXTMANAGER_NAME,
DeploymentHelper.TRACKEDCONNECTIONASSOCIATOR_NAME,
DeploymentHelper.TRANSACTIONALTIMER_NAME,
@@ -440,6 +434,7 @@
protected void setUp() throws Exception {
super.setUp();
+ defaultParentId = new URI("org/apache/geronimo/Server");
String str =
System.getProperty(javax.naming.Context.URL_PKG_PREFIXES);
if (str == null) {
str = ":org.apache.geronimo.naming";
1.5 +1 -1
openejb/modules/core/src/test/org/openejb/deployment/PlanParsingTest.java
Index: PlanParsingTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/deployment/PlanParsingTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PlanParsingTest.java 28 Oct 2004 01:56:11 -0000 1.4
+++ PlanParsingTest.java 7 Nov 2004 17:30:54 -0000 1.5
@@ -9,7 +9,7 @@
*/
public class PlanParsingTest extends TestCase {
- private OpenEJBModuleBuilder builder = new OpenEJBModuleBuilder();
+ private OpenEJBModuleBuilder builder = new OpenEJBModuleBuilder(null,
null);
File basedir = new File(System.getProperty("basedir", "."));
public void testResourceRef() throws Exception {
