aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2007-06-01 12:17:22 +0000
committerDamian Minkov <damencho@jitsi.org>2007-06-01 12:17:22 +0000
commit2dfda989832e5daf4a72a39a2b41f23a533ef806 (patch)
treeb5dfc856859a4cfb9248f00174336ff4c3176a3c /lib
parentba1491c34364c59287510359fa7a87b8a443b243 (diff)
downloadjitsi-2dfda989832e5daf4a72a39a2b41f23a533ef806.zip
jitsi-2dfda989832e5daf4a72a39a2b41f23a533ef806.tar.gz
jitsi-2dfda989832e5daf4a72a39a2b41f23a533ef806.tar.bz2
1. smack library bundle to be used from bundles needing smack library
2. Fix overriding character encoding for icq messages in installers. Discussed with Pavel.
Diffstat (limited to 'lib')
-rw-r--r--lib/felix.client.run.properties1
-rw-r--r--lib/felix.unit.test.properties1
-rw-r--r--lib/installer-exclude/smack.manifest.mf13
3 files changed, 15 insertions, 0 deletions
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index aa359fb..d2d9b1e 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -62,6 +62,7 @@ felix.auto.start.50= \
reference:file:sc-bundles/media.jar \
reference:file:sc-bundles/protocol-icq.jar \
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 \
diff --git a/lib/felix.unit.test.properties b/lib/felix.unit.test.properties
index 3f6be86..12134b3 100644
--- a/lib/felix.unit.test.properties
+++ b/lib/felix.unit.test.properties
@@ -56,6 +56,7 @@ felix.auto.start.4= \
file:sc-bundles/fileaccess.jar \
file:sc-bundles/history.jar \
file:sc-bundles/protocol-icq.jar \
+ file:sc-bundles/smacklib.jar \
file:sc-bundles/protocol-jabber.jar \
file:sc-bundles/protocol-msn.jar \
file:sc-bundles/protocol-sip.jar \
diff --git a/lib/installer-exclude/smack.manifest.mf b/lib/installer-exclude/smack.manifest.mf
new file mode 100644
index 0000000..00120be
--- /dev/null
+++ b/lib/installer-exclude/smack.manifest.mf
@@ -0,0 +1,13 @@
+Bundle-Name: Smack Lib Provider
+Bundle-Description: Smack Lib Provider
+Bundle-Vendor: sip-communicator.org
+Bundle-Version: 0.0.1
+Import-Package: javax.net.ssl
+Export-Package: org.jivesoftware.smack,
+ org.jivesoftware.smack.packet,
+ org.jivesoftware.smack.provider,
+ org.jivesoftware.smack.util,
+ org.jivesoftware.smack.filter,
+ org.jivesoftware.smackx,
+ org.jivesoftware.smackx.muc,
+ org.jivesoftware.smackx.packet