Update dnsjava to stock 2.1.7 and make sure it is only loaded once

9 files changed, 37 insertions, 32 deletions

diff --git a/.classpath b/.classpath
index 194ed36..62e52bd 100755
--- a/.classpath
+++ b/.classpath
@@ -14,7 +14,7 @@
 	<classpathentry kind="lib" path="lib/bundle/commons-logging.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/dhcp4java-1.00.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/dict4j.jar"/>
-	<classpathentry kind="lib" path="lib/installer-exclude/dnsjava.jar">
+	<classpathentry kind="lib" path="lib/installer-exclude/dnsjava-2.1.7.jar" sourcepath="/dnsjava">
 		<attributes>
 			<attribute name="javadoc_location" value="http://www.dnsjava.org/dnsjava-current/doc/"/>
 		</attributes>
@@ -88,5 +88,6 @@
 	<classpathentry kind="lib" path="lib/installer-exclude/google-http-client-jackson2-1.20.0.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/google-oauth-client-1.20.0.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/jackson-core-2.5.3.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/dnssecjava-1.1.jar" sourcepath="/dnssecjava"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>
diff --git a/build.xml b/build.xml
index 94db76c..6594491 100644
--- a/build.xml
+++ b/build.xml
@@ -1127,6 +1127,7 @@
         <copy file="${lib.noinst}/sip-api-1.2-1.2.jar" tofile="${bundles.dest}/sip-api.jar"/>
         <copy file="${lib.noinst}/java-sdp-nist-bridge-1.2.jar" tofile="${bundles.dest}/java-sdp-nist-bridge.jar"/>
         <copy file="${lib.noinst}/jain-sip-ri-ossonly-1.2.279-jitsi-oss1.jar" tofile="${bundles.dest}/jain-sip-ri.jar"/>
+        <copy file="${lib.noinst}/dnsjava-2.1.7.jar" tofile="${bundles.dest}/dnsjava.jar"/>
     </target>
 
     <!--BUNDLE-SC-LAUNCHER-->
@@ -1250,7 +1251,6 @@
             <zipfileset dir="${dest}/net/java/sip/communicator/util"
                 prefix="net/java/sip/communicator/util">
             </zipfileset>
-            <zipfileset src="${lib.noinst}/dnsjava.jar" prefix=""/>
         </jar>
     </target>
 
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index 15e34f2..ffe19a4 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -2,32 +2,35 @@
 # Framework config properties.
 #
 org.osgi.framework.system.packages.extra= \
- apple.awt; \
- com.apple.cocoa.application; \
- com.apple.cocoa.foundation; \
- com.apple.eawt; \
- com.apple.eio; \
- com.sun.awt; \
- net.java.sip.communicator.util.launchutils; \
- org.apache.xml.serialize; \
- org.growl4j; \
- org.xbill.DNS; \
- quicktime; \
- quicktime.qd; \
- quicktime.std.image; \
- quicktime.std.sg; \
- quicktime.util; \
- sun.awt.shell; \
- sun.lwawt; \
- sun.lwawt.macosx; \
- sun.misc; \
- sun.net.util; \
- sun.net.dns; \
- sun.security.action; \
- sun.security.pkcs11;\
- sun.audio;\
- sun.nio.ch;\
- com.sun.nio.sctp
+ apple.awt, \
+ com.apple.cocoa.application, \
+ com.apple.cocoa.foundation, \
+ com.apple.eawt, \
+ com.apple.eio, \
+ com.sun.awt, \
+ net.java.sip.communicator.util.launchutils, \
+ org.apache.xml.serialize, \
+ org.growl4j, \
+ org.xbill.DNS;version="2.1.7", \
+ org.xbill.DNS.utils;version="2.1.7", \
+ quicktime, \
+ quicktime.qd, \
+ quicktime.std.image, \
+ quicktime.std.sg, \
+ quicktime.util, \
+ sun.awt.shell, \
+ sun.lwawt, \
+ sun.lwawt.macosx, \
+ sun.misc, \
+ sun.net.util, \
+ sun.net.dns, \
+ sun.security.action, \
+ sun.security.pkcs11,\
+ sun.audio,\
+ sun.nio.ch,\
+ com.sun.nio.sctp, \
+ android.os, \
+ sun.net.spi.nameservice
 
 
 felix.auto.start.5=reference:file:sc-bundles/splash-screen.jar
diff --git a/lib/installer-exclude/dnsjava.jar b/lib/installer-exclude/dnsjava-2.1.7.jar
index 8158168..6e85e30 100644
--- a/lib/installer-exclude/dnsjava.jar
+++ b/lib/installer-exclude/dnsjava-2.1.7.jar
diff --git a/resources/install/debian/jitsi.sh.tmpl b/resources/install/debian/jitsi.sh.tmpl
index de159db..7963135 100644
--- a/resources/install/debian/jitsi.sh.tmpl
+++ b/resources/install/debian/jitsi.sh.tmpl
@@ -30,7 +30,7 @@ javabin=`which java`
 SCDIR=/usr/share/_PACKAGE_NAME_
 JITSI_COMMON_DIR=/usr/share/_PACKAGE_NAME_-common
 LIBPATH=$SCDIR/lib
-CLASSPATH=/usr/share/java/org.apache.felix.framework.jar:/usr/share/java/org.apache.felix.main.jar:$SCDIR/sc-bundles/sc-launcher.jar:$JITSI_COMMON_DIR/util.jar/launchutils.jar:$LIBPATH
+CLASSPATH=/usr/share/java/org.apache.felix.framework.jar:/usr/share/java/org.apache.felix.main.jar:/usr/share/java/dnsjava.jar:$SCDIR/sc-bundles/sc-launcher.jar:$JITSI_COMMON_DIR/util.jar/launchutils.jar:$LIBPATH
 FELIX_CONFIG=$LIBPATH/felix.client.run.properties
 LOG_CONFIG=$LIBPATH/logging.properties
 COMMAND="$javabin $CLIENTARGS -classpath $CLASSPATH -Djna.library.path=/usr/lib/jni -Dfelix.config.properties=file:$FELIX_CONFIG -Djava.util.logging.config.file=$LOG_CONFIG $SPLASH_ARG net.java.sip.communicator.launcher.SIPCommunicator"
diff --git a/resources/install/linux/run.sh b/resources/install/linux/run.sh
index ef3e9ff..bd74b1a 100755
--- a/resources/install/linux/run.sh
+++ b/resources/install/linux/run.sh
@@ -2,4 +2,4 @@ mkdir -p $HOME/.sip-communicator/log
 
 export PATH=$PATH:native
 export JAVA_HOME=jre
-${JAVA_HOME}/bin/java -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djna.library.path=native -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator
+${JAVA_HOME}/bin/java -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/dnsjava.jar:sc-bundles/util.jar:lib/" -Djna.library.path=native -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator
diff --git a/resources/install/rpm/SPECS/jitsi.spec b/resources/install/rpm/SPECS/jitsi.spec
index 0998303..32bc811 100644
--- a/resources/install/rpm/SPECS/jitsi.spec
+++ b/resources/install/rpm/SPECS/jitsi.spec
@@ -113,6 +113,7 @@ sed -i -e "s/\/usr\/lib\/jni/\$LIBPATH\/native/" $RPM_BUILD_ROOT/usr/bin/jitsi
 sed -i -e "s/\/usr\/share\/java\/jdic\.jar/\$LIBPATH\/jdic_stub\.jar:\$LIBPATH\/jdic-all\.jar/" $RPM_BUILD_ROOT/usr/bin/jitsi
 sed -i -e "s/\/usr\/share\/java\/org\.apache\.felix\.framework\.jar/\$LIBPATH\/felix\.jar/" $RPM_BUILD_ROOT/usr/bin/jitsi
 sed -i -e "s/\/usr\/share\/java\/org\.apache\.felix\.main\.jar://" $RPM_BUILD_ROOT/usr/bin/jitsi
+sed -i -e "s/\/usr\/share\/java\/dnsjava\.jar://" $RPM_BUILD_ROOT/usr/bin/jitsi
 sed -i -e "s/\/launchutils.jar//" $RPM_BUILD_ROOT/usr/bin/jitsi
 
 %clean
diff --git a/src/native/windows/run/run.c b/src/native/windows/run/run.c
index 7f152e9..4bae363 100644
--- a/src/native/windows/run/run.c
+++ b/src/native/windows/run/run.c
@@ -525,6 +525,7 @@ Run_getJavaVMOptionStrings
             = {

                 _T("lib\\felix.jar"),

                 _T("sc-bundles\\sc-launcher.jar"),

+                _T("sc-bundles\\dnsjava.jar"),

                 _T("sc-bundles\\util.jar"),

                 _T("lib"),

                 NULL

diff --git a/src/net/java/sip/communicator/util/util.manifest.mf b/src/net/java/sip/communicator/util/util.manifest.mf
index 7de9af7..a6e4db7 100644
--- a/src/net/java/sip/communicator/util/util.manifest.mf
+++ b/src/net/java/sip/communicator/util/util.manifest.mf
@@ -56,8 +56,7 @@ Import-Package: com.sun.awt,
  sun.awt.shell,
  sun.net.dns,
  sun.net.util
-Export-Package: org.xbill.DNS,
- net.java.sip.communicator.util,
+Export-Package: net.java.sip.communicator.util,
  net.java.sip.communicator.util.launchutils,
  net.java.sip.communicator.util.skin,
  net.java.sip.communicator.util.xml,