djencks 2005/07/21 00:32:11
Modified: modules/openejb-builder/src/test/org/openejb/deployment
CMPEntityBuilderTest.java DeploymentTestSuite.java
PlanParsingTest.java
Removed: modules/openejb-builder/src/test/org/openejb/deployment
AxisWebServiceContainerBuilderTest.java
Log:
GERONIMO-782 step 2. Use WebserviceBuilder interfaces from tomcat builder and
openejb builder. openejb builder still needs cleanup
Revision Changes Path
1.15 +4 -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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CMPEntityBuilderTest.java 7 Jul 2005 21:37:08 -0000 1.14
+++ CMPEntityBuilderTest.java 21 Jul 2005 04:32:11 -0000 1.15
@@ -118,7 +118,7 @@
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener, repository);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener, null, repository);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
TranQLPKGenBuilder pkGen = new TranQLPKGenBuilder();
@@ -164,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, listener, repository);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener, null, repository);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
TranQLPKGenBuilder pkGen = new TranQLPKGenBuilder();
@@ -211,7 +211,7 @@
EjbJarType ejbJarType = ((EjbJarDocument)
XmlObject.Factory.parse(ejbJarFile)).getEjbJar();
OpenejbOpenejbJarType openejbJarType = ((OpenejbOpenejbJarDocument)
XmlObject.Factory.parse(openejbJarFile)).getOpenejbJar();
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener, repository);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener, null, repository);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
TranQLPKGenBuilder pkGen = new TranQLPKGenBuilder();
1.11 +6 -3
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DeploymentTestSuite.java 13 Jul 2005 20:49:31 -0000 1.10
+++ DeploymentTestSuite.java 21 Jul 2005 04:32:11 -0000 1.11
@@ -66,6 +66,7 @@
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.j2ee.deployment.EARConfigBuilder;
+import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
import org.apache.geronimo.j2ee.management.impl.J2EEServerImpl;
import org.apache.geronimo.kernel.GBeanNotFoundException;
import org.apache.geronimo.kernel.Kernel;
@@ -73,6 +74,7 @@
import org.apache.geronimo.kernel.management.State;
import org.apache.geronimo.system.configuration.ExecutableConfigurationUtil;
import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.geronimo.axis.builder.AxisBuilder;
import org.openejb.ContainerIndex;
import org.tranql.sql.jdbc.JDBCUtil;
@@ -151,7 +153,8 @@
try {
ObjectName listener = null;
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener, null);
+ WebServiceBuilder webServiceBuilder = new AxisBuilder();
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener,
webServiceBuilder, null);
tempDir = DeploymentUtil.createTempDir();
EARConfigBuilder earConfigBuilder = new
EARConfigBuilder(KernelHelper.DEFAULT_PARENTID,
@@ -219,7 +222,7 @@
statement.execute("CREATE TABLE PKGENCMP4(ID INTEGER DEFAULT
PKGENCMP4_SEQ.NEXTVAL, FIRSTNAME VARCHAR(50), LASTNAME VARCHAR(50))");
statement.execute("CREATE TABLE PKGENCMP5(ID INTEGER,
FIRSTNAME VARCHAR(50), LASTNAME VARCHAR(50))");
// First two sequence rows initialized by OpenEJB wrappers
around PK generators
- statement.execute("CREATE TABLE PKGENCMP_SEQ(NAME
VARCHAR(50), VALUE INTEGER)");
+ statement.execute("CREATE TABLE PKGENCMP_SEQ(NAME
VARCHAR(50), VALUE INTEGER)");
statement.execute("INSERT INTO PKGENCMP_SEQ
VALUES('PKGENCMP3', 100)");
} finally {
JDBCUtil.close(statement);
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PlanParsingTest.java 25 Jun 2005 18:48:20 -0000 1.7
+++ PlanParsingTest.java 21 Jul 2005 04:32:11 -0000 1.8
@@ -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 {
