Merge commit 'cf5da99'HEADmaster

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

66 files changed, 101 insertions, 206 deletions

diff --git a/lib/accounts.properties.template b/lib/accounts.properties.template
index 3845c47..3b6b540 100644
--- a/lib/accounts.properties.template
+++ b/lib/accounts.properties.template
@@ -189,47 +189,6 @@ accounts.jabber.CONTACT_LIST=
 # list of icq accounts to notify during testing (optional)
 accounts.reporting.JABBER_REPORT_LIST=
 
-# YAHOO PROPERTIES
-
-# YAHOO ACCOUNT 1
-# The username needed to log onto the server
-accounts.yahoo.account1.USER_ID=
-
-# The password (in plain text) needed to log the user specified in USER_ID
-# on the server
-accounts.yahoo.account1.PASSWORD=
-
-# YAHOO ACCOUNT 2
-
-# The username needed to log onto the server
-accounts.yahoo.account2.USER_ID=
-
-# The password (in plain text) needed to log the user specified in USER_ID
-# on the server
-accounts.yahoo.account2.PASSWORD=
-
-# YAHOO ACCOUNT 3
-
-# The username needed to log onto the server
-accounts.yahoo.account3.USER_ID=
-
-# The password (in plain text) needed to log the user specified in USER_ID
-# on the server
-accounts.yahoo.account3.PASSWORD=
-
-# The following describes the contact list that we will store on the yahoo
-# server for the tested account implementation. The value of the CONTACT_LIST
-# property must be a space separated string containing elements each of which
-# is in the format: GroupName.UIN
-
-
-# VERY IMPORTANT!!! All other users in this contact list will be removed and
-# the contacts and contact groups enumerated beneath will be added instead
-accounts.yahoo.CONTACT_LIST=
-
-# list of yahoo accounts to notify during testing (optional)
-accounts.reporting.YAHOO_REPORT_LIST=
-
 # GIBBERISH Account 1
 # The username to create the first Gibberish account with.
 accounts.gibberish.account1.USER_ID=gibacc1
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.
diff --git a/lib/felix.jar b/lib/felix.jar
index ec4e81a..c91e86b 100644
--- a/lib/felix.jar
+++ b/lib/felix.jar
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 \
diff --git a/lib/installer-exclude/bccontrib-1.0-SNAPSHOT.jar b/lib/installer-exclude/bccontrib-1.0-SNAPSHOT.jar
deleted file mode 100644
index 719078e..0000000
--- a/lib/installer-exclude/bccontrib-1.0-SNAPSHOT.jar
+++ /dev/null
diff --git a/lib/installer-exclude/bccontrib-1.0.jar b/lib/installer-exclude/bccontrib-1.0.jar
new file mode 100644
index 0000000..47a6a89
--- /dev/null
+++ b/lib/installer-exclude/bccontrib-1.0.jar
diff --git a/lib/installer-exclude/bcpkix-jdk15on-1.54.jar b/lib/installer-exclude/bcpkix-jdk15on-1.54.jar
new file mode 100644
index 0000000..86f7f0b
--- /dev/null
+++ b/lib/installer-exclude/bcpkix-jdk15on-1.54.jar
diff --git a/lib/installer-exclude/bcpkix-jdk15on-151.jar b/lib/installer-exclude/bcpkix-jdk15on-151.jar
deleted file mode 100755
index 57e0080..0000000
--- a/lib/installer-exclude/bcpkix-jdk15on-151.jar
+++ /dev/null
diff --git a/lib/installer-exclude/bcprov-jdk15on-1.54.jar b/lib/installer-exclude/bcprov-jdk15on-1.54.jar
new file mode 100644
index 0000000..bd95185
--- /dev/null
+++ b/lib/installer-exclude/bcprov-jdk15on-1.54.jar
diff --git a/lib/installer-exclude/bcprov-jdk15on-151.jar b/lib/installer-exclude/bcprov-jdk15on-151.jar
deleted file mode 100755
index 4076e11..0000000
--- a/lib/installer-exclude/bcprov-jdk15on-151.jar
+++ /dev/null
diff --git a/lib/installer-exclude/dict4j.jar b/lib/installer-exclude/dict4j.jar
deleted file mode 100755
index 7eb9813..0000000
--- a/lib/installer-exclude/dict4j.jar
+++ /dev/null
diff --git a/lib/installer-exclude/dnsjava.jar b/lib/installer-exclude/dnsjava-2.1.7.jar
index 8158168..6e85e30 100644
--- a/lib/installer-exclude/dnsjava.jar
+++ b/lib/installer-exclude/dnsjava-2.1.7.jar
diff --git a/lib/installer-exclude/dnssecjava-1.1.jar b/lib/installer-exclude/dnssecjava-1.1.jar
new file mode 100644
index 0000000..57ad85a
--- /dev/null
+++ b/lib/installer-exclude/dnssecjava-1.1.jar
diff --git a/lib/installer-exclude/fmj-1.0-SNAPSHOT.jar b/lib/installer-exclude/fmj-1.0-SNAPSHOT.jar
index a9757b3..9e56a31 100644
--- a/lib/installer-exclude/fmj-1.0-SNAPSHOT.jar
+++ b/lib/installer-exclude/fmj-1.0-SNAPSHOT.jar
diff --git a/lib/installer-exclude/httpclient.manifest.mf b/lib/installer-exclude/httpclient.manifest.mf
deleted file mode 100644
index bbd83f0..0000000
--- a/lib/installer-exclude/httpclient.manifest.mf
+++ /dev/null
@@ -1,41 +0,0 @@
-Bundle-Name: Apache Http Client
-Bundle-Description: Apache Http Client
-Bundle-Vendor: jitsi.org
-Bundle-Version: 4.2.3
-Bundle-SymbolicName: org.apache.http
-Import-Package: org.apache.commons.logging,
- javax.security.auth.x500,
- javax.net.ssl
-Export-Package: org.apache.http,
- org.apache.http.entity,
- org.apache.http.entity.mime,
- org.apache.http.entity.mime.content,
- org.apache.http.impl,
- org.apache.http.impl.auth,
- org.apache.http.impl.client,
- org.apache.http.impl.conn,
- org.apache.http.impl.entity,
- org.apache.http.impl.io,
- org.apache.http.io,
- org.apache.http.message,
- org.apache.http.params,
- org.apache.http.protocol,
- org.apache.http.util,
- org.apache.http.annotation,
- org.apache.http.auth,
- org.apache.http.auth.params,
- org.apache.http.client,
- org.apache.http.client.entity,
- org.apache.http.client.methods,
- org.apache.http.client.params,
- org.apache.http.client.protocol,
- org.apache.http.client.utils,
- org.apache.http.conn,
- org.apache.http.conn.params,
- org.apache.http.conn.routing,
- org.apache.http.conn.scheme,
- org.apache.http.conn.ssl,
- org.apache.http.conn.util,
- org.apache.http.impl.client
-
-
diff --git a/lib/installer-exclude/ice4j-2.0-20170111.193659-7.jar b/lib/installer-exclude/ice4j-2.0-20170111.193659-7.jar
new file mode 100644
index 0000000..752334b
--- /dev/null
+++ b/lib/installer-exclude/ice4j-2.0-20170111.193659-7.jar
diff --git a/lib/installer-exclude/ice4j.jar b/lib/installer-exclude/ice4j.jar
deleted file mode 100644
index 0bdde1c..0000000
--- a/lib/installer-exclude/ice4j.jar
+++ /dev/null
diff --git a/lib/installer-exclude/jain-sdp.jar b/lib/installer-exclude/jain-sdp.jar
deleted file mode 100644
index 8f4b7a6..0000000
--- a/lib/installer-exclude/jain-sdp.jar
+++ /dev/null
diff --git a/lib/installer-exclude/jain-sip-api.jar b/lib/installer-exclude/jain-sip-api.jar
deleted file mode 100644
index 3ed1a74..0000000
--- a/lib/installer-exclude/jain-sip-api.jar
+++ /dev/null
diff --git a/lib/installer-exclude/jain-sip-ri-ossonly-1.2.279-jitsi-oss1.jar b/lib/installer-exclude/jain-sip-ri-ossonly-1.2.279-jitsi-oss1.jar
new file mode 100644
index 0000000..f19d986
--- /dev/null
+++ b/lib/installer-exclude/jain-sip-ri-ossonly-1.2.279-jitsi-oss1.jar
diff --git a/lib/installer-exclude/jain-sip-ri.jar b/lib/installer-exclude/jain-sip-ri.jar
deleted file mode 100644
index e5298b6..0000000
--- a/lib/installer-exclude/jain-sip-ri.jar
+++ /dev/null
diff --git a/lib/installer-exclude/java-sdp-nist-bridge-1.2.jar b/lib/installer-exclude/java-sdp-nist-bridge-1.2.jar
new file mode 100644
index 0000000..2efa7fc
--- /dev/null
+++ b/lib/installer-exclude/java-sdp-nist-bridge-1.2.jar
diff --git a/lib/installer-exclude/jcommon-1.0.0.jar b/lib/installer-exclude/jcommon-1.0.0.jar
deleted file mode 100644
index c5d23f4..0000000
--- a/lib/installer-exclude/jcommon-1.0.0.jar
+++ /dev/null
diff --git a/lib/installer-exclude/jdom.jar b/lib/installer-exclude/jdom.jar
deleted file mode 100644
index 288e64c..0000000
--- a/lib/installer-exclude/jdom.jar
+++ /dev/null
diff --git a/lib/installer-exclude/jfontchooser-1.0.5.jar b/lib/installer-exclude/jfontchooser-1.0.5.jar
deleted file mode 100644
index 769c8f1..0000000
--- a/lib/installer-exclude/jfontchooser-1.0.5.jar
+++ /dev/null
diff --git a/lib/installer-exclude/jfontchooser.manifest.mf b/lib/installer-exclude/jfontchooser.manifest.mf
deleted file mode 100644
index 6ad2b73..0000000
--- a/lib/installer-exclude/jfontchooser.manifest.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Bundle-Name: JFontChooser
-Bundle-Description: A library containing a Java Font Chooser
-Bundle-Vendor: sip-communicator.org
-Bundle-Version: 0.0.1
-Bundle-SymbolicName: say.swing
-Import-Package: javax.swing,
- javax.swing.border,
- javax.swing.event,
- javax.swing.text
-Export-Package: say.swing
diff --git a/lib/installer-exclude/jfreechart-1.0.1.jar b/lib/installer-exclude/jfreechart-1.0.1.jar
deleted file mode 100644
index 3e4f9cd..0000000
--- a/lib/installer-exclude/jfreechart-1.0.1.jar
+++ /dev/null
diff --git a/lib/installer-exclude/jitsi-gpl-dependencies-1.0-SNAPSHOT.jar b/lib/installer-exclude/jitsi-gpl-dependencies-1.0-SNAPSHOT.jar
new file mode 100644
index 0000000..39091c8
--- /dev/null
+++ b/lib/installer-exclude/jitsi-gpl-dependencies-1.0-SNAPSHOT.jar
diff --git a/lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar b/lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar
index ec93db9..07d4ec4 100644
--- a/lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar
+++ b/lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar
diff --git a/lib/installer-exclude/jmork-1.0.5-SNAPSHOT.jar b/lib/installer-exclude/jmork-1.0.5-SNAPSHOT.jar
deleted file mode 100644
index 671c474..0000000
--- a/lib/installer-exclude/jmork-1.0.5-SNAPSHOT.jar
+++ /dev/null
diff --git a/lib/installer-exclude/jmork-1.0.5.jar b/lib/installer-exclude/jmork-1.0.5.jar
new file mode 100644
index 0000000..f87ee11
--- /dev/null
+++ b/lib/installer-exclude/jmork-1.0.5.jar
diff --git a/lib/installer-exclude/jna.manifest.mf b/lib/installer-exclude/jna.manifest.mf
deleted file mode 100644
index 0c32920..0000000
--- a/lib/installer-exclude/jna.manifest.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-Bundle-Name: JNA Lib Provider
-Bundle-Description: JNA Lib Provider
-Bundle-Vendor: sip-communicator.org
-Bundle-Version: 0.0.1
-Bundle-SymbolicName: com.sun.jna
-Export-Package: com.sun.jna.win32,
- com.sun.jna,
- com.sun.jna.ptr,
- com.sun.jna.platform,
- com.sun.jna.platform.win32
-
-
diff --git a/lib/installer-exclude/jsch-0.1.36.jar b/lib/installer-exclude/jsch-0.1.36.jar
deleted file mode 100644
index fde92b4..0000000
--- a/lib/installer-exclude/jsch-0.1.36.jar
+++ /dev/null
diff --git a/lib/installer-exclude/libjitsi-1.0-SNAPSHOT.jar b/lib/installer-exclude/libjitsi-1.0-20170207.194207-242.jar
index cf37b9e..a8ca832 100644
--- a/lib/installer-exclude/libjitsi-1.0-SNAPSHOT.jar
+++ b/lib/installer-exclude/libjitsi-1.0-20170207.194207-242.jar
diff --git a/lib/installer-exclude/p4j-exclusions.txt b/lib/installer-exclude/p4j-exclusions.txt
deleted file mode 100644
index 7b76523..0000000
--- a/lib/installer-exclude/p4j-exclusions.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-#

-# This file lists those classes that should be ignored by 

-# the agent during instrumentation. In most cases these 

-# classes trigger JVM internal errors and should be simply 

-# ignored. Notice that some classes are ignored even if

-# not listed here (they may cause your JVM to crash 

-# seriously so I hard-coded exclusions for those within 

-# the agent)

-#

-# The agent will ignore all classes STARTING WITH the string

-# indicated. So, you can exclude a whole package by ending 

-# with '.'

-#

-

-org.apache.tomcat.jni.OS

-org.jboss.util.xml.DOMWriter

-org.jboss.mq.il.uil2.ServerSocketManagerHandler

-org.hsqldb.jdbc.jdbcConnection

-org.hsqldb.Index

-bsh.ParserTokenManager

-org.eclipse.jdt.internal.compiler.lookup.TypeBinding

-org.eclipse.jdt.internal.compiler.ast.Expression

-org.eclipse.jdt.internal.compiler.problem.ProblemReporter

-org.eclipse.jdt.internal.compiler.impl.Constant

-com.arjuna.ats.internal.arjuna.objectstore.ShadowingStore

-sun.reflect.
\ No newline at end of file
diff --git a/lib/installer-exclude/profiler4j-1.0-beta3-SC.jar b/lib/installer-exclude/profiler4j-1.0-beta3-SC.jar
deleted file mode 100644
index 1212cb8..0000000
--- a/lib/installer-exclude/profiler4j-1.0-beta3-SC.jar
+++ /dev/null
diff --git a/lib/installer-exclude/sdp-api-1.0.jar b/lib/installer-exclude/sdp-api-1.0.jar
new file mode 100644
index 0000000..fc50919
--- /dev/null
+++ b/lib/installer-exclude/sdp-api-1.0.jar
diff --git a/lib/installer-exclude/sip-api-1.2-1.2.jar b/lib/installer-exclude/sip-api-1.2-1.2.jar
new file mode 100644
index 0000000..3adf4c3
--- /dev/null
+++ b/lib/installer-exclude/sip-api-1.2-1.2.jar
diff --git a/lib/installer-exclude/smack.jar b/lib/installer-exclude/smack.jar
index b0cc856..80bd5c7 100644
--- a/lib/installer-exclude/smack.jar
+++ b/lib/installer-exclude/smack.jar
diff --git a/lib/installer-exclude/smackx-debug.jar b/lib/installer-exclude/smackx-debug.jar
index 3311681..45bcaaf 100644
--- a/lib/installer-exclude/smackx-debug.jar
+++ b/lib/installer-exclude/smackx-debug.jar
diff --git a/lib/installer-exclude/smackx.jar b/lib/installer-exclude/smackx.jar
index ba590ca..6362497 100644
--- a/lib/installer-exclude/smackx.jar
+++ b/lib/installer-exclude/smackx.jar
diff --git a/lib/installer-exclude/swing-worker-1.2.jar b/lib/installer-exclude/swing-worker-1.2.jar
deleted file mode 100644
index 6953042..0000000
--- a/lib/installer-exclude/swing-worker-1.2.jar
+++ /dev/null
diff --git a/lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar b/lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar
deleted file mode 100644
index 5051f8f..0000000
--- a/lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar
+++ /dev/null
diff --git a/lib/installer-exclude/weupnp-0.1.4.jar b/lib/installer-exclude/weupnp-0.1.4.jar
new file mode 100644
index 0000000..a03b9e2
--- /dev/null
+++ b/lib/installer-exclude/weupnp-0.1.4.jar
diff --git a/lib/installer-exclude/xalan-2.6.0.jar.ant b/lib/installer-exclude/xalan-2.6.0.jar.ant
deleted file mode 100755
index c307040..0000000
--- a/lib/installer-exclude/xalan-2.6.0.jar.ant
+++ /dev/null
diff --git a/lib/installer-exclude/ymsg_network_v0_67.jar b/lib/installer-exclude/ymsg_network_v0_67.jar
deleted file mode 100644
index 998358a..0000000
--- a/lib/installer-exclude/ymsg_network_v0_67.jar
+++ /dev/null
diff --git a/lib/installer-exclude/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar b/lib/installer-exclude/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar
new file mode 100644
index 0000000..a7819d2
--- /dev/null
+++ b/lib/installer-exclude/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar
diff --git a/lib/installer-exclude/zrtp4j-light.jar b/lib/installer-exclude/zrtp4j-light.jar
deleted file mode 100644
index 72797c6..0000000
--- a/lib/installer-exclude/zrtp4j-light.jar
+++ /dev/null
diff --git a/lib/jitsi-defaults.properties b/lib/jitsi-defaults.properties
index 417bd00..ff21e05 100644
--- a/lib/jitsi-defaults.properties
+++ b/lib/jitsi-defaults.properties
@@ -37,7 +37,7 @@ net.java.sip.communicator.service.protocol.jabber.GOOGLE_CONTACTS_ENABLED=true
 net.java.sip.communicator.plugin.spellcheck.SYSTEM_HUNSPELL_DIR=/usr/share/hunspell
 
 # protocol order for the simple initial account registration wizard
-plugin.simpleaccreg.PROTOCOL_ORDER=SIP|Jabber|Facebook|Google Talk
+plugin.simpleaccreg.PROTOCOL_ORDER=SIP|Jabber|Google Talk
 
 #provisioning defaults
 net.java.sip.communicator.plugin.provisioning.MANDATORY=false
@@ -75,7 +75,6 @@ net.java.sip.communicator.plugin.pluginmanager.SYSTEM_BUNDLES=\
     net.java.sip.communicator.plugin.defaultresourcepack,\
     net.java.sip.communicator.plugin.demuxcontactsource,\
     net.java.sip.communicator.replacement.directimage,\
-    net.java.sip.communicator.plugin.facebookaccregwizz,\
     net.java.sip.communicator.fileaccess,\
     net.java.sip.communicator.filehistory,\
     net.java.sip.communicator.replacement.flickr,\
@@ -152,8 +151,6 @@ net.java.sip.communicator.plugin.pluginmanager.SYSTEM_BUNDLES=\
     net.java.sip.communicator.version,\
     net.java.sip.communicator.replacement.viddler,\
     net.java.sip.communicator.replacement.vimeo,\
-    net.java.sip.communicator.protocol.yahoo,\
-    net.java.sip.communicator.plugin.yahooaccregwizz,\
     net.java.sip.communicator.replacement.youtube,\
     net.java.sip.communicator.libjitsi,\
     net.java.sip.communicator.provdisc.mdns,\
diff --git a/lib/native/linux-64/libjunbound.so b/lib/native/linux-64/libjunbound.so
deleted file mode 100644
index 323403b..0000000
--- a/lib/native/linux-64/libjunbound.so
+++ /dev/null
diff --git a/lib/native/linux/libjunbound.so b/lib/native/linux/libjunbound.so
deleted file mode 100644
index 274d9dd..0000000
--- a/lib/native/linux/libjunbound.so
+++ /dev/null
diff --git a/lib/native/mac/libjunbound.jnilib b/lib/native/mac/libjunbound.jnilib
deleted file mode 100644
index fcc1428..0000000
--- a/lib/native/mac/libjunbound.jnilib
+++ /dev/null
diff --git a/lib/native/solaris/libCvidPro.so b/lib/native/solaris/libCvidPro.so
deleted file mode 100644
index dcad6f9..0000000
--- a/lib/native/solaris/libCvidPro.so
+++ /dev/null
diff --git a/lib/native/solaris/soundbank.gm b/lib/native/solaris/soundbank.gm
deleted file mode 100644
index 1b3f8dc..0000000
--- a/lib/native/solaris/soundbank.gm
+++ /dev/null
diff --git a/lib/native/windows-64/jmsofficecomm.dll b/lib/native/windows-64/jmsofficecomm.dll
index 974b617..6ce3901 100755
--- a/lib/native/windows-64/jmsofficecomm.dll
+++ b/lib/native/windows-64/jmsofficecomm.dll
diff --git a/lib/native/windows-64/jmsoutlookaddrbook.dll b/lib/native/windows-64/jmsoutlookaddrbook.dll
index 70095cb..85be249 100755
--- a/lib/native/windows-64/jmsoutlookaddrbook.dll
+++ b/lib/native/windows-64/jmsoutlookaddrbook.dll
diff --git a/lib/native/windows-64/jmsoutlookaddrbookcomserver32.exe b/lib/native/windows-64/jmsoutlookaddrbookcomserver32.exe
index 6cfa4f0..8415e77 100755
--- a/lib/native/windows-64/jmsoutlookaddrbookcomserver32.exe
+++ b/lib/native/windows-64/jmsoutlookaddrbookcomserver32.exe
diff --git a/lib/native/windows-64/jmsoutlookaddrbookcomserver64.exe b/lib/native/windows-64/jmsoutlookaddrbookcomserver64.exe
index 4202f2d..66d3db2 100755
--- a/lib/native/windows-64/jmsoutlookaddrbookcomserver64.exe
+++ b/lib/native/windows-64/jmsoutlookaddrbookcomserver64.exe
diff --git a/lib/native/windows-64/junbound.dll b/lib/native/windows-64/junbound.dll
deleted file mode 100644
index 0a27298..0000000
--- a/lib/native/windows-64/junbound.dll
+++ /dev/null
diff --git a/lib/native/windows/IeEmbed.exe b/lib/native/windows/IeEmbed.exe
deleted file mode 100644
index 1e83d21..0000000
--- a/lib/native/windows/IeEmbed.exe
+++ /dev/null
diff --git a/lib/native/windows/jmsofficecomm.dll b/lib/native/windows/jmsofficecomm.dll
index 7d59f64..e51bc3b 100755
--- a/lib/native/windows/jmsofficecomm.dll
+++ b/lib/native/windows/jmsofficecomm.dll
diff --git a/lib/native/windows/jmsoutlookaddrbook.dll b/lib/native/windows/jmsoutlookaddrbook.dll
index b8445de..a976aea 100755
--- a/lib/native/windows/jmsoutlookaddrbook.dll
+++ b/lib/native/windows/jmsoutlookaddrbook.dll
diff --git a/lib/native/windows/jmsoutlookaddrbookcomserver32.exe b/lib/native/windows/jmsoutlookaddrbookcomserver32.exe
index 849a90e..22fdb2a 100755
--- a/lib/native/windows/jmsoutlookaddrbookcomserver32.exe
+++ b/lib/native/windows/jmsoutlookaddrbookcomserver32.exe
diff --git a/lib/native/windows/jmsoutlookaddrbookcomserver64.exe b/lib/native/windows/jmsoutlookaddrbookcomserver64.exe
index a9dc028..dfb52de 100755
--- a/lib/native/windows/jmsoutlookaddrbookcomserver64.exe
+++ b/lib/native/windows/jmsoutlookaddrbookcomserver64.exe
diff --git a/lib/native/windows/junbound.dll b/lib/native/windows/junbound.dll
deleted file mode 100644
index b1b8da8..0000000
--- a/lib/native/windows/junbound.dll
+++ /dev/null
diff --git a/lib/testing.properties b/lib/testing.properties
index 850a47c..7b5c1b8 100644
--- a/lib/testing.properties
+++ b/lib/testing.properties
@@ -35,10 +35,6 @@ net.java.sip.communicator.slick.runner.TEST_LIST=ConfigurationServiceLick \
 # GenericProtocolProviderServiceLick because it does not add any tests.
 #
 # IcqProtocolProviderSlick because 2 of its 25 tests fail.
-#
-# Temporally disabling failing test
-# MsnProtocolProviderSlick
-# YahooProtocolProviderSlick
 
 
 # define all the test classes that can be run standalone, or by the