diff options
| author | Ingo Bauersachs <ingo@jitsi.org> | 2015-09-06 23:37:58 +0200 |
|---|---|---|
| committer | Ingo Bauersachs <ingo@jitsi.org> | 2015-09-07 00:01:01 +0200 |
| commit | 9b1e966ae61ace36e51f5060e1aef255fa876344 (patch) | |
| tree | 3a4277619b3bcf329132aea3740580a6068af57e /lib | |
| parent | ac33264d328b249aa303a07034b4fd46a67c896d (diff) | |
| download | jitsi-9b1e966ae61ace36e51f5060e1aef255fa876344.zip jitsi-9b1e966ae61ace36e51f5060e1aef255fa876344.tar.gz jitsi-9b1e966ae61ace36e51f5060e1aef255fa876344.tar.bz2 | |
Install, don't start FMJ as it is a fragment
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/felix.client.run.properties | 2 | ||||
| -rw-r--r-- | lib/felix.unit.test.properties | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties index f8bcd73..b1cc220 100644 --- a/lib/felix.client.run.properties +++ b/lib/felix.client.run.properties @@ -32,6 +32,7 @@ felix.auto.start.5=reference:file:sc-bundles/splash-screen.jar #slf4j-jdk is an OSGi fragment, so install but don't start it felix.auto.install.10= \ + reference:file:sc-bundles/fmj.jar \ reference:file:sc-bundles/slf4j-jdk14.jar \ reference:file:sc-bundles/jitsi-lgpl-dependencies.jar @@ -54,7 +55,6 @@ felix.auto.start.15= \ reference:file:sc-bundles/sdes4j.jar felix.auto.start.16= \ - reference:file:sc-bundles/fmj.jar \ reference:file:sc-bundles/bcpkix.jar \ reference:file:sc-bundles/libjitsi.jar \ reference:file:sc-bundles/dnsservice.jar \ diff --git a/lib/felix.unit.test.properties b/lib/felix.unit.test.properties index c1f76d7..415af6d 100644 --- a/lib/felix.unit.test.properties +++ b/lib/felix.unit.test.properties @@ -46,6 +46,7 @@ org.osgi.framework.system.packages.extra= \ #install (but don't start) OSGi fragments felix.auto.install.10= \ + reference:file:sc-bundles/fmj.jar \ reference:file:sc-bundles/jitsi-lgpl-dependencies.jar felix.auto.start.10= \ @@ -69,7 +70,6 @@ felix.auto.start.15= \ reference:file:sc-bundles/sdes4j.jar felix.auto.start.16= \ - reference:file:sc-bundles/fmj.jar \ reference:file:sc-bundles/bcpkix.jar \ reference:file:sc-bundles/libjitsi.jar \ reference:file:sc-bundles/dnsservice.jar |