You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by dj...@apache.org on 2010/08/05 21:53:38 UTC

svn commit: r982751 - /openejb/trunk/openejb3/container/openejb-osgi-core/src/main/java/org/apache/openejb/osgi/core/BundleFinderFactory.java

Author: djencks
Date: Thu Aug  5 19:53:37 2010
New Revision: 982751

URL: http://svn.apache.org/viewvc?rev=982751&view=rev
Log:
improve what gets scanned in BundleFinderFactory

Modified:
    openejb/trunk/openejb3/container/openejb-osgi-core/src/main/java/org/apache/openejb/osgi/core/BundleFinderFactory.java

Modified: openejb/trunk/openejb3/container/openejb-osgi-core/src/main/java/org/apache/openejb/osgi/core/BundleFinderFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-osgi-core/src/main/java/org/apache/openejb/osgi/core/BundleFinderFactory.java?rev=982751&r1=982750&r2=982751&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-osgi-core/src/main/java/org/apache/openejb/osgi/core/BundleFinderFactory.java (original)
+++ openejb/trunk/openejb3/container/openejb-osgi-core/src/main/java/org/apache/openejb/osgi/core/BundleFinderFactory.java Thu Aug  5 19:53:37 2010
@@ -67,7 +67,25 @@ public class BundleFinderFactory extends
 
                 return new BundleAnnotationFinder(packageAdmin, bundle, filter);
             } else {
-                return new BundleAnnotationFinder(packageAdmin, bundle);
+                ResourceDiscoveryFilter filter = new ResourceDiscoveryFilter() {
+
+                    @Override
+                    public boolean rangeDiscoveryRequired(DiscoveryRange discoveryRange) {
+                        return discoveryRange == DiscoveryRange.BUNDLE_CLASSPATH || discoveryRange == DiscoveryRange.FRAGMENT_BUNDLES;
+                    }
+
+                    @Override
+                    public boolean zipFileDiscoveryRequired(String s) {
+                        return true;
+                    }
+
+                    @Override
+                    public boolean directoryDiscoveryRequired(String s) {
+                        return true;
+                    }
+                };
+
+                return new BundleAnnotationFinder(packageAdmin, bundle, filter);
             }
         }