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 2009/08/27 19:12:05 UTC
svn commit: r808541 -
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Author: dblevins
Date: Thu Aug 27 17:12:05 2009
New Revision: 808541
URL: http://svn.apache.org/viewvc?rev=808541&view=rev
Log:
OPENEJB-1064: @LocalClient discovery via Include/Exclude settings
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=808541&r1=808540&r2=808541&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Thu Aug 27 17:12:05 2009
@@ -1148,15 +1148,16 @@
AnnotationFinder classFinder = new AnnotationFinder(classLoader, baseUrl);
final Set<Class<? extends DeploymentModule>> otherTypes = new LinkedHashSet();
-
+
AnnotationFinder.Filter filter = new AnnotationFinder.Filter() {
+ final String packageName = LocalClient.class.getName().replace("LocalClient", "");
public boolean accept(String annotationName) {
if (annotationName.startsWith("javax.ejb.")) {
if ("javax.ejb.Stateful".equals(annotationName)) return true;
if ("javax.ejb.Stateless".equals(annotationName)) return true;
if ("javax.ejb.Singleton".equals(annotationName)) return true;
if ("javax.ejb.MessageDriven".equals(annotationName)) return true;
- } else if (annotationName.startsWith("org.apache.openejb.annotation.")){
+ } else if (annotationName.startsWith(packageName)){
if (LocalClient.class.getName().equals(annotationName)) otherTypes.add(ClientModule.class);
if (RemoteClient.class.getName().equals(annotationName)) otherTypes.add(ClientModule.class);
}