Title: [2562] branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment: Remove interfaces from AbstractName.
- Revision
- 2562
- Author
- djencks
- Date
- 2006-03-16 21:23:51 -0500 (Thu, 16 Mar 2006)
Log Message
Remove interfaces from AbstractName. Numerous fixes to Connector module. Connector-builder tests now pass.
Modified Paths
Diff
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java (2561 => 2562)
--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java 2006-03-17 00:49:34 UTC (rev 2561)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java 2006-03-17 02:23:51 UTC (rev 2562)
@@ -223,11 +223,8 @@
Environment environment = EnvironmentBuilder.buildEnvironment(environmentType, defaultEnvironment);
AbstractName moduleName;
if (earName == null) {
- try {
- moduleName = NameFactory.buildModuleName(environment.getProperties(), environment.getConfigId(), ConfigurationModuleType.EJB, null);
- } catch (MalformedObjectNameException e) {
- throw new DeploymentException("Could not construct standalone ejb module name", e);
- }
+ earName = Naming.createRootName(environment.getConfigId(), NameFactory.NULL, NameFactory.J2EE_APPLICATION);
+ moduleName = Naming.createChildName(earName, NameFactory.EJB_MODULE, environment.getConfigId().toString());
} else {
moduleName = naming.createChildName(earName, targetPath, NameFactory.EJB_MODULE);
}
Modified: branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBReferenceBuilder.java (2561 => 2562)
--- branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBReferenceBuilder.java 2006-03-17 00:49:34 UTC (rev 2561)
+++ branches/v2_1/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBReferenceBuilder.java 2006-03-17 02:23:51 UTC (rev 2562)
@@ -189,6 +189,7 @@
AbstractName abstractName = (AbstractName) iterator.next();
GBeanData data;
try {
+ //TODO consider including interfaces in query
data = "" AbstractNameQuery(abstractName));
} catch (GBeanNotFoundException e) {
throw new DeploymentException("We just got this ejb name out of a query! It must be there!");
@@ -216,6 +217,7 @@
throw new UnresolvedEJBRefException(refName, false, isSession, home, remote, matches.size() > 0);
}
}
+ //TODO consider including interfaces in query
return new AbstractNameQuery(match);
}
