From 8f37c122be5c660f3f82f7273641e567b47229a5 Mon Sep 17 00:00:00 2001
From: Danny van Heumen <danny@dannyvanheumen.nl>
Date: Fri, 17 Jan 2014 20:15:42 +0100
Subject: [PATCH] Moved slf4j-{api,simple} into separate bundle.

---
 build.xml                                        | 16 +++++++++-------
 lib/felix.client.run.properties                  |  3 ++-
 .../impl/protocol/irc/irc.provider.manifest.mf   |  1 +
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 38ddcb81d..e4ce17eb9 100644
--- a/build.xml
+++ b/build.xml
@@ -1054,7 +1054,7 @@
         bundle-icq-slick,bundle-mock,bundle-smacklib,bundle-jmdnslib,
         bundle-jabber,bundle-jabber-slick,bundle-swing-ui,bundle-ui-service,
         bundle-jnalib,bundle-phonenumbers,
-        bundle-irc, bundle-plugin-ircaccregwizz,
+        bundle-irc,bundle-plugin-ircaccregwizz,
         bundle-msn,bundle-msn-slick,bundle-yahoo,bundle-yahoo-slick,
         bundle-contactlist,meta-contactlist,meta-contactlist-slick,
         bundle-plugin-icqaccregwizz,bundle-plugin-jabberaccregwizz,
@@ -1099,7 +1099,7 @@
     	bundle-usersearch,
         bundle-plugin-propertieseditor,bundle-plugin-accountinfo,
         bundle-plugin-connectioninfo,
-        bundle-guava,bundle-hsql"/>
+        bundle-guava,bundle-hsql,bundle-slf4j"/>
 
     <!--BUNDLE-SC-LAUNCHER-->
     <target name="bundle-sc-launcher">
@@ -2086,7 +2086,7 @@ javax.swing.event, javax.swing.border"/>
     </target>
 
     <!-- BUNDLE-IRC -->
-    <target name="bundle-irc">
+    <target name="bundle-irc" depends="bundle-slf4j">
         <!-- Creates a bundle containing the IRC impl of the protocol provider.-->
         <jar compress="false" destfile="${bundles.dest}/protocol-irc.jar"
          manifest="${src}/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf">
@@ -2094,13 +2094,15 @@ javax.swing.event, javax.swing.border"/>
                         prefix="net/java/sip/communicator/impl/protocol/irc"/>
         	<zipfileset src="${lib.noinst}/irc-api-1.0.jar"
         				prefix="" />
-        	<zipfileset src="${lib.noinst}/slf4j-api-1.7.5.jar"
-        				prefix="" />
-        	<zipfileset src="${lib.noinst}/slf4j-simple-1.7.5.jar"
-        	        	prefix="" />
         </jar>
     </target>
 
+    <!-- BUNDLE SLF4J -->
+	<target name="bundle-slf4j">
+	    <copy file="${lib.noinst}/slf4j-api-1.7.5.jar" tofile="${bundles.dest}/slf4j-api.jar"/>
+	    <copy file="${lib.noinst}/slf4j-simple-1.7.5.jar" tofile="${bundles.dest}/slf4j-simple.jar"/>
+    </target>
+
     <!-- BUNDLE-PLUGIN-IRCACCREGWIZZ -->
     <target name="bundle-plugin-ircaccregwizz">
             <!-- Creates a bundle for the plugin IRC Account Registration
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index 0e03b4883..4d5ff5c82 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -34,7 +34,8 @@ felix.auto.start.10= \
  reference:file:sc-bundles/bouncycastle.jar \
  reference:file:sc-bundles/bccontrib.jar \
  reference:file:sc-bundles/commons-lang.jar \
- reference:file:sc-bundles/guava.jar
+ reference:file:sc-bundles/guava.jar \
+ reference:file:sc-bundles/slf4j-api.jar
  
 # file:lib/bundle/shell.jar \
 # file:lib/bundle/servicebinder.jar \
diff --git a/src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf
index fad5e5d61..391100899 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf
@@ -11,4 +11,5 @@ Import-Package: org.osgi.framework,
  net.java.sip.communicator.util,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.service.protocol.event,
+ org.slf4j,
  javax.net.ssl