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 07:43:26 UTC
svn commit: r982477 -
/openejb/trunk/openejb3/container/openejb-osgi-core/src/main/java/org/apache/openejb/osgi/core/BundleFinderFactory.java
Author: djencks
Date: Thu Aug 5 05:43:26 2010
New Revision: 982477
URL: http://svn.apache.org/viewvc?rev=982477&view=rev
Log:
OPENEJB-1322 hack BundleFinderFactory to work with ejbs in wars. Not a final solution
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=982477&r1=982476&r2=982477&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 05:43:26 2010
@@ -42,9 +42,11 @@ public class BundleFinderFactory extends
BundleContext bundleContext = bundle.getBundleContext();
ServiceReference sr = bundleContext.getServiceReference(PackageAdmin.class.getName());
PackageAdmin packageAdmin = (PackageAdmin) bundleContext.getService(sr);
-
final String location = module.getModuleId();
- if (location != null && !location.isEmpty()) {
+ boolean useLocation = location != null
+ && !location.isEmpty()
+ && !module.getJarLocation().endsWith(".war");
+ if (useLocation) {
ResourceDiscoveryFilter filter = new ResourceDiscoveryFilter() {
@Override