From cc1ba9b27932b5b137b88ba8c48d64c4493e689d Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Sat, 18 May 2013 14:24:38 +0300
Subject: [PATCH] Fixes some NoClassDefFoundErrors introduced in latest
 commits. Fixes tests.

---
 .gitignore                                   | 2 ++
 jitsi.eml                                    | 2 +-
 lib/felix.unit.test.properties               | 1 +
 lib/installer-exclude/httpclient.manifest.mf | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 820512dd9..1655c013f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ sc-bundles
 *.iws
 .gitignore
 jitsi.iml
+test-reports
+sip-communicator.utest.bin
diff --git a/jitsi.eml b/jitsi.eml
index e6f8970cd..065297adf 100644
--- a/jitsi.eml
+++ b/jitsi.eml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component>
+<component inheritJdk="true">
 	<contentEntry url="file://$MODULE_DIR$"/>
 	<lib name="felix.jar" scope="COMPILE">
 		<relative-module-cls project-related="jar://$PROJECT_DIR$/lib/felix.jar!/"/>
diff --git a/lib/felix.unit.test.properties b/lib/felix.unit.test.properties
index e93ada35f..05ee047a4 100644
--- a/lib/felix.unit.test.properties
+++ b/lib/felix.unit.test.properties
@@ -97,6 +97,7 @@ felix.auto.start.50= \
  reference:file:sc-bundles/protocol.jar \
  reference:file:sc-bundles/protocol-media.jar \
  reference:file:sc-bundles/commons-codec.jar \
+ reference:file:sc-bundles/httpclient.jar \
  reference:file:sc-bundles/httputil.jar \
  reference:file:sc-bundles/packetlogging.jar \
  reference:file:sc-bundles/json.jar \
diff --git a/lib/installer-exclude/httpclient.manifest.mf b/lib/installer-exclude/httpclient.manifest.mf
index 31b24ee1a..f62262bc8 100644
--- a/lib/installer-exclude/httpclient.manifest.mf
+++ b/lib/installer-exclude/httpclient.manifest.mf
@@ -4,6 +4,7 @@ Bundle-Vendor: jitsi.org
 Bundle-Version: 4.2.3
 System-Bundle: yes
 Import-Package: org.apache.commons.logging,
+ javax.security.auth.x500,
  javax.net.ssl
 Export-Package: org.apache.http,
  org.apache.http.entity,