From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 31 Jul 2014 11:24:53 +0000 (+0000)
Subject: Ability to load CND definitions from the same bundle.
X-Git-Tag: argeo-commons-2.1.30~578
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=0986495073daffe3ed5b0a7070ab744c0cdae85a;p=lgpl%2Fargeo-commons.git

Ability to load CND definitions from the same bundle.

git-svn-id: https://svn.argeo.org/commons/trunk@7184 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitWrapper.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitWrapper.java
index 86fc95b62..f9f04c4cb 100644
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitWrapper.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitWrapper.java
@@ -337,8 +337,10 @@ public class JackrabbitWrapper extends JcrRepositoryWrapper implements
 		if (exportedPackage != null) {
 			exportingBundle = exportedPackage.getExportingBundle();
 		} else {
-			throw new ArgeoException("No OSGi exporting package found for "
-					+ resUrl);
+			// assume this is in the same bundle
+			exportingBundle = bundleContext.getBundle();
+//			throw new ArgeoException("No OSGi exporting package found for "
+//					+ resUrl);
 		}
 		return exportingBundle;
 	}