From 951d09db0bbc632b9fca4be3d803444f992ad36b Mon Sep 17 00:00:00 2001
From: Emil Ivov <emcho@jitsi.org>
Date: Wed, 22 May 2013 18:14:23 +0300
Subject: [PATCH] Defines a default location for libjitsi and ice

---
 .classpath | 2 +-
 jitsi.eml  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.classpath b/.classpath
index 3ada0efd0..b219c4dea 100644
--- a/.classpath
+++ b/.classpath
@@ -33,7 +33,7 @@
 	<classpathentry kind="lib" path="lib/installer-exclude/hexdump-0.2.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/httpclient-osgi-4.2.3.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/httpcore-osgi-4.2.3.jar"/>
-	<classpathentry kind="lib" path="lib/installer-exclude/ice4j.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/ice4j.jar" sourcepath="../ice4j/src"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/jain-sdp.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="https://hudson.jboss.org/jenkins/job/jain-sip/lastStableBuild/artifact/javadoc/"/>
diff --git a/jitsi.eml b/jitsi.eml
index e6f8970cd..00888813f 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!/"/>
@@ -68,6 +68,8 @@
 		<relative-module-cls project-related="jar://$PROJECT_DIR$/lib/installer-exclude/httpcore-osgi-4.2.3.jar!/"/>
 	</lib>
 	<lib name="ice4j.jar" scope="COMPILE">
+		<srcroot url="file://$MODULE_DIR$/../ice4j/src"/>
+		<srcroot bind="false" url="file://$MODULE_DIR$/../ice4j/test"/>
 		<relative-module-cls project-related="jar://$PROJECT_DIR$/lib/installer-exclude/ice4j.jar!/"/>
 	</lib>
 	<lib name="jain-sdp.jar" scope="COMPILE">
@@ -132,6 +134,7 @@
 	</lib>
 	<lib name="libjitsi.jar" scope="COMPILE">
 		<srcroot url="file:///libjitsi"/>
+		<srcroot url="file://$MODULE_DIR$/../libjitsi/src"/>
 		<relative-module-cls project-related="jar://$PROJECT_DIR$/lib/installer-exclude/libjitsi.jar!/"/>
 	</lib>
 	<lib name="log4j-1.2.8.jar" scope="COMPILE">