Merge commit 'cf5da99'HEADmaster

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

1 files changed, 49 insertions, 35 deletions

diff --git a/lib/felix.unit.test.properties b/lib/felix.unit.test.properties
index 415af6d..e97d3b1 100644
--- a/lib/felix.unit.test.properties
+++ b/lib/felix.unit.test.properties
@@ -4,35 +4,38 @@
 # and Service Implementation Compatibility Kits
 #
 org.osgi.framework.system.packages.extra= \
- apple.awt; \
- com.apple.cocoa.application; \
- com.apple.cocoa.foundation; \
- com.apple.eawt; \
- com.apple.eio; \
- gnu.java.zrtp; \
- gnu.java.zrtp.packets; \
- gnu.java.zrtp.utils; \
- gnu.java.zrtp.zidfile; \
- net.java.stun4j;\
- net.java.stun4j.client;\
- org.apache.xml.serialize;\
- quicktime; \
- quicktime.qd; \
- quicktime.std.image; \
- quicktime.std.sg; \
- quicktime.util; \
- com.sun.awt; \
- sun.lwawt; \
- sun.lwawt.macosx; \
- sun.awt.shell; \
- sun.misc; \
- sun.net.util; \
- sun.net.dns; \
- sun.security.action; \
- sun.security.pkcs11; \
- sun.reflect; \
- org.xbill.DNS;\
- sun.audio
+ apple.awt, \
+ com.apple.cocoa.application, \
+ com.apple.cocoa.foundation, \
+ com.apple.eawt, \
+ com.apple.eio, \
+ gnu.java.zrtp, \
+ gnu.java.zrtp.packets, \
+ gnu.java.zrtp.utils, \
+ gnu.java.zrtp.zidfile, \
+ net.java.stun4j,\
+ net.java.stun4j.client,\
+ org.apache.xml.serialize,\
+ quicktime, \
+ quicktime.qd, \
+ quicktime.std.image, \
+ quicktime.std.sg, \
+ quicktime.util, \
+ com.sun.awt, \
+ sun.lwawt, \
+ sun.lwawt.macosx, \
+ sun.awt.shell, \
+ sun.misc, \
+ sun.net.util, \
+ sun.net.dns, \
+ sun.security.action, \
+ sun.security.pkcs11, \
+ sun.reflect, \
+ org.xbill.DNS;version="2.1.7", \
+ org.xbill.DNS.utils;version="2.1.7", \
+ sun.audio,\
+ sun.nio.ch,\
+ com.sun.nio.sctp
 
 
 #
@@ -47,7 +50,9 @@ 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
+ reference:file:sc-bundles/slf4j-jdk14.jar \
+ reference:file:sc-bundles/jitsi-lgpl-dependencies.jar \
+ reference:file:sc-bundles/jitsi-gpl-dependencies.jar
 
 felix.auto.start.10= \
  reference:file:lib/bundle/junit.jar \
@@ -58,7 +63,18 @@ felix.auto.start.10= \
  reference:file:sc-bundles/bccontrib.jar \
  reference:file:sc-bundles/hsqldb.jar \
  reference:file:sc-bundles/commons-lang.jar \
- reference:file:sc-bundles/guava.jar
+ reference:file:sc-bundles/guava.jar \
+ reference:file:sc-bundles/weupnp.jar \
+ reference:file:sc-bundles/slf4j-api.jar \
+ reference:file:sc-bundles/dnssecjava.jar
+
+felix.auto.start.11= \
+ reference:file:sc-bundles/sip-api.jar \
+ reference:file:sc-bundles/sdp-api.jar \
+ reference:file:sc-bundles/jain-sip-ri.jar \
+ reference:file:sc-bundles/java-sdp-nist-bridge.jar \
+ reference:file:sc-bundles/ice4j.jar
+
 # file:lib/bundle/shell.jar \
 # file:lib/bundle/bundlerepository.jar \
 # file:lib/bundle/servicebinder.jar \
@@ -94,10 +110,10 @@ felix.auto.start.40= \
  reference:file:sc-bundles/argdelegation-service.jar \
  reference:file:sc-bundles/resourcemanager.jar \
  reference:file:sc-bundles/defaultresources.jar \
- reference:file:sc-bundles/jfontchooserlib.jar \
  reference:file:sc-bundles/version-impl.jar \
  reference:file:sc-bundles/keybindings.jar \
- reference:file:sc-bundles/jnalib.jar \
+ reference:file:sc-bundles/jna.jar \
+ reference:file:sc-bundles/jna-platform.jar \
  reference:file:sc-bundles/netaddr.jar \
  reference:file:sc-bundles/sysactivitynotifications.jar \
  reference:file:sc-bundles/browserlauncher.jar \
@@ -126,7 +142,6 @@ felix.auto.start.60= \
  reference:file:sc-bundles/neomedia.jar \
  reference:file:sc-bundles/protocol-jabber.jar \
  reference:file:sc-bundles/protocol-sip.jar \
- reference:file:sc-bundles/protocol-yahoo.jar \
  reference:file:sc-bundles/protocol-mock.jar \
  reference:file:sc-bundles/meta-cl.jar \
  reference:file:sc-bundles/msghistory.jar \
@@ -150,7 +165,6 @@ felix.auto.start.70= \
  reference:file:sc-bundles/meta-cl-slick.jar \
  reference:file:sc-bundles/protocol-sip-slick.jar \
  reference:file:sc-bundles/protocol-jabber-slick.jar \
- reference:file:sc-bundles/protocol-yahoo-slick.jar \
  reference:file:sc-bundles/protocol-icq-slick.jar \
  reference:file:sc-bundles/msghistory-slick.jar \
  reference:file:sc-bundles/metahistory-slick.jar \