djencks 2004/10/27 21:56:12
Modified: modules/core/src/test/org/openejb/deployment
CMPEntityBuilderTest.java
CMPEntityBuilderTestUtil.java
EJBConfigBuilderTest.java
MockConnectionProxyFactory.java
PlanParsingTest.java
Log:
GERONIMO-371, 393, 372. Refactor jsr-77 naming and restructure specification of ref
names to parallel jsr-77
Revision Changes Path
1.3 +14 -10
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CMPEntityBuilderTest.java 25 Oct 2004 14:24:35 -0000 1.2
+++ CMPEntityBuilderTest.java 28 Oct 2004 01:56:11 -0000 1.3
@@ -58,6 +58,8 @@
import junit.framework.TestCase;
import org.apache.geronimo.j2ee.deployment.EARContext;
+import org.apache.geronimo.j2ee.deployment.j2eeobjectnames.J2eeContext;
+import org.apache.geronimo.j2ee.deployment.j2eeobjectnames.J2eeContextImpl;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.xbeans.j2ee.EjbJarDocument;
import org.apache.geronimo.xbeans.j2ee.EjbJarType;
@@ -99,7 +101,7 @@
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(null);
+ OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder();
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
GlobalSchema globalSchema = new GlobalSchema("Test");
@@ -121,9 +123,9 @@
null,
null,
null);
-
+ J2eeContext moduleJ2eeContext = new J2eeContextImpl("geronimo.server",
"TestGeronimoServer", "null", "MockModule", null, null);
ClassLoader cl = Thread.currentThread().getContextClassLoader();
- builder.buildCMPSchema(earContext, "MockModule", ejbJarType,
openejbJarType, cl, ejbSchema, sqlSchema, globalSchema);
+ builder.buildCMPSchema(earContext, moduleJ2eeContext, ejbJarType,
openejbJarType, cl, ejbSchema, sqlSchema, globalSchema);
assertOneToOneEntity(ejbSchema.getEntity("A"),
ejbSchema.getEntity("B"));
assertOneToOneEntity(sqlSchema.getEntity("A"),
sqlSchema.getEntity("B"));
@@ -146,7 +148,7 @@
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(null);
+ OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder();
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
GlobalSchema globalSchema = new GlobalSchema("Test");
@@ -169,8 +171,9 @@
null,
null);
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- builder.buildCMPSchema(earContext, "MockModule", ejbJarType,
openejbJarType, cl, ejbSchema, sqlSchema, globalSchema);
+ J2eeContext moduleJ2eeContext = new J2eeContextImpl("geronimo.server",
"TestGeronimoServer", "null", "MockModule", null, null);
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ builder.buildCMPSchema(earContext, moduleJ2eeContext, ejbJarType,
openejbJarType, cl, ejbSchema, sqlSchema, globalSchema);
assertOneToManyEntity(ejbSchema.getEntity("A"),
ejbSchema.getEntity("B"));
assertOneToManyEntity(sqlSchema.getEntity("A"),
sqlSchema.getEntity("B"));
@@ -193,7 +196,7 @@
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(null);
+ OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder();
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
GlobalSchema globalSchema = new GlobalSchema("Test");
@@ -216,8 +219,9 @@
null,
null);
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- builder.buildCMPSchema(earContext, "MockModule", ejbJarType,
openejbJarType, cl, ejbSchema, sqlSchema, globalSchema);
+ J2eeContext moduleJ2eeContext = new J2eeContextImpl("geronimo.server",
"TestGeronimoServer", "null", "MockModule", null, null);
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ builder.buildCMPSchema(earContext, moduleJ2eeContext, ejbJarType,
openejbJarType, cl, ejbSchema, sqlSchema, globalSchema);
assertManyToManyEntity(ejbSchema.getEntity("A"),
ejbSchema.getEntity("B"));
assertManyToManyEntity(sqlSchema.getEntity("A"),
sqlSchema.getEntity("B"));
1.2 +4 -3
openejb/modules/core/src/test/org/openejb/deployment/CMPEntityBuilderTestUtil.java
Index: CMPEntityBuilderTestUtil.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/deployment/CMPEntityBuilderTestUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CMPEntityBuilderTestUtil.java 15 Oct 2004 01:49:06 -0000 1.1
+++ CMPEntityBuilderTestUtil.java 28 Oct 2004 01:56:11 -0000 1.2
@@ -50,6 +50,7 @@
import org.apache.geronimo.deployment.DeploymentException;
import org.apache.geronimo.j2ee.deployment.EARContext;
+import org.apache.geronimo.j2ee.deployment.j2eeobjectnames.J2eeContext;
import org.apache.geronimo.xbeans.j2ee.EjbJarType;
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
import org.tranql.cache.GlobalSchema;
@@ -72,8 +73,8 @@
this.delegate = new CMPEntityBuilder(builder);
}
- public void buildCMPSchema(EARContext earContext, String ejbModuleName,
EjbJarType ejbJar, OpenejbOpenejbJarType openejbEjbJar, ClassLoader cl, EJBSchema
ejbSchema, SQL92Schema sqlSchema, GlobalSchema globalSchema) throws
DeploymentException {
- delegate.buildCMPSchema(earContext, ejbModuleName, ejbJar, openejbEjbJar,
cl, ejbSchema, sqlSchema, globalSchema);
+ public void buildCMPSchema(EARContext earContext, J2eeContext
moduleJ2eeContext, EjbJarType ejbJar, OpenejbOpenejbJarType openejbEjbJar, ClassLoader
cl, EJBSchema ejbSchema, SQL92Schema sqlSchema, GlobalSchema globalSchema) throws
DeploymentException {
+ delegate.buildCMPSchema(earContext, moduleJ2eeContext, ejbJar,
openejbEjbJar, cl, ejbSchema, sqlSchema, globalSchema);
}
}
1.35 +67 -42
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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- EJBConfigBuilderTest.java 4 Oct 2004 23:00:48 -0000 1.34
+++ EJBConfigBuilderTest.java 28 Oct 2004 01:56:11 -0000 1.35
@@ -64,21 +64,26 @@
import javax.ejb.EJBHome;
import javax.management.ObjectName;
import javax.sql.DataSource;
+import javax.naming.Reference;
import junit.framework.TestCase;
import org.apache.geronimo.deployment.util.DeploymentUtil;
+import org.apache.geronimo.deployment.DeploymentException;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.jmx.GBeanMBean;
import org.apache.geronimo.j2ee.deployment.EARConfigBuilder;
import org.apache.geronimo.j2ee.deployment.EARContext;
-import org.apache.geronimo.j2ee.deployment.EJBRefContext;
import org.apache.geronimo.j2ee.deployment.Module;
+import org.apache.geronimo.j2ee.deployment.RefContext;
+import org.apache.geronimo.j2ee.deployment.ResourceReferenceBuilder;
+import org.apache.geronimo.j2ee.deployment.j2eeobjectnames.J2eeContext;
+import org.apache.geronimo.j2ee.deployment.j2eeobjectnames.J2eeContextImpl;
+import org.apache.geronimo.j2ee.deployment.j2eeobjectnames.NameFactory;
import org.apache.geronimo.j2ee.management.impl.J2EEServerImpl;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.management.State;
-import org.apache.geronimo.naming.jmx.JMXReferenceFactory;
import org.apache.geronimo.system.serverinfo.ServerInfo;
import org.openejb.ContainerIndex;
import org.openejb.DeploymentHelper;
@@ -93,31 +98,52 @@
private static final String j2eeServerName = "TestOpenEJBServer";
private Kernel kernel;
- public void testCreateResourceAdapterNameQuery() throws Exception {
- File tempDir = null;
- try {
- tempDir = DeploymentUtil.createTempDir();
- OpenEJBModuleBuilder builder = new OpenEJBModuleBuilder(null);
- EARContext earContext = new EARContext(tempDir,
- URI.create("id"),
- ConfigurationModuleType.EJB,
- URI.create("parentId"),
- null,
- "geronimo.server",
- "geronimo",
- null,
- null,
- null,
- null,
- null,
- new EJBRefContext(builder));
+ private ResourceReferenceBuilder resourceReferenceBuilder = new
ResourceReferenceBuilder() {
- ObjectName testName =
builder.createResourceAdapterQueryName(earContext, "TestResourceAdapterName");
-
assertEquals(ObjectName.getInstance("geronimo.server:j2eeType=ResourceAdapter,name=TestResourceAdapterName,J2EEServer=geronimo,*"),
testName);
- } finally {
- DeploymentUtil.recursiveDelete(tempDir);
+ public Reference createResourceRef(String containerId, Class iface) {
+ return null;
}
- }
+
+ public Reference createAdminObjectRef(String containerId, Class iface) {
+ return null;
+ }
+
+ public ObjectName locateResourceName(ObjectName query) throws
DeploymentException {
+ return DeploymentHelper.RESOURCE_ADAPTER_NAME;
+ }
+
+ public Object locateActivationSpecInfo(ObjectName resourceAdapterName,
String messageListenerInterface) throws DeploymentException {
+ return DeploymentHelper.ACTIVATION_SPEC_INFO;
+ }
+ };
+
+ private J2eeContext j2eeContext = new J2eeContextImpl(j2eeDomainName,
j2eeServerName, NameFactory.NULL, "testejbmodule", "testapp",
NameFactory.J2EE_APPLICATION);
+
+// public void testCreateResourceAdapterNameQuery() throws Exception {
+// File tempDir = null;
+// try {
+// tempDir = DeploymentUtil.createTempDir();
+// OpenEJBModuleBuilder builder = new OpenEJBModuleBuilder(null);
+// EARContext earContext = new EARContext(tempDir,
+// URI.create("id"),
+// ConfigurationModuleType.EJB,
+// URI.create("parentId"),
+// null,
+// "geronimo.server",
+// "geronimo",
+// null,
+// null,
+// null,
+// null,
+// null,
+// new RefContext(builder, resourceReferenceBuilder));
+//
+// ObjectName testName =
builder.createResourceAdapterQueryName(earContext, "TestResourceAdapterName");
+//
assertEquals(ObjectName.getInstance("geronimo.server:j2eeType=ResourceAdapter,name=TestResourceAdapterName,J2EEServer=geronimo,*"),
testName);
+// } finally {
+// DeploymentUtil.recursiveDelete(tempDir);
+// }
+// }
public void testBuildUnpackedModule() throws Exception {
executeTestBuildModule(new File("target/test-ejb-jar"));
@@ -131,7 +157,7 @@
String j2eeApplicationName = "null";
String j2eeModuleName = "org/openejb/deployment/test";
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(kernel);
+ OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder();
ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
ClassLoader cl = new URLClassLoader(new URL[]{ejbJarFile.toURL()}, oldCl);
@@ -156,7 +182,7 @@
DeploymentHelper.TRACKEDCONNECTIONASSOCIATOR_NAME,
DeploymentHelper.TRANSACTIONALTIMER_NAME,
DeploymentHelper.NONTRANSACTIONALTIMER_NAME,
- new EJBRefContext(moduleBuilder));
+ new RefContext(moduleBuilder, resourceReferenceBuilder));
moduleBuilder.installModule(DeploymentUtil.createJarFile(ejbJarFile),
earContext, module);
earContext.getClassLoader(null);
@@ -175,7 +201,7 @@
String j2eeApplicationName = "null";
String j2eeModuleName = "org/openejb/deployment/test";
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(kernel);
+ OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder();
File earFile = new File("target/test-ejb-jar.jar");
ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
@@ -195,8 +221,8 @@
null, // repository
moduleBuilder,
moduleBuilder,
- null, // web
- null, // connector
+ null, null, resourceReferenceBuilder, // web
+ // connector
null, // app client
null // kernel
);
@@ -222,7 +248,7 @@
String j2eeApplicationName = "org/apache/geronimo/j2ee/deployment/test";
String j2eeModuleName = "test-ejb-jar.jar";
- OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(kernel);
+ OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder();
File earFile = new File("target/test-ear.ear");
ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
@@ -242,8 +268,8 @@
null, // Repository
moduleBuilder,
moduleBuilder,
- null, // web
- null, // connector
+ null, null, resourceReferenceBuilder, // web
+ // connector
null, // app client
null // kernel
);
@@ -275,13 +301,12 @@
assertRunning(kernel, containerIndexObjectName);
GBeanMBean connectionProxyFactoryGBean = new
GBeanMBean(MockConnectionProxyFactory.GBEAN_INFO);
- JMXReferenceFactory refFactory = new
JMXReferenceFactory("geronimo.server", "geronimo");
- ObjectName connectionProxyFactoryObjectName =
refFactory.createManagedConnectionFactoryObjectName("DefaultDatasource");
+ ObjectName connectionProxyFactoryObjectName =
NameFactory.getResourceComponentName(null, null, NameFactory.NULL,
"org/apache/geronimo/DefaultDatabase", "DefaultDatasource",
NameFactory.JCA_MANAGED_CONNECTION_FACTORY, j2eeContext);
kernel.loadGBean(connectionProxyFactoryObjectName,
connectionProxyFactoryGBean);
kernel.startGBean(connectionProxyFactoryObjectName);
assertRunning(kernel, connectionProxyFactoryObjectName);
- ds = (DataSource) kernel.getAttribute(connectionProxyFactoryObjectName,
"proxy");
+ ds = (DataSource) kernel.invoke(connectionProxyFactoryObjectName,
"$getResource");
Connection connection = null;
Statement statement = null;
try {
@@ -314,7 +339,7 @@
assertRunning(kernel, moduleName);
// STATELESS
- ObjectName statelessBeanName = ObjectName.getInstance(j2eeDomainName +
":j2eeType=StatelessSessionBean,J2EEServer=" + j2eeServerName + ",J2EEApplication=" +
j2eeApplicationName + ",J2EEModule=" + j2eeModuleName +
",name=SimpleStatelessSession");
+ ObjectName statelessBeanName = ObjectName.getInstance(j2eeDomainName +
":j2eeType=StatelessSessionBean,J2EEServer=" + j2eeServerName + ",J2EEApplication=" +
j2eeApplicationName + ",EJBModule=" + j2eeModuleName + ",name=SimpleStatelessSession");
assertRunning(kernel, statelessBeanName);
// use reflection to invoke a method on the stateless bean, because we
don't have access to the classes here
@@ -329,7 +354,7 @@
assertEquals(new Integer(1),
statelessLocal.getClass().getMethod("getTimeoutCount", null).invoke(statelessLocal,
null));
// STATEFUL
- ObjectName statefulBeanName = ObjectName.getInstance(j2eeDomainName +
":j2eeType=StatefulSessionBean,J2EEServer=" + j2eeServerName + ",J2EEApplication=" +
j2eeApplicationName + ",J2EEModule=" + j2eeModuleName + ",name=SimpleStatefulSession");
+ ObjectName statefulBeanName = ObjectName.getInstance(j2eeDomainName +
":j2eeType=StatefulSessionBean,J2EEServer=" + j2eeServerName + ",J2EEApplication=" +
j2eeApplicationName + ",EJBModule=" + j2eeModuleName + ",name=SimpleStatefulSession");
assertRunning(kernel, statefulBeanName);
Object statefulHome = kernel.getAttribute(statefulBeanName, "ejbHome");
@@ -339,7 +364,7 @@
assertEquals("SomeValue", stateful.getClass().getMethod("getValue",
null).invoke(stateful, null));
// BMP
- ObjectName bmpBeanName = ObjectName.getInstance(j2eeDomainName +
":j2eeType=EntityBean,J2EEServer=" + j2eeServerName + ",J2EEApplication=" +
j2eeApplicationName + ",J2EEModule=" + j2eeModuleName + ",name=SimpleBMPEntity");
+ ObjectName bmpBeanName = ObjectName.getInstance(j2eeDomainName +
":j2eeType=EntityBean,J2EEServer=" + j2eeServerName + ",J2EEApplication=" +
j2eeApplicationName + ",EJBModule=" + j2eeModuleName + ",name=SimpleBMPEntity");
assertRunning(kernel, bmpBeanName);
Object bmpHome = kernel.getAttribute(bmpBeanName, "ejbHome");
@@ -349,7 +374,7 @@
assertEquals("MyNameValue", bmp.getClass().getMethod("getName",
null).invoke(bmp, null));
// CMP
- ObjectName cmpBeanName = ObjectName.getInstance(j2eeDomainName +
":j2eeType=EntityBean,J2EEServer=" + j2eeServerName + ",J2EEApplication=" +
j2eeApplicationName + ",J2EEModule=" + j2eeModuleName + ",name=SimpleCMPEntity");
+ ObjectName cmpBeanName = ObjectName.getInstance(j2eeDomainName +
":j2eeType=EntityBean,J2EEServer=" + j2eeServerName + ",J2EEApplication=" +
j2eeApplicationName + ",EJBModule=" + j2eeModuleName + ",name=SimpleCMPEntity");
assertRunning(kernel, cmpBeanName);
Object cmpHome = kernel.getAttribute(cmpBeanName, "ejbHome");
@@ -360,7 +385,7 @@
assertEquals("MyFistName", cmp.getClass().getMethod("getFirstName",
null).invoke(cmp, null));
//mdb
- ObjectName mdbBeanName = ObjectName.getInstance(j2eeDomainName +
":j2eeType=MessageDrivenBean,J2EEServer=" + j2eeServerName + ",J2EEApplication=" +
j2eeApplicationName + ",J2EEModule=" + j2eeModuleName + ",name=SimpleMessageDriven");
+ ObjectName mdbBeanName = ObjectName.getInstance(j2eeDomainName +
":j2eeType=MessageDrivenBean,J2EEServer=" + j2eeServerName + ",J2EEApplication=" +
j2eeApplicationName + ",EJBModule=" + j2eeModuleName + ",name=SimpleMessageDriven");
assertRunning(kernel, mdbBeanName);
1.2 +2 -2
openejb/modules/core/src/test/org/openejb/deployment/MockConnectionProxyFactory.java
Index: MockConnectionProxyFactory.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/deployment/MockConnectionProxyFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockConnectionProxyFactory.java 18 Apr 2004 23:35:02 -0000 1.1
+++ MockConnectionProxyFactory.java 28 Oct 2004 01:56:11 -0000 1.2
@@ -59,7 +59,7 @@
* @version $Revision$ $Date$
*/
public class MockConnectionProxyFactory implements ConnectionProxyFactory {
- public Object getProxy() {
+ public Object $getResource() {
return new AxionDataSource("jdbc:axiondb:testdb");
}
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PlanParsingTest.java 28 Sep 2004 21:31:57 -0000 1.3
+++ PlanParsingTest.java 28 Oct 2004 01:56:11 -0000 1.4
@@ -9,7 +9,7 @@
*/
public class PlanParsingTest extends TestCase {
- private OpenEJBModuleBuilder builder = new OpenEJBModuleBuilder(null);
+ private OpenEJBModuleBuilder builder = new OpenEJBModuleBuilder();
File basedir = new File(System.getProperty("basedir", "."));
public void testResourceRef() throws Exception {
