From: Ed Warnicke <eaw@cisco.com>
Date: Sun, 24 Aug 2014 13:09:47 +0000 (-0500)
Subject: Workaround for karaf bug KARAF-3069
X-Git-Tag: release/helium~223^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=cd86c941e538d7ff07d40072023c4b77d31d60fa

Workaround for karaf bug KARAF-3069

https://issues.apache.org/jira/browse/KARAF-3069

More recent maven-bundle-plugins are putting

Require-Capability: osgi.ee; filter="(&(osgi.ee=JavaSE)(version=1.6))"
into MANIFEST.MF.  This causes them to not
be loadable in karaf when using the equinox framework (though
felix works fine).

As noted in the bug, this is the workaround.

Change-Id: I3a5aef13ee8dd76e5925b19b7d9e46eecc88adf6
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---

diff --git a/opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/etc/custom.properties b/opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
index e9a6992521..c2ac77a5d6 100644
--- a/opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
+++ b/opendaylight/distribution/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
@@ -1,6 +1,20 @@
 # Extra packages to import from the boot class loader
 org.osgi.framework.system.packages.extra=org.apache.karaf.branding,sun.reflect,sun.reflect.misc,sun.misc,sun.nio.ch
 
+# Override the config.properties to remove
+# ${services-${karaf.framework}}
+# This is to work around:
+# https://issues.apache.org/jira/browse/KARAF-3092
+# Which should be fixed in karaf 3.0.2
+# Which is not as of today (2014-08-24) released.
+# Since it is biting folks, we need to fix it here
+# Please remove this when we shift to karaf 3.0.2
+org.osgi.framework.system.capabilities= \
+ ${eecap-${java.specification.version}}, \
+ service-reference;effective:=active;objectClass=org.osgi.service.packageadmin.PackageAdmin, \
+ service-reference;effective:=active;objectClass=org.osgi.service.startlevel.StartLevel, \
+ service-reference;effective:=active;objectClass=org.osgi.service.url.URLHandlers
+
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=325578
 # Extend the framework to avoid the resources to be presented with
 # a URL of type bundleresource: but to be presented as file:
@@ -105,3 +119,4 @@ java.util.logging.config.file=configuration/tomcat-logging.properties
 
 #Hosttracker hostsdb key scheme setting
 hosttracker.keyscheme=IP
+