Merge commit 'cf5da99'HEADmaster

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

1 files changed, 51 insertions, 33 deletions

diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index b1cc220..c9cb60b 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -2,30 +2,35 @@
 # Framework config properties.
 #
 org.osgi.framework.system.packages.extra= \
- apple.awt; \
- com.apple.cocoa.application; \
- com.apple.cocoa.foundation; \
- com.apple.eawt; \
- com.apple.eio; \
- com.sun.awt; \
- net.java.sip.communicator.util.launchutils; \
- org.apache.xml.serialize; \
- org.growl4j; \
- org.xbill.DNS; \
- quicktime; \
- quicktime.qd; \
- quicktime.std.image; \
- quicktime.std.sg; \
- quicktime.util; \
- sun.awt.shell; \
- sun.lwawt; \
- sun.lwawt.macosx; \
- sun.misc; \
- sun.net.util; \
- sun.net.dns; \
- sun.security.action; \
- sun.security.pkcs11;\
- sun.audio
+ apple.awt, \
+ com.apple.cocoa.application, \
+ com.apple.cocoa.foundation, \
+ com.apple.eawt, \
+ com.apple.eio, \
+ com.sun.awt, \
+ net.java.sip.communicator.util.launchutils, \
+ org.apache.xml.serialize, \
+ org.growl4j, \
+ org.xbill.DNS;version="2.1.7", \
+ org.xbill.DNS.utils;version="2.1.7", \
+ quicktime, \
+ quicktime.qd, \
+ quicktime.std.image, \
+ quicktime.std.sg, \
+ quicktime.util, \
+ sun.awt.shell, \
+ sun.lwawt, \
+ sun.lwawt.macosx, \
+ sun.misc, \
+ sun.net.util, \
+ sun.net.dns, \
+ sun.security.action, \
+ sun.security.pkcs11,\
+ sun.audio,\
+ sun.nio.ch,\
+ com.sun.nio.sctp, \
+ android.os, \
+ sun.net.spi.nameservice
 
 
 felix.auto.start.5=reference:file:sc-bundles/splash-screen.jar
@@ -34,7 +39,8 @@ felix.auto.start.5=reference:file:sc-bundles/splash-screen.jar
 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
+ reference:file:sc-bundles/jitsi-lgpl-dependencies.jar \
+ reference:file:sc-bundles/jitsi-gpl-dependencies.jar
 
 felix.auto.start.10= \
  reference:file:lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar \
@@ -42,14 +48,28 @@ felix.auto.start.10= \
  reference:file:sc-bundles/bccontrib.jar \
  reference:file:sc-bundles/commons-lang.jar \
  reference:file:sc-bundles/guava.jar \
- reference:file:sc-bundles/slf4j-api.jar
+ reference:file:sc-bundles/slf4j-api.jar \
+ reference:file:sc-bundles/weupnp.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/servicebinder.jar \
 # file:lib/bundle/tablelayout.jar
 
-felix.auto.start.14= \
+felix.auto.start.13= \
  reference:file:sc-bundles/commons-codec.jar
+
+#warning: felix.auto.start.14 is injected by the windows build
+#         for the clean-shutdown-bundle
+
 felix.auto.start.15= \
  reference:file:sc-bundles/zrtp4j.jar \
  reference:file:sc-bundles/sdes4j.jar
@@ -86,9 +106,9 @@ felix.auto.start.35= \
 
 felix.auto.start.40= \
  reference:file:sc-bundles/jmdnslib.jar \
- reference:file:sc-bundles/jnalib.jar \
+ reference:file:sc-bundles/jna.jar \
+ reference:file:sc-bundles/jna-platform.jar \
  reference:file:sc-bundles/provdisc.jar \
- reference:file:sc-bundles/jfontchooserlib.jar \
  reference:file:sc-bundles/netaddr.jar \
  reference:file:sc-bundles/sysactivitynotifications.jar \
  reference:file:sc-bundles/browserlauncher.jar \
@@ -133,7 +153,6 @@ felix.auto.start.52= \
  reference:file:sc-bundles/protocol-sip.jar \
  reference:file:sc-bundles/smacklib.jar \
  reference:file:sc-bundles/protocol-jabber.jar \
- reference:file:sc-bundles/protocol-yahoo.jar \
  reference:file:sc-bundles/protocol-irc.jar \
  reference:file:sc-bundles/reconnectplugin.jar
 
@@ -174,7 +193,6 @@ felix.auto.start.67= \
  reference:file:sc-bundles/sipaccregwizz.jar \
  reference:file:sc-bundles/jabberaccregwizz.jar \
  reference:file:sc-bundles/googletalkaccregwizz.jar \
- reference:file:sc-bundles/yahooaccregwizz.jar \
  reference:file:sc-bundles/ircaccregwizz.jar \
  reference:file:sc-bundles/contacteventhandler.jar \
  reference:file:sc-bundles/notificationconfig.jar \
@@ -185,7 +203,6 @@ felix.auto.start.67= \
  reference:file:sc-bundles/keybindingChooser.jar \
  reference:file:sc-bundles/generalconfig.jar \
  reference:file:sc-bundles/otr.jar \
- reference:file:sc-bundles/facebookaccregwizz.jar \
  reference:file:sc-bundles/spellChecker.jar \
  reference:file:sc-bundles/advancedconfig.jar \
  reference:file:sc-bundles/plugin-loggingutils.jar \
@@ -214,7 +231,8 @@ felix.auto.start.67= \
  reference:file:sc-bundles/phonenumbercontactsource.jar \
  reference:file:sc-bundles/demuxcontactsource.jar \
  reference:file:sc-bundles/usersearch.jar \
- reference:file:sc-bundles/propertieseditor.jar
+ reference:file:sc-bundles/propertieseditor.jar \
+ reference:file:sc-bundles/plugin-blf.jar
 
 # Level 68 is for profiler4j. Either don't use it or change the build.xml file
 # accordingly.