From 7ed464ab9ba04146c9c2dce22f5ecb2c734e61ba Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Tue, 25 Nov 2014 09:22:34 +0200 Subject: [PATCH] Stops msn protocol from building and starting. --- build.xml | 4 ++-- lib/felix.client.run.properties | 2 -- lib/felix.unit.test.properties | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/build.xml b/build.xml index 9ba1dbb6f..af8c0e605 100644 --- a/build.xml +++ b/build.xml @@ -1055,10 +1055,10 @@ bundle-jabber,bundle-jabber-slick,bundle-swing-ui,bundle-ui-service, bundle-jnalib,bundle-phonenumbers, bundle-irc-api,bundle-irc,bundle-irc-commands,bundle-plugin-ircaccregwizz, - bundle-msn,bundle-msn-slick,bundle-yahoo,bundle-yahoo-slick, + bundle-yahoo,bundle-yahoo-slick, bundle-contactlist,meta-contactlist,meta-contactlist-slick, bundle-plugin-icqaccregwizz,bundle-plugin-jabberaccregwizz, - bundle-plugin-msnaccregwizz,bundle-plugin-sipaccregwizz, + bundle-plugin-sipaccregwizz, bundle-plugin-yahooaccregwizz,bundle-plugin-aimaccregwizz, bundle-commons-codec,bundle-commons-lang,bundle-httputil,bundle-plugin-spellcheck, bundle-version-impl,bundle-shutdown-timeout,bundle-windows-clean-shutdown, diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties index d8407434b..548d9e71c 100644 --- a/lib/felix.client.run.properties +++ b/lib/felix.client.run.properties @@ -126,7 +126,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-msn.jar \ reference:file:sc-bundles/protocol-yahoo.jar \ reference:file:sc-bundles/protocol-irc.jar \ reference:file:sc-bundles/reconnectplugin.jar @@ -168,7 +167,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/msnaccregwizz.jar \ reference:file:sc-bundles/yahooaccregwizz.jar \ reference:file:sc-bundles/ircaccregwizz.jar \ reference:file:sc-bundles/contacteventhandler.jar \ diff --git a/lib/felix.unit.test.properties b/lib/felix.unit.test.properties index b72b29915..937b099b7 100644 --- a/lib/felix.unit.test.properties +++ b/lib/felix.unit.test.properties @@ -116,7 +116,6 @@ felix.auto.start.60= \ reference:file:sc-bundles/smacklib.jar \ reference:file:sc-bundles/neomedia.jar \ reference:file:sc-bundles/protocol-jabber.jar \ - reference:file:sc-bundles/protocol-msn.jar \ reference:file:sc-bundles/protocol-sip.jar \ reference:file:sc-bundles/protocol-yahoo.jar \ reference:file:sc-bundles/protocol-mock.jar \ @@ -142,7 +141,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-msn-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 \