djencks 2005/08/09 22:24:56
Modified: modules/openejb-builder/src/test/org/openejb/deployment
AbstractDeploymentTest.java
DeploymentTestContants.java
DeploymentTestSuite.java
Log:
GERONIMO-552 use querying gbeandatas for ejb and implicit ejb-refs. Also
correct case of ejb container attribute names.
Revision Changes Path
1.8 +3 -5
openejb/modules/openejb-builder/src/test/org/openejb/deployment/AbstractDeploymentTest.java
Index: AbstractDeploymentTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/AbstractDeploymentTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractDeploymentTest.java 9 Jul 2005 18:46:36 -0000 1.7
+++ AbstractDeploymentTest.java 10 Aug 2005 02:24:56 -0000 1.8
@@ -106,8 +106,7 @@
Object stateless;
EJBProxyReference proxyReference =
EJBProxyReference.createRemote(STATELESS_BEAN_NAME.getCanonicalName(),
true,
-
"org.openejb.test.simple.slsb.SimpleStatelessSession",
-
"org.openejb.test.simple.slsb.SimpleStatelessSessionHome");
+ "org.openejb.test.simple.slsb.SimpleStatelessSessionHome",
"org.openejb.test.simple.slsb.SimpleStatelessSession");
proxyReference.setKernel(getKernel());
proxyReference.setClassLoader(getApplicationClassLoader());
statelessHome = proxyReference.getContent();
@@ -121,8 +120,7 @@
Object stateless;
EJBProxyReference proxyReference =
EJBProxyReference.createRemote(STATELESS_BEAN_NAME.getCanonicalName(),
true,
-
"org.openejb.test.simple.slsb.SimpleStatelessSession",
-
"org.openejb.test.simple.slsb.SimpleStatelessSessionHome");
+ "org.openejb.test.simple.slsb.SimpleStatelessSessionHome",
"org.openejb.test.simple.slsb.SimpleStatelessSession");
proxyReference.setKernel(getKernel());
proxyReference.setClassLoader(new URLClassLoader(new URL[] {new
File("target/test-ejb-jar.jar").toURL()}, getClass().getClassLoader()));
statelessHome = proxyReference.getContent();
1.10 +2 -1
openejb/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestContants.java
Index: DeploymentTestContants.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestContants.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DeploymentTestContants.java 20 Jul 2005 00:01:18 -0000 1.9
+++ DeploymentTestContants.java 10 Aug 2005 02:24:56 -0000 1.10
@@ -62,6 +62,7 @@
import org.apache.geronimo.j2ee.deployment.ResourceReferenceBuilder;
import org.apache.geronimo.j2ee.deployment.ServiceReferenceBuilder;
import org.apache.geronimo.j2ee.deployment.Module;
+import org.apache.geronimo.j2ee.deployment.NamingContext;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.deployment.DeploymentContext;
import org.apache.geronimo.xbeans.j2ee.ServiceRefHandlerType;
1.13 +3 -2
openejb/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java
Index: DeploymentTestSuite.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DeploymentTestSuite.java 21 Jul 2005 22:56:00 -0000 1.12
+++ DeploymentTestSuite.java 10 Aug 2005 02:24:56 -0000 1.13
@@ -157,6 +157,7 @@
WebServiceBuilder webServiceBuilder = new AxisBuilder();
GBeanData linkData = new GBeanData(WSContainerGBean.GBEAN_INFO);
OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener, linkData,
webServiceBuilder, null);
+ OpenEJBReferenceBuilder ejbReferenceBuilder = new
OpenEJBReferenceBuilder();
tempDir = DeploymentUtil.createTempDir();
EARConfigBuilder earConfigBuilder = new
EARConfigBuilder(KernelHelper.DEFAULT_PARENTID,
@@ -167,7 +168,7 @@
null,
null, // repository
moduleBuilder,
- moduleBuilder,
+ ejbReferenceBuilder,
null,// web
null, resourceReferenceBuilder, // connector
null, // app client
