You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2010/10/27 02:02:19 UTC
svn commit: r1027779 - in
/openejb/branches/openejb-3.1.x/container/openejb-core/src:
main/java/org/apache/openejb/config/AnnotationDeployer.java
test/java/org/apache/openejb/config/BusinessInterfacesTest.java
Author: dblevins
Date: Wed Oct 27 00:02:19 2010
New Revision: 1027779
URL: http://svn.apache.org/viewvc?rev=1027779&view=rev
Log:
OPENEJB-1390: openejb.strict.interface.declaration flag weeds out implied @Local interfaces
Modified:
openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1027779&r1=1027778&r2=1027779&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ openejb/branches/openejb-3.1.x/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Wed Oct 27 00:02:19 2010
@@ -1856,7 +1856,7 @@ public class AnnotationDeployer implemen
//
// It goes a little beyond that, but no one has ever complained about having
// more local interfaces.
- for (Class interfce : all.unspecified) sessionBean.addBusinessLocal(interfce);
+ if (!strict) for (Class interfce : all.unspecified) sessionBean.addBusinessLocal(interfce);
if (beanClass.getAnnotation(LocalBean.class) != null || beanClass.getInterfaces().length == 0) {
sessionBean.setLocalBean(new EmptyType());
Modified: openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java?rev=1027779&r1=1027778&r2=1027779&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (original)
+++ openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java Wed Oct 27 00:02:19 2010
@@ -139,7 +139,12 @@ public class BusinessInterfacesTest exte
beanInfo = beans.get("YellowThreeBean");
- assertEquals(list(YellowThreeUnspecified.class), sort(beanInfo.businessLocal));
+ if (strict) {
+ assertEquals(list(), sort(beanInfo.businessLocal));
+ } else {
+ assertEquals(list(YellowThreeUnspecified.class), sort(beanInfo.businessLocal));
+ }
+
assertEquals(list(), sort(beanInfo.businessRemote));
beanInfo = beans.get("YellowFourBean");
@@ -414,12 +419,12 @@ public class BusinessInterfacesTest exte
EnterpriseBeanInfo beanInfo = beans.get("RedOneBean");
- assertEquals(list(RedOneLocal.class, RedOneUnspecified.class), sort(beanInfo.businessLocal));
+ assertEquals(list(RedOneLocal.class), sort(beanInfo.businessLocal));
assertEquals(list(RedOneRemote.class, RedOneOverridden.class), sort(beanInfo.businessRemote));
beanInfo = beans.get("RedTwoBean");
- assertEquals(list(RedTwoLocal.class, RedTwoOverridden.class, RedTwoUnspecified.class), sort(beanInfo.businessLocal));
+ assertEquals(list(RedTwoLocal.class, RedTwoOverridden.class), sort(beanInfo.businessLocal));
assertEquals(list(RedTwoRemote.class), sort(beanInfo.businessRemote));
}