djencks 2005/09/06 04:29:36
Modified: modules/openejb-builder/src/test/org/openejb/deployment
CMPEntityBuilderTest.java DeploymentTestSuite.java
KernelHelper.java PlanParsingTest.java
Log:
GERONIMO-966 GERONIMO-947 Split configurations up into smaller bits, merge
default parentId from builders into built configurations
Revision Changes Path
1.20 +7 -7
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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- CMPEntityBuilderTest.java 20 Aug 2005 03:49:08 -0000 1.19
+++ CMPEntityBuilderTest.java 6 Sep 2005 08:29:36 -0000 1.20
@@ -140,7 +140,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, null, null,
repository);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID_ARRAY, listener, null, null,
repository, kernel);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
TranQLPKGenBuilder pkGen = new TranQLPKGenBuilder();
@@ -153,7 +153,7 @@
EARContext earContext = new EARContext(tempDir,
new URI("test"),
ConfigurationModuleType.EJB,
- KernelHelper.DEFAULT_PARENTID,
+ KernelHelper.DEFAULT_PARENTID_LIST,
kernel,
"null",
null,
@@ -186,7 +186,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, null, null,
repository);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID_ARRAY, listener, null, null,
repository, kernel);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
TranQLPKGenBuilder pkGen = new TranQLPKGenBuilder();
@@ -199,7 +199,7 @@
EARContext earContext = new EARContext(tempDir,
new URI("test"),
ConfigurationModuleType.EJB,
- KernelHelper.DEFAULT_PARENTID,
+ KernelHelper.DEFAULT_PARENTID_LIST,
kernel,
"null",
null,
@@ -233,7 +233,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, null, null,
repository);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID_ARRAY, listener, null, null,
repository, kernel);
CMPEntityBuilder builder = new CMPEntityBuilder(moduleBuilder);
TranQLPKGenBuilder pkGen = new TranQLPKGenBuilder();
@@ -246,7 +246,7 @@
EARContext earContext = new EARContext(tempDir,
new URI("test"),
ConfigurationModuleType.EJB,
- KernelHelper.DEFAULT_PARENTID,
+ KernelHelper.DEFAULT_PARENTID_LIST,
kernel,
"null",
null,
1.15 +4 -4
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DeploymentTestSuite.java 18 Aug 2005 18:16:00 -0000 1.14
+++ DeploymentTestSuite.java 6 Sep 2005 08:29:36 -0000 1.15
@@ -156,11 +156,11 @@
ObjectName listener = null;
WebServiceBuilder webServiceBuilder = new AxisBuilder();
GBeanData linkData = new GBeanData(WSContainerGBean.GBEAN_INFO);
- OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID, listener, linkData,
webServiceBuilder, null);
+ OpenEJBModuleBuilder moduleBuilder = new
OpenEJBModuleBuilder(KernelHelper.DEFAULT_PARENTID_ARRAY, listener, linkData,
webServiceBuilder, null, kernel);
OpenEJBReferenceBuilder ejbReferenceBuilder = new
OpenEJBReferenceBuilder();
tempDir = DeploymentUtil.createTempDir();
- EARConfigBuilder earConfigBuilder = new
EARConfigBuilder(KernelHelper.DEFAULT_PARENTID,
+ EARConfigBuilder earConfigBuilder = new
EARConfigBuilder(KernelHelper.DEFAULT_PARENTID_ARRAY,
DeploymentHelper.TRANSACTIONCONTEXTMANAGER_NAME,
DeploymentHelper.TRACKEDCONNECTIONASSOCIATOR_NAME,
DeploymentHelper.TRANSACTIONALTIMER_NAME,
@@ -192,7 +192,7 @@
GBeanData config =
ExecutableConfigurationUtil.getConfigurationGBeanData(configurationData);
config.setName(CONFIGURATION_OBJECT_NAME);
config.setAttribute("baseURL", tempDir.toURL());
- config.setAttribute("parentId", KernelHelper.DEFAULT_PARENTID);
+ config.setAttribute("parentId",
KernelHelper.DEFAULT_PARENTID_ARRAY);
ObjectName containerIndexObjectName =
ObjectName.getInstance(DOMAIN_NAME + ":type=ContainerIndex");
GBeanData containerIndexGBean = new
GBeanData(containerIndexObjectName, ContainerIndex.GBEAN_INFO);
1.5 +6 -4
openejb/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java
Index: KernelHelper.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- KernelHelper.java 29 Aug 2005 23:40:30 -0000 1.4
+++ KernelHelper.java 6 Sep 2005 08:29:36 -0000 1.5
@@ -24,6 +24,7 @@
import java.net.URL;
import java.util.List;
import java.util.Collections;
+import java.util.Arrays;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
@@ -46,7 +47,8 @@
* @version $Rev: $ $Date$
*/
public class KernelHelper {
- public static final URI[] DEFAULT_PARENTID = new URI[]
{URI.create("org/apache/geronimo/Server")};
+ public static final URI[] DEFAULT_PARENTID_ARRAY = new URI[]
{URI.create("org/apache/geronimo/Server")};
+ public static final List DEFAULT_PARENTID_LIST =
Arrays.asList(DEFAULT_PARENTID_ARRAY);
public static Kernel getPreparedKernel() throws Exception {
Kernel kernel = KernelFactory.newInstance().createKernel("bar");
@@ -62,7 +64,7 @@
kernel.startGBean(configurationManagerName);
ConfigurationManager configurationManager = (ConfigurationManager)
kernel.getProxyManager().createProxy(configurationManagerName,
ConfigurationManager.class);
- ObjectName baseConfigName =
configurationManager.load(DEFAULT_PARENTID[0]);
+ ObjectName baseConfigName = configurationManager.load((URI)
DEFAULT_PARENTID_LIST.get(0));
kernel.startGBean(baseConfigName);
return kernel;
@@ -120,7 +122,7 @@
return null;
}
- public List listConfiguations() {
+ public List listConfigurations() {
return null;
}
1.10 +5 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PlanParsingTest.java 21 Jul 2005 22:56:00 -0000 1.9
+++ PlanParsingTest.java 6 Sep 2005 08:29:36 -0000 1.10
@@ -12,8 +12,12 @@
public class PlanParsingTest extends TestCase {
private Repository repository = null;
- private OpenEJBModuleBuilder builder = new OpenEJBModuleBuilder(null,
null, null, null, repository);
+ private OpenEJBModuleBuilder builder;
File basedir = new File(System.getProperty("basedir", "."));
+
+ protected void setUp() throws Exception {
+ builder = new OpenEJBModuleBuilder(null, null, null, null,
repository, null);
+ }
public void testResourceRef() throws Exception {
File resourcePlan = new File(basedir,
"src/test-resources/plans/plan1.xml");
