djencks 2005/02/19 13:24:43
Modified: modules/openejb-builder/src/test/org/openejb/deployment
CMPEntityBuilderTest.java DeploymentHelper.java
DeploymentTestContants.java
Log:
synch to changes in NameFactory and J2eeContext, jsr-77 compliance
Revision Changes Path
1.8 +5 -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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CMPEntityBuilderTest.java 5 Feb 2005 00:36:05 -0000 1.7
+++ CMPEntityBuilderTest.java 19 Feb 2005 18:24:43 -0000 1.8
@@ -60,6 +60,7 @@
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.repository.Repository;
@@ -135,7 +136,7 @@
null,
null,
null);
- J2eeContext moduleJ2eeContext = new
J2eeContextImpl("geronimo.server", "TestGeronimoServer", "null", "MockModule",
null, null);
+ J2eeContext moduleJ2eeContext = new
J2eeContextImpl("geronimo.server", "TestGeronimoServer", "null",
NameFactory.EJB_MODULE, "MockModule", null, null);
ClassLoader cl = Thread.currentThread().getContextClassLoader();
builder.buildCMPSchema(earContext, moduleJ2eeContext,
ejbJarType, openejbJarType, cl, ejbSchema, sqlSchema, globalSchema);
@@ -181,7 +182,7 @@
null,
null);
- J2eeContext moduleJ2eeContext = new
J2eeContextImpl("geronimo.server", "TestGeronimoServer", "null", "MockModule",
null, null);
+ J2eeContext moduleJ2eeContext = new
J2eeContextImpl("geronimo.server", "TestGeronimoServer", "null",
NameFactory.EJB_MODULE, "MockModule", null, null);
ClassLoader cl = Thread.currentThread().getContextClassLoader();
builder.buildCMPSchema(earContext, moduleJ2eeContext,
ejbJarType, openejbJarType, cl, ejbSchema, sqlSchema, globalSchema);
@@ -227,7 +228,7 @@
null,
null);
- J2eeContext moduleJ2eeContext = new
J2eeContextImpl("geronimo.server", "TestGeronimoServer", "null", "MockModule",
null, null);
+ J2eeContext moduleJ2eeContext = new
J2eeContextImpl("geronimo.server", "TestGeronimoServer", "null",
NameFactory.EJB_MODULE, "MockModule", null, null);
ClassLoader cl = Thread.currentThread().getContextClassLoader();
builder.buildCMPSchema(earContext, moduleJ2eeContext,
ejbJarType, openejbJarType, cl, ejbSchema, sqlSchema, globalSchema);
1.7 +3 -3
openejb/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentHelper.java
Index: DeploymentHelper.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentHelper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DeploymentHelper.java 15 Feb 2005 04:47:00 -0000 1.6
+++ DeploymentHelper.java 19 Feb 2005 18:24:43 -0000 1.7
@@ -89,7 +89,7 @@
private static final String appName = NameFactory.NULL;
private static final String moduleName = "MockRA";
//type is random to look for problems.
- private static final J2eeContext raContext = new
J2eeContextImpl(j2eeDomainName, j2eeServerName, appName, moduleName, "xxx",
NameFactory.JCA_WORK_MANAGER);
+ private static final J2eeContext raContext = new
J2eeContextImpl(j2eeDomainName, j2eeServerName, appName,
NameFactory.RESOURCE_ADAPTER_MODULE, moduleName, "xxx",
NameFactory.JCA_WORK_MANAGER);
public static final ObjectName CONTAINER_NAME =
JMXUtil.getObjectName("geronimo.test:ejb=Mock");
public static final ObjectName TRANSACTIONMANAGER_NAME =
JMXUtil.getObjectName(j2eeDomainName + ":type=TransactionManager");
public static final ObjectName TRANSACTIONCONTEXTMANAGER_NAME =
JMXUtil.getObjectName(j2eeDomainName + ":type=TransactionContextManager");
@@ -106,7 +106,7 @@
static {
try {
- RESOURCE_ADAPTER_MODULE_NAME = NameFactory.getModuleName(null,
null, null, null, NameFactory.RESOURCE_ADAPTER_MODULE, raContext);
+ RESOURCE_ADAPTER_MODULE_NAME = NameFactory.getModuleName(null,
null, null, null, null, raContext);
RESOURCE_ADAPTER_NAME =
NameFactory.getResourceComponentName(null, null, null, null, "MockRA",
NameFactory.JCA_RESOURCE_ADAPTER, raContext);
ACTIVATIONSPEC_NAME = NameFactory.getResourceComponentName(null,
null, null, null, "MockRA", NameFactory.JCA_ACTIVATION_SPEC, raContext);
} catch (MalformedObjectNameException e) {
1.4 +2 -2
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DeploymentTestContants.java 15 Feb 2005 04:47:00 -0000 1.3
+++ DeploymentTestContants.java 19 Feb 2005 18:24:43 -0000 1.4
@@ -123,7 +123,7 @@
private static ObjectName createConnectionObjectName() {
try {
- J2eeContext j2eeContext = new J2eeContextImpl(DOMAIN_NAME,
SERVER_NAME, NameFactory.NULL, "testejbmodule", "testapp",
NameFactory.J2EE_APPLICATION);
+ J2eeContext j2eeContext = new J2eeContextImpl(DOMAIN_NAME,
SERVER_NAME, NameFactory.NULL, NameFactory.RESOURCE_ADAPTER_MODULE,
"testejbmodule", "testapp", NameFactory.J2EE_APPLICATION);
return NameFactory.getResourceComponentName(null, null,
NameFactory.NULL, "org/apache/geronimo/DefaultDatabase", "DefaultDatasource",
NameFactory.JCA_MANAGED_CONNECTION_FACTORY, j2eeContext);
} catch (MalformedObjectNameException e) {
return null;
