Remove Yahoo protocol

Closes #76, #293

6 files changed, 0 insertions, 51 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 59951c3..ad9a08a 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -152,7 +152,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
 
@@ -193,7 +192,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 \
diff --git a/lib/felix.unit.test.properties b/lib/felix.unit.test.properties
index 8c7cfa4..e8df121 100644
--- a/lib/felix.unit.test.properties
+++ b/lib/felix.unit.test.properties
@@ -141,7 +141,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 \
@@ -165,7 +164,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/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/jitsi-defaults.properties b/lib/jitsi-defaults.properties
index a132d7e..ff21e05 100644
--- a/lib/jitsi-defaults.properties
+++ b/lib/jitsi-defaults.properties
@@ -151,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/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