djencks 2005/02/23 13:13:28
Modified: modules/openejb-builder/src/test/org/openejb/deployment
CMPEntityBuilderTest.java DeploymentTestSuite.java
PlanParsingTest.java WSContainerBuilderTest.java
Log:
refactor ws to use WebServiceContainer rather than WSContainerIndex. Openejb
uses its SoapHttpListener, geronimo uses Jetty for invoking ws
Revision Changes Path
1.10 +7 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CMPEntityBuilderTest.java 20 Feb 2005 15:44:51 -0000 1.9
+++ CMPEntityBuilderTest.java 23 Feb 2005 18:13:28 -0000 1.10
@@ -55,6 +55,8 @@
import java.util.List;
import java.util.Map;
+import javax.management.ObjectName;
+
import junit.framework.TestCase;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.j2ee.deployment.EARContext;
@@ -88,6 +90,7 @@
*
* */
public class CMPEntityBuilderTest extends TestCase {
+ private ObjectName listener = null;
private SkeletonGenerator skeletonGenerator = null;
private Repository repository = null;
private Kernel kernel = null;
@@ -116,7 +119,7 @@
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, skeletonGenerator,
repository);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener,
skeletonGenerator, repository);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
GlobalSchema globalSchema = new GlobalSchema("Test");
@@ -161,7 +164,7 @@
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, skeletonGenerator,
repository);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener,
skeletonGenerator, repository);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
GlobalSchema globalSchema = new GlobalSchema("Test");
@@ -207,7 +210,7 @@
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, skeletonGenerator,
repository);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener,
skeletonGenerator, repository);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
GlobalSchema globalSchema = new GlobalSchema("Test");
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DeploymentTestSuite.java 10 Feb 2005 07:09:10 -0000 1.2
+++ DeploymentTestSuite.java 23 Feb 2005 18:13:28 -0000 1.3
@@ -153,9 +153,10 @@
Thread.currentThread().setContextClassLoader(cl);
try {
+ ObjectName listener = null;
OpenORBSkeletonGenerator skeletonGenerator = new
OpenORBSkeletonGenerator(cl);
skeletonGenerator.doStart();
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, skeletonGenerator, null);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener,
skeletonGenerator, null);
tempDir = DeploymentUtil.createTempDir();
EARConfigBuilder earConfigBuilder = new
EARConfigBuilder(KernelHelper.DEFAULT_PARENTID,
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PlanParsingTest.java 5 Feb 2005 00:36:05 -0000 1.5
+++ PlanParsingTest.java 23 Feb 2005 18:13:28 -0000 1.6
@@ -13,7 +13,7 @@
private Repository repository = null;
private Kernel kernel = null;
- private OpenEJBModuleBuilder builder = new OpenEJBModuleBuilder(null,
null, repository);
+ private OpenEJBModuleBuilder builder = new OpenEJBModuleBuilder(null,
null, null, repository);
File basedir = new File(System.getProperty("basedir", "."));
public void testResourceRef() throws Exception {
1.2 +3 -2
openejb/modules/openejb-builder/src/test/org/openejb/deployment/WSContainerBuilderTest.java
Index: WSContainerBuilderTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/WSContainerBuilderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WSContainerBuilderTest.java 22 Dec 2004 05:42:40 -0000 1.1
+++ WSContainerBuilderTest.java 23 Feb 2005 18:13:28 -0000 1.2
@@ -59,7 +59,8 @@
JarFile jarFile = new JarFile("target/test-ejb-jar.jar");
String serviceEndpointName =
"org.openejb.test.simple.slsb.SimpleStatelessSessionEndpoint";
ObjectName sessionObjectName =
JMXUtil.getObjectName("openejb:type=StatelessSessionBean,name=MockSession");
- GBeanData gBeanData =
wsContainerBuilder.buildGBeanData(sessionObjectName, "MockSession",
serviceEndpointName, jarFile);
+ ObjectName listener = null;
+ GBeanData gBeanData =
wsContainerBuilder.buildGBeanData(sessionObjectName, listener, "MockSession",
serviceEndpointName, jarFile);
assertEquals("encoded", gBeanData.getAttribute("encoding"));
assertEquals("rpc", gBeanData.getAttribute("style"));
}
