Author: djencks
Date: Wed Jun 2 07:52:13 2010
New Revision: 950405
URL: http://svn.apache.org/viewvc?rev=950405&view=rev
Log:
tweaks to make no-interface view work in geronimo. This should be reviewed
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java?rev=950405&r1=950404&r2=950405&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
Wed Jun 2 07:52:13 2010
@@ -205,7 +205,7 @@ public class JndiEncInfoBuilder {
if (ref.getRefType() == EjbReference.Type.UNKNOWN) {
EnterpriseBeanInfo otherBean =
ejbResolver.getEnterpriseBeanInfo(deploymentId);
if (otherBean != null) {
- if (otherBean.businessLocal.contains(ref.getInterface())) {
+ if (otherBean.businessLocal.contains(ref.getInterface())
|| otherBean.ejbClass.equals(ref.getInterface())) {
ref.setRefType(EjbReference.Type.LOCAL);
jndiConsumer.getEjbRef().remove(ref);
jndiConsumer.getEjbLocalRef().add(new
EjbLocalRef(ref));
@@ -432,7 +432,7 @@ public class JndiEncInfoBuilder {
private EnterpriseBeanInfo getInterfaceBeanInfo(String moduleId, String
interfaceClassName) {
List<EjbJarInfo> ejbJars = appInfo.ejbJars;
for (EjbJarInfo ejbJar : ejbJars) {
- if (!ejbJar.moduleId.equals(moduleId)) continue;
+ if (!ejbJar.moduleId.equals(moduleId) && !(moduleId == null &&
appInfo.ejbJars.size() == 1)) continue;
List<EnterpriseBeanInfo> enterpriseBeans = ejbJar.enterpriseBeans;
for (EnterpriseBeanInfo enterpriseBean : enterpriseBeans) {
