diff options
author | Ingo Bauersachs <ingo@jitsi.org> | 2015-09-01 21:16:29 +0200 |
---|---|---|
committer | Ingo Bauersachs <ingo@jitsi.org> | 2015-09-01 21:16:29 +0200 |
commit | 87f9c72506fe4ac7ed5ad3a738236b9edeb9c641 (patch) | |
tree | f39d345863afb6183c62bc4bb3727c5a47b8df0b | |
parent | 723b2bb99a010075407d973d0611ab5269d4c094 (diff) | |
download | jitsi-87f9c72506fe4ac7ed5ad3a738236b9edeb9c641.zip jitsi-87f9c72506fe4ac7ed5ad3a738236b9edeb9c641.tar.gz jitsi-87f9c72506fe4ac7ed5ad3a738236b9edeb9c641.tar.bz2 |
Adapt Felix test-config to OSGi'fied libjitsi
-rw-r--r-- | lib/felix.unit.test.properties | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/lib/felix.unit.test.properties b/lib/felix.unit.test.properties index 937b099..c1f76d7 100644 --- a/lib/felix.unit.test.properties +++ b/lib/felix.unit.test.properties @@ -31,7 +31,8 @@ org.osgi.framework.system.packages.extra= \ sun.security.action; \ sun.security.pkcs11; \ sun.reflect; \ - org.xbill.DNS + org.xbill.DNS;\ + sun.audio # @@ -43,6 +44,10 @@ org.osgi.framework.system.packages.extra= \ # file:lib/bundle/tablelayout.jar \ # +#install (but don't start) OSGi fragments +felix.auto.install.10= \ + reference:file:sc-bundles/jitsi-lgpl-dependencies.jar + felix.auto.start.10= \ reference:file:lib/bundle/junit.jar \ reference:file:lib/installer-exclude/easymock-3.1.jar \ @@ -57,7 +62,15 @@ felix.auto.start.10= \ # file:lib/bundle/bundlerepository.jar \ # file:lib/bundle/servicebinder.jar \ +felix.auto.start.14= \ + reference:file:sc-bundles/commons-codec.jar felix.auto.start.15= \ + reference:file:sc-bundles/zrtp4j.jar \ + 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 @@ -94,14 +107,10 @@ felix.auto.start.42= \ reference:file:sc-bundles/dns.jar felix.auto.start.50= \ - reference:file:sc-bundles/bouncycastle.jar \ - reference:file:sc-bundles/zrtp4j.jar \ reference:file:sc-bundles/googlecontacts-service.jar \ reference:file:sc-bundles/googlecontacts.jar \ - reference:file:sc-bundles/sdes4j.jar \ reference:file:sc-bundles/protocol.jar \ reference:file:sc-bundles/protocol-media.jar \ - reference:file:sc-bundles/commons-codec.jar \ reference:file:sc-bundles/httpcore.jar \ reference:file:sc-bundles/httpclient.jar \ reference:file:sc-bundles/httputil.jar \ |