Merge commit 'cf5da99'HEADmaster

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

1 files changed, 65 insertions, 423 deletions

diff --git a/build.xml b/build.xml
index 5bbd81f..c43b7e8 100644
--- a/build.xml
+++ b/build.xml
@@ -11,7 +11,6 @@
     <property name="bundles.dest.mac" value="${bundles.dest}/os-specific/macosx"/>
     <property name="bundles.dest.win" value="${bundles.dest}/os-specific/windows"/>
     <property name="bundles.dest.lin" value="${bundles.dest}/os-specific/linux"/>
-    <property name="bundles.dest.sol" value="${bundles.dest}/os-specific/solaris"/>
     <property name="bundles.dest.freebsd" value="${bundles.dest}/os-specific/freebsd"/>
     <property name="bundles.dest.android" value="${bundles.dest}/os-specific/android"/>
     <property name="doc" value="doc"/>
@@ -23,8 +22,6 @@
     <property name="lib.lin.noinst" value="${lib}/os-specific/linux/installer-exclude"/>
     <property name="lib.mac" value="${lib}/os-specific/mac"/>
     <property name="lib.mac.noinst" value="${lib}/os-specific/mac/installer-exclude"/>
-    <property name="lib.sol" value="${lib}/os-specific/solaris"/>
-    <property name="lib.sol.noinst" value="${lib}/os-specific/solaris/installer-exclude"/>
     <property name="lib.freebsd" value="${lib}/os-specific/freebsd"/>
     <property name="lib.freebsd.noinst" value="${lib}/os-specific/freebsd/installer-exclude"/>
     <property name="lib.noinst" value="${lib}/installer-exclude"/>
@@ -122,31 +119,6 @@
         <isset property="is.running.linux"/>
     </condition>
 
-    <!-- solaris specific properties -->
-    <condition property="is.running.solaris" value="${os.name}">
-        <equals arg1="${os.name}" arg2="solaris" casesensitive="false" trim="true"/>
-    </condition>
-
-    <condition property="is.running.solaris" value="${os.name}">
-        <equals arg1="${os.name}" arg2="SunOS" casesensitive="false" trim="true"/>
-    </condition>
-
-    <condition property="os.lib.home" value="${lib}/os-specific/solaris">
-        <and>
-            <isset property="is.running.solaris"/>
-            <available file="${lib}/os-specific/solaris" type="dir"/>
-        </and>
-    </condition>
-
-    <condition property="ld.library.path"
-              value="${lib}/native/solaris:${system.LD_LIBRARY_PATH}">
-        <isset property="is.running.solaris"/>
-    </condition>
-
-    <condition property="bundles.dest.os" value="${bundles.dest.sol}">
-        <isset property="is.running.solaris"/>
-    </condition>
-
     <!-- mac specific properties -->
     <condition property="is.running.macos" value="${os.name}">
         <os family="mac"/>
@@ -206,10 +178,6 @@
     <!-- set the os.lib.home here in case it was not set before -->
     <property name="os.lib.home" value="${lib}"/>
 
-    <property name="profiler.args" value="" />
-    <property name="profiler.bootdelegation" value="" />
-    <property name="profiler.autostart" value="" />
-
     <tstamp>
         <format property="build.date" pattern="dd-MM-yyyy"/>
     </tstamp>
@@ -476,7 +444,7 @@
     </target>
 
     <!-- Jitsi Version -->
-    <target name="version" depends="-pre-version">
+    <target name="version" depends="bundle-bundles,-pre-version">
         <!-- Recompile ant task classes-->
         <delete failonerror="false">
             <fileset dir="${dest}" includes="net/java/sip/communicator/impl/version/*.class"/>
@@ -497,7 +465,7 @@
 
             <classpath>
                 <pathelement path="${dest}"/>
-                <pathelement location="${lib.noinst}/libjitsi-1.0-SNAPSHOT.jar"/>
+                <pathelement location="${bundles.dest}/libjitsi.jar"/>
             </classpath>
         </taskdef>
 
@@ -519,7 +487,6 @@
         <mkdir dir="${bundles.dest.lin}"/>
         <mkdir dir="${bundles.dest.win}"/>
         <mkdir dir="${bundles.dest.freebsd}"/>
-        <mkdir dir="${bundles.dest.sol}"/>
         <mkdir dir="${bundles.dest.android}"/>
 
         <mkdir dir="${test.reports.dir}"/>
@@ -673,13 +640,12 @@
              see its "Build Successful" output line as users might confuse it
              for a general build success while this might not be the case.-->
         <echo message="Generating HTML test reports ..."/>
-        <java fork="true"
-              classname="org.apache.tools.ant.launch.Launcher"
-              classpath="${java.class.path}:${lib.noinst}/xalan-2.6.0.jar.ant"
-              failonerror="true"
-              output="${test.html.reports.dir}/output.txt">
-            <arg value="htmlreport"/>
-        </java>
+        <junitreport todir="${test.reports.dir}">
+          <fileset dir="${test.reports.dir}">
+            <include name="SC-TEST-*.xml"/>
+          </fileset>
+          <report format="frames" todir="${test.html.reports.dir}"/>
+        </junitreport>
         <echo message="Done."/>
         <echo/><echo/>
         <echo message="Test results available in ./test-reports/html/index.html "/>
@@ -696,20 +662,6 @@
         <fail if="testing.failed"/>
     </target>
 
-    <!-- We use this target from within the test target in order to generate
-         a human readable test report. We do not directly use the htmlreport
-         target because we  need to include xalan in the classpath before we
-         do.-->
-    <target name="htmlreport">
-      <junitreport todir="${test.reports.dir}">
-        <fileset dir="${test.reports.dir}">
-          <include name="SC-TEST-*.xml"/>
-        </fileset>
-        <report format="frames" todir="${test.html.reports.dir}"/>
-      </junitreport>
-    </target>
-
-
     <target name="run-simple-tests"
             depends="prepare-all-tests,prepare-local-accounts,deploy-os-specific-bundles"
             description="runs selected non-felix tests under junit.">
@@ -826,20 +778,14 @@
             <!-- pass to SC args that have been specified by the user -->
             <arg line="${args}"/>
 
-            <sysproperty key="org.osgi.framework.bootdelegation"
-                         value="${profiler.bootdelegation}" />
-            <sysproperty key="felix.auto.start.68"
-                         value="${profiler.autostart}" />
-
             <jvmarg value="-Xdebug" />
             <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5432" />
 
 
-            <!-- add some eventual profiler args, prevent server-class
+            <!-- prevent server-class
                  detection because -server uses much more memory for 32-bit OS
                  (64-bit always used -server) -->
-            <jvmarg line="${profiler.args} ${jvmarg.line}
-              -client ${jvm.maxheapsize}"/>
+            <jvmarg line="${jvmarg.line} -client ${jvm.maxheapsize}"/>
 
             <sysproperty key="apple.laf.useScreenMenuBar" value="true" />
         </java>
@@ -933,93 +879,22 @@
             <!-- pass to SC args that have been specified by the user -->
             <arg line="${args}"/>
 
-            <sysproperty key="org.osgi.framework.bootdelegation"
-                value="${profiler.bootdelegation}" />
-            <sysproperty key="felix.auto.start.68"
-                value="${profiler.autostart}" />
-
-            <!-- add some eventual profiler args, prevent server-class
+            <!-- prevent server-class
                  detection because -server uses much more memory for 32-bit OS
                  (64-bit always used -server) -->
-            <jvmarg line="${profiler.args} ${jvmarg.line}
+            <jvmarg line="${jvmarg.line}
               -client ${jvm.maxheapsize} ${jvmarg.splash} ${jvmarg.aegeturl}"/>
 
             <sysproperty key="apple.laf.useScreenMenuBar" value="true" />
         </java>
     </target>
 
-    <!--RUN-JITSI-WITH-INTEGRATED-PROFILER -->
-    <target name="run-with-profiler"
-        description="Starts felix and runs sip-comunicator gui (use latest build) with the hooked classloader."
-        depends="bundle-plugin-profiler4j">
-
-        <antcall target="run">
-            <param name="profiler.args"
-                value="-Xmx128m -javaagent:${lib.noinst}/profiler4j-1.0-beta3-SC.jar" />
-            <param name="profiler.bootdelegation"
-                value="net.sf.profiler4j.agent.*" />
-            <param name="profiler.autostart"
-                value="reference:file:sc-bundles/profiler4j.jar" />
-        </antcall>
-    </target>
-
     <target name="run-v4" description="Starts SC with a preference for IPv4.">
         <ant target="run">
           <property name="java.net.preferIPv6Addresses" value="false"/>
         </ant>
     </target>
 
-    <!--PROFILE-JITSI-IN-NETBEANS-IDE -->
-    <target name="profile" depends="bundle-plugin-profiler4j,deploy-os-specific-bundles"
-        description="Profile Project">
-        <fail unless="netbeans.home">
-            This target can only run inside the NetBeans IDE.
-        </fail>
-
-        <nbprofiledirect>
-            <classpath> <pathelement location="${dest}"/> </classpath>
-        </nbprofiledirect>
-
-        <java classname="net.java.sip.communicator.launcher.SIPCommunicator"
-            fork="true"
-            failonerror="true"
-            classpathref="project.class.path">
-
-            <jvmarg value="${profiler.info.jvmargs.agent}"/>
-
-            <!-- Tell felix to run Jitsi -->
-            <sysproperty key="felix.config.properties"
-                value="file:${lib}/felix.client.run.properties"/>
-
-            <!-- Tell java.util.logging about our logging preferences -->
-            <sysproperty key="java.util.logging.config.file"
-                value="${lib}/logging.properties"/>
-
-            <sysproperty key="java.net.preferIPv6Addresses"
-                value="false"/>
-
-            <sysproperty key="net.java.sip.communicator.SC_HOME_DIR_LOCATION"
-                    value="${user.home}/schome"/>
-
-            <!-- Setting properties necessary for dependencies on native libs-->
-            <sysproperty key="java.library.path"
-                path="${ld.library.path}:${path}:${dyld.library.path}"/>
-
-            <!-- pass l10n properties from ant call for
-                     easy translation debugging -->
-            <sysproperty key="user.language" value="${user.language}" />
-            <sysproperty key="user.country" value="${user.country}" />
-            <sysproperty key="user.variant" value="${user.variant}" />
-
-            <env key="LD_LIBRARY_PATH" path="${ld.library.path}"/>
-            <env key="PATH" path="${path}"/>
-            <env key="DYLD_LIBRARY_PATH" path="${dyld.library.path}"/>
-
-        </java>
-
-        <delete file="${bundles.dest}/profiler4j.jar"/>
-    </target>
-
     <!-- we run this target before we run SC in order to copy os-specific
              bundles from sc-bundles/osname to its parent sc-bundles-->
     <target name="deploy-os-specific-bundles" if="bundles.dest.os">
@@ -1053,14 +928,13 @@
         bundle-protocol,bundle-protocol-media,bundle-icq,
         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-api,bundle-irc,bundle-irc-commands,bundle-plugin-ircaccregwizz,
-        bundle-yahoo,bundle-yahoo-slick,
+        bundle-phonenumbers,
+        bundle-irc,bundle-irc-commands,bundle-plugin-ircaccregwizz,
         bundle-contactlist,meta-contactlist,meta-contactlist-slick,
         bundle-plugin-icqaccregwizz,bundle-plugin-jabberaccregwizz,
         bundle-plugin-sipaccregwizz,
-        bundle-plugin-yahooaccregwizz,bundle-plugin-aimaccregwizz,
-        bundle-commons-codec,bundle-commons-lang,bundle-httputil,bundle-plugin-spellcheck,
+        bundle-plugin-aimaccregwizz,
+        bundle-httputil,bundle-plugin-spellcheck,
         bundle-version-impl,bundle-shutdown-timeout,bundle-windows-clean-shutdown,
         bundle-growlnotification,bundle-swingnotification,bundle-galagonotification,
         bundle-sparkle, bundle-plugin-branding,
@@ -1073,13 +947,13 @@
         bundle-plugin-blf,
         bundle-plugin-contactinfo,bundle-plugin-chatalerter, bundle-keybindings,
         bundle-plugin-keybindingChooser,bundle-plugin-globalproxyconfig,
-        bundle-jfontchooserlib,bundle-update,bundle-plugin-update,
+        bundle-update,bundle-plugin-update,
         bundle-plugin-simpleaccreg,bundle-plugin-generalconfig,
         bundle-plugin-googletalkaccregwizz,bundle-argdelegation-service,
-        bundle-argdelegation,bundle-zrtp4j,bundle-sdes4j,bundle-json,
+        bundle-argdelegation,bundle-json,
         bundle-filehistory,bundle-metahistory,bundle-metahistory-slick,
-        bundle-plugin-facebookaccregwizz,bundle-plugin-ippiaccregwizz,
-        bundle-bouncycastle,bundle-plugin-otr,bundle-plugin-iptelaccregwizz,
+        bundle-plugin-ippiaccregwizz,
+        bundle-plugin-otr,bundle-plugin-iptelaccregwizz,
         bundle-contactsource,bundle-plugin-reconnect,bundle-plugin-securityconfig,
         bundle-plugin-advancedconfig,
         bundle-credentialsstorage,bundle-credentialsstorage-slick,
@@ -1093,14 +967,47 @@
         bundle-provisioning,bundle-addrbook,bundle-plugin-ldap,
         bundle-thunderbird,
         bundle-plugin-contactsourceconfig,bundle-plugin-certconfig,
-        bundle-globalshortcut,bundle-plugin-msofficecomm,bundle-libjitsi,
+        bundle-globalshortcut,bundle-plugin-msofficecomm,
         bundle-customcontactactions, bundle-phonenumbercontactsource,
         bundle-demuxcontactsource, bundle-muc,
         bundle-desktoputil,bundle-globaldisplaydetails, 
-    	bundle-usersearch,
+        bundle-usersearch,
         bundle-plugin-propertieseditor,bundle-plugin-accountinfo,
         bundle-plugin-connectioninfo,
-        bundle-guava,bundle-hsql,bundle-slf4j"/>
+        bundle-bundles"/>
+
+    <!-- Copying of all unmodified libraries that are already bundles -->
+    <target name="bundle-bundles">
+        <copy file="${lib.noinst}/libjitsi-1.0-20170207.194207-242.jar" tofile="${bundles.dest}/libjitsi.jar"/>
+        <copy file="${lib.noinst}/fmj-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/fmj.jar"/>
+        <copy file="${lib.noinst}/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/jitsi-lgpl-dependencies.jar"/>
+        <copy file="${lib.noinst}/jitsi-gpl-dependencies-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/jitsi-gpl-dependencies.jar"/>
+        <copy file="${lib.noinst}/guava-15.0.jar" tofile="${bundles.dest}/guava.jar"/>
+        <copy file="${lib.noinst}/hsqldb.jar" tofile="${bundles.dest}/hsqldb.jar"/>
+        <copy file="${lib.noinst}/irc-api-1.0.jar" tofile="${bundles.dest}/irc-api-1.0.jar"/>
+        <copy file="${lib.noinst}/slf4j-api-1.7.5.jar" tofile="${bundles.dest}/slf4j-api.jar"/>
+        <copy file="${lib.noinst}/slf4j-jdk14-1.7.5.jar" tofile="${bundles.dest}/slf4j-jdk14.jar"/>
+        <copy file="${lib.noinst}/commons-codec-1.6.jar" tofile="${bundles.dest}/commons-codec.jar"/>
+        <copy file="${lib.noinst}/commons-lang3-3.1.jar" tofile="${bundles.dest}/commons-lang.jar"/>
+        <copy file="${lib.noinst}/httpclient-osgi-4.2.3.jar" tofile="${bundles.dest}/httpclient.jar"/>
+        <copy file="${lib.noinst}/httpcore-osgi-4.2.3.jar" tofile="${bundles.dest}/httpcore.jar"/>
+        <copy file="${lib.noinst}/sdes4j-1.1.3.jar" tofile="${bundles.dest}/sdes4j.jar"/>
+        <copy file="${lib.noinst}/bcpkix-jdk15on-1.54.jar" tofile="${bundles.dest}/bcpkix.jar"/>
+        <copy file="${lib.noinst}/bcprov-jdk15on-1.54.jar" tofile="${bundles.dest}/bouncycastle.jar"/>
+        <copy file="${lib.noinst}/bccontrib-1.0.jar" tofile="${bundles.dest}/bccontrib.jar"/>
+        <copy file="${lib.noinst}/jmork-1.0.5.jar" tofile="${bundles.dest}/jmork.jar"/>
+        <copy file="${lib.noinst}/weupnp-0.1.4.jar" tofile="${bundles.dest}/weupnp.jar"/>
+        <copy file="${lib.noinst}/ice4j-2.0-20170111.193659-7.jar" tofile="${bundles.dest}/ice4j.jar"/>
+        <copy file="${lib.noinst}/sdp-api-1.0.jar" tofile="${bundles.dest}/sdp-api.jar"/>
+        <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"/>
+        <copy file="${lib.noinst}/dnssecjava-1.1.jar" tofile="${bundles.dest}/dnssecjava.jar"/>
+        <copy file="${lib.noinst}/jna.jar" tofile="${bundles.dest}/jna.jar"/>
+        <copy file="${lib.noinst}/jna-platform.jar" tofile="${bundles.dest}/jna-platform.jar"/>
+        <copy file="${lib.noinst}/zrtp4j-light-4.1.0-jitsi-1-SNAPSHOT.jar" tofile="${bundles.dest}/zrtp4j.jar"/>
+    </target>
 
     <!--BUNDLE-SC-LAUNCHER-->
     <target name="bundle-sc-launcher">
@@ -1223,7 +1130,9 @@
             <zipfileset dir="${dest}/net/java/sip/communicator/util"
                 prefix="net/java/sip/communicator/util">
             </zipfileset>
-            <zipfileset src="${lib.noinst}/dnsjava.jar" prefix=""/>
+            <service
+                type="sun.net.spi.nameservice.NameServiceDescriptor"
+                provider="net.java.sip.communicator.util.JitsiDnsNameServiceDescriptor"/>
         </jar>
     </target>
 
@@ -1308,18 +1217,9 @@
         </jar>
     </target>
 
-    <!--BUNDLE-LIBJITSI -->
-    <target name="bundle-libjitsi">
-        <copy file="${lib.noinst}/libjitsi-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/libjitsi.jar"/>
-        <copy file="${lib.noinst}/fmj-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/fmj.jar"/>
-        <copy file="${lib.noinst}/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/jitsi-lgpl-dependencies.jar"/>
-        <copy file="${lib.noinst}/bcpkix-jdk15on-151.jar" tofile="${bundles.dest}/bcpkix.jar"/>
-    </target>
-
     <!--BUNDLE-NEOMEDIA-->
     <target name="bundle-neomedia">
-        <!-- Creates a bundle containing the impl of the neomedia package and
-            FMJ. -->
+        <!-- Creates a bundle containing the impl of the neomedia package -->
         <jar
             compress="false"
             destfile="${bundles.dest}/neomedia.jar"
@@ -1423,14 +1323,6 @@
         </jar>
     </target>
 
-    <target name="bundle-guava">
-        <copy file="${lib.noinst}/guava-15.0.jar" tofile="${bundles.dest}/guava.jar"/>
-    </target>
-
-    <target name="bundle-hsql">
-        <copy file="${lib.noinst}/hsqldb.jar" tofile="${bundles.dest}/hsqldb.jar"/>
-    </target>
-
     <!--BUNDLE-SERVICEBINDER -->
     <target name="bundle-servicebinder">
         <jar compress="true" destfile="lib/bundle/servicebinder.jar"
@@ -1460,9 +1352,7 @@ javax.swing.event, javax.swing.border"/>
     </target>
 
     <!-- BUNDLE-NETADDR -->
-    <target name="bundle-netaddr"
-            depends="bundle-netaddr-dynamically,bundle-netaddr-statically" />
-    <target name="bundle-netaddr-dynamically" if="dynamic.linking">
+    <target name="bundle-netaddr">
         <jar compress="false" destfile="${bundles.dest}/netaddr.jar"
                 manifest="${src}/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf">
             <zipfileset dir="${dest}/net/java/sip/communicator/service/netaddr"
@@ -1471,17 +1361,6 @@ javax.swing.event, javax.swing.border"/>
                     prefix="net/java/sip/communicator/impl/netaddr" />
         </jar>
     </target>
-    <target name="bundle-netaddr-statically" unless="dynamic.linking">
-        <jar compress="false" destfile="${bundles.dest}/netaddr.jar"
-                manifest="${src}/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf">
-            <zipfileset dir="${dest}/net/java/sip/communicator/service/netaddr"
-                    prefix="net/java/sip/communicator/service/netaddr" />
-            <zipfileset dir="${dest}/net/java/sip/communicator/impl/netaddr"
-                    prefix="net/java/sip/communicator/impl/netaddr" />
-            <zipfileset src="${lib.noinst}/ice4j.jar" prefix="" />
-            <zipfileset src="${lib.noinst}/weupnp-0.1.2-SNAPSHOT.jar" prefix="" />
-        </jar>
-    </target>
 
     <!--BUNDLE-NETADDR-SLICK -->
     <target name="bundle-netaddr-slick">
@@ -1519,9 +1398,6 @@ javax.swing.event, javax.swing.border"/>
             manifest="${src}/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf">
             <zipfileset dir="${dest}/net/java/sip/communicator/impl/protocol/sip"
                 prefix="net/java/sip/communicator/impl/protocol/sip"/>
-            <zipfileset src="${lib.noinst}/jain-sip-ri.jar" prefix=""/>
-            <zipfileset src="${lib.noinst}/jain-sip-api.jar" prefix=""/>
-            <zipfileset src="${lib.noinst}/jain-sdp.jar" prefix=""/>
         </jar>
     </target>
 
@@ -1549,9 +1425,7 @@ javax.swing.event, javax.swing.border"/>
                 prefix="resources/images">
                 <include name="protocol/icq/**/*"/>
                 <include name="protocol/googletalk/**/*"/>
-                <include name="protocol/facebook/**/*"/>
                 <include name="protocol/jabber/**/*"/>
-                <include name="protocol/yahoo/**/*"/>
                 <!-- the media package lives in the protocol-media bundle -->
                 <exclude name="protocol/media/**/*"/>
             </zipfileset>
@@ -1599,17 +1473,6 @@ javax.swing.event, javax.swing.border"/>
         </jar>
     </target>
 
-    <target name="bundle-jnalib">
-        <!-- Creates a bundle containing the win jna implementation.-->
-        <jar
-            compress="false" destfile="${bundles.dest}/jnalib.jar"
-            manifest="${lib.noinst}/jna.manifest.mf">
-
-            <zipfileset src="${lib.noinst}/jna.jar" prefix=""/>
-            <zipfileset src="${lib.noinst}/jna-platform.jar" prefix=""/>
-        </jar>
-    </target>
-
     <!-- BUNDLE-ICQ -->
     <target name="bundle-icq">
         <!-- Creates a bundle containing the icq impl of the protocol provider.-->
@@ -1673,51 +1536,6 @@ javax.swing.event, javax.swing.border"/>
         </jar>
     </target>
 
-    <!-- BUNDLE-SSH -->
-    <target name="bundle-ssh">
-        <!-- Creates a bundle containing the SSH impl of the protocol provider.-->
-        <jar compress="false" destfile="${bundles.dest}/protocol-ssh.jar"
-            manifest="${src}/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf">
-            <zipfileset dir="${dest}/net/java/sip/communicator/impl/protocol/ssh"
-                prefix="net/java/sip/communicator/impl/protocol/ssh"/>
-            <zipfileset src="${lib.noinst}/jsch-0.1.36.jar" prefix=""/>
-        </jar>
-    </target>
-
-    <!-- BUNDLE-PLUGIN-SSHACCREGWIZZ -->
-    <target name="bundle-plugin-sshaccregwizz">
-        <!-- Creates a bundle for the plugin SSH Account Registration Wizard.-->
-        <jar compress="false" destfile="${bundles.dest}/sshaccregwizz.jar"
-            manifest="${src}/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf">
-            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/sshaccregwizz"
-                prefix="net/java/sip/communicator/plugin/sshaccregwizz"/>
-        </jar>
-    </target>
-
-    <!-- BUNDLE-YAHOO -->
-    <target name="bundle-yahoo">
-        <!-- Creates a bundle containing the yahoo impl of the protocol provider.-->
-        <jar compress="false" destfile="${bundles.dest}/protocol-yahoo.jar"
-            manifest="${src}/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf">
-            <zipfileset dir="${dest}/net/java/sip/communicator/impl/protocol/yahoo"
-                prefix="net/java/sip/communicator/impl/protocol/yahoo"/>
-            <zipfileset src="${lib.noinst}/ymsg_network_v0_67.jar" prefix=""/>
-        </jar>
-    </target>
-
-    <!-- BUNDLE-YAHOO-SLICK -->
-    <!-- Creates a bundle containing the slick for the Yahoo protocol provider.-->
-    <target name="bundle-yahoo-slick">
-        <jar compress="false" destfile="${bundles.dest}/protocol-yahoo-slick.jar"
-            manifest="${testsrc}/net/java/sip/communicator/slick/protocol/yahoo/yahoo.provider.slick.manifest.mf">
-            <zipfileset dir="${dest}/net/java/sip/communicator/slick/protocol/yahoo"
-                prefix="net/java/sip/communicator/slick/protocol/yahoo"/>
-            <zipfileset src="${lib.noinst}/ymsg_network_v0_67.jar" prefix=""/>
-            <zipfileset dir="${dest}/net/java/sip/communicator/slick/protocol/generic"
-                prefix="net/java/sip/communicator/slick/protocol/generic"/>
-        </jar>
-    </target>
-
     <!-- BUNDLE-GIBBERISH -->
     <target name="bundle-gibberish">
         <!-- Creates a bundle containing the Gibberish impl of the protocol provider.-->
@@ -1753,13 +1571,12 @@ javax.swing.event, javax.swing.border"/>
     </target>
 
     <!-- BUNDLE-SWING-UI -->
-    <target name="bundle-swing-ui" depends="bundle-commons-lang">
+    <target name="bundle-swing-ui">
         <!-- Bundle Jitsi's UI.-->
         <jar compress="false" destfile="${bundles.dest}/swing-ui.jar"
             manifest="${src}/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf">
             <zipfileset dir="${dest}/net/java/sip/communicator/impl/gui"
                 prefix="net/java/sip/communicator/impl/gui"/>
-            <zipfileset src="${lib.noinst}/swing-worker-1.2.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/mac_widgets-0.9.5.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/forms-1.2.1.jar" prefix=""/>
         </jar>
@@ -1835,16 +1652,6 @@ javax.swing.event, javax.swing.border"/>
         </jar>
     </target>
 
-    <!-- BUNDLE-PLUGIN-YAHOOACCREGWIZZ -->
-    <target name="bundle-plugin-yahooaccregwizz">
-        <!-- Creates a bundle for the plugin Yahoo Account Registration Wizard.-->
-        <jar compress="false" destfile="${bundles.dest}/yahooaccregwizz.jar"
-            manifest="${src}/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf">
-            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/yahooaccregwizz"
-                prefix="net/java/sip/communicator/plugin/yahooaccregwizz"/>
-        </jar>
-    </target>
-
     <!-- BUNDLE-PLUGIN-SIPACCREGWIZZ -->
     <target name="bundle-plugin-sipaccregwizz">
         <!-- Creates a bundle for the plugin SIP Account Registration Wizard.-->
@@ -1865,16 +1672,6 @@ javax.swing.event, javax.swing.border"/>
         </jar>
     </target>
 
-    <!-- BUNDLE-PLUGIN-SIP2SIPACCREGWIZZ -->
-    <target name="bundle-plugin-sip2sipaccregwizz">
-        <!-- Creates a bundle for the plugin Sip2Sip Account Registration Wizard.-->
-        <jar compress="false" destfile="${bundles.dest}/sip2sipaccregwizz.jar"
-            manifest="${src}/net/java/sip/communicator/plugin/sip2sipaccregwizz/sip2sipaccregwizz.manifest.mf">
-            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/sip2sipaccregwizz"
-                prefix="net/java/sip/communicator/plugin/sip2sipaccregwizz"/>
-        </jar>
-    </target>
-
     <!-- BUNDLE-PLUGIN-IPPIACCREGWIZZ -->
     <target name="bundle-plugin-ippiaccregwizz">
         <!-- Creates a bundle for the plugin ippi Account Registration Wizard.-->
@@ -1896,17 +1693,6 @@ javax.swing.event, javax.swing.border"/>
         </jar>
     </target>
 
-    <!-- BUNDLE-PLUGIN-FACEBOOKACCREGWIZZ -->
-    <target name="bundle-plugin-facebookaccregwizz">
-        <!-- Creates a bundle for the plugin Facebook Account Registration
-             Wizard.-->
-        <jar compress="false" destfile="${bundles.dest}/facebookaccregwizz.jar"
-                manifest="${src}/net/java/sip/communicator/plugin/facebookaccregwizz/facebookaccregwizz.manifest.mf">
-            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/facebookaccregwizz"
-                    prefix="net/java/sip/communicator/plugin/facebookaccregwizz" />
-        </jar>
-    </target>
-
     <!-- BUNDLE-SERVICEIMPL-VERSION -->
     <target name="bundle-version-impl">
         <!-- Creates a bundle for the version service impl.-->
@@ -2074,28 +1860,8 @@ javax.swing.event, javax.swing.border"/>
         </jar>
     </target>
 
-    <!-- BUNDLE-ZEROCONF -->
-    <target name="bundle-zeroconf">
-        <!-- Creates a bundle containing the Zeroconf impl of the protocol provider.-->
-        <jar compress="false" destfile="${bundles.dest}/protocol-zeroconf.jar"
-            manifest="${src}/net/java/sip/communicator/impl/protocol/zeroconf/zeroconf.provider.manifest.mf">
-            <zipfileset dir="${dest}/net/java/sip/communicator/impl/protocol/zeroconf"
-                prefix="net/java/sip/communicator/impl/protocol/zeroconf"/>
-        </jar>
-    </target>
-
-    <!-- BUNDLE-PLUGIN-ZEROCONFACCREGWIZZ -->
-    <target name="bundle-plugin-zeroconfaccregwizz">
-        <!-- Creates a bundle for the plugin Zeroconf Account Registration Wizard.-->
-        <jar compress="false" destfile="${bundles.dest}/zeroconfaccregwizz.jar"
-            manifest="${src}/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf">
-            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/zeroconfaccregwizz"
-                prefix="net/java/sip/communicator/plugin/zeroconfaccregwizz"/>
-        </jar>
-    </target>
-
     <!-- BUNDLE-IRC -->
-    <target name="bundle-irc" depends="bundle-irc-api">
+    <target name="bundle-irc">
         <!-- 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">
@@ -2114,17 +1880,6 @@ javax.swing.event, javax.swing.border"/>
         </jar>
     </target>
 
-    <!-- BUNDLE IRC-API -->
-    <target name="bundle-irc-api" depends="bundle-slf4j">
-        <copy file="${lib.noinst}/irc-api-1.0.jar" tofile="${bundles.dest}/irc-api-1.0.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-jdk14-1.7.5.jar" tofile="${bundles.dest}/slf4j-jdk14.jar"/>
-    </target>
-
     <!-- BUNDLE-PLUGIN-IRCACCREGWIZZ -->
     <target name="bundle-plugin-ircaccregwizz">
             <!-- Creates a bundle for the plugin IRC Account Registration
@@ -2136,18 +1891,6 @@ javax.swing.event, javax.swing.border"/>
             </jar>
     </target>
 
-    <!--BUNDLE-COMMONS-CODEC -->
-    <target name="bundle-commons-codec">
-        <copy file="${lib.noinst}/commons-codec-1.6.jar"
-            tofile="${bundles.dest}/commons-codec.jar"/>
-    </target>
-
-    <!--BUNDLE-COMMONS-LANG -->
-    <target name="bundle-commons-lang">
-        <copy file="${lib.noinst}/commons-lang3-3.1.jar"
-            tofile="${bundles.dest}/commons-lang.jar"/>
-    </target>
-
     <!--BUNDLE-HTTPUTIL -->
     <target name="bundle-httputil">
         <!-- Create the httputil.jar-->
@@ -2156,11 +1899,6 @@ javax.swing.event, javax.swing.border"/>
             <zipfileset dir="${dest}/net/java/sip/communicator/service/httputil"
                 prefix="net/java/sip/communicator/service/httputil"/>
         </jar>
-
-        <copy file="${lib.noinst}/httpclient-osgi-4.2.3.jar"
-            tofile="${bundles.dest}/httpclient.jar"/>
-        <copy file="${lib.noinst}/httpcore-osgi-4.2.3.jar"
-            tofile="${bundles.dest}/httpcore.jar"/>
     </target>
 
     <!-- BUNDLE-NOTIFICATION -->
@@ -2184,7 +1922,7 @@ javax.swing.event, javax.swing.border"/>
     </target>
 
     <!-- BUNDLE-NOTIFICATION-WIRING -->
-    <target name="bundle-notification-wiring" depends="bundle-commons-lang">
+    <target name="bundle-notification-wiring">
         <!-- Creates a bundle for the notifications.-->
         <jar compress="false" destfile="${bundles.dest}/notification-wiring.jar"
             manifest="${src}/net/java/sip/communicator/plugin/notificationwiring/notificationwiring.manifest.mf">
@@ -2253,27 +1991,6 @@ javax.swing.event, javax.swing.border"/>
         </jar>
     </target>
 
-    <!-- BUNDLE-DICT -->
-    <target name="bundle-dict">
-        <jar compress="false" destfile="${bundles.dest}/protocol-dict.jar"
-             manifest="${src}/net/java/sip/communicator/impl/protocol/dict/dict.provider.manifest.mf">
-            <zipfileset dir="${dest}/net/java/sip/communicator/impl/protocol/dict"
-                    prefix="net/java/sip/communicator/impl/protocol/dict"/>
-            <zipfileset src="${lib.noinst}/dict4j.jar" prefix=""/>
-        </jar>
-    </target>
-
-    <!-- BUNDLE-PLUGIN-DICTACCREGWIZZ -->
-    <target name="bundle-plugin-dictaccregwizz">
-        <!-- Creates a bundle for the plugin Dict Account Registration
-             Wizard.-->
-       <jar compress="false" destfile="${bundles.dest}/dictaccregwizz.jar"
-            manifest="${src}/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf">
-            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/dictaccregwizz"
-                prefix="net/java/sip/communicator/plugin/dictaccregwizz"/>
-        </jar>
-    </target>
-
     <!-- BUNDLE-UPDATE-->
     <target name="bundle-update">
         <!-- Creates a bundle containing the provisioning discovery service.-->
@@ -2293,21 +2010,6 @@ javax.swing.event, javax.swing.border"/>
         </jar>
     </target>
 
-   <!--BUNDLE-PLUGIN-PROFILER-->
-   <target name="bundle-plugin-profiler4j">
-        <jar compress="false" destfile="${bundles.dest}/profiler4j.jar"
-            manifest="${src}/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf">
-            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/profiler4j"
-                prefix="net/java/sip/communicator/plugin/profiler4j" />
-            <zipfileset src="${lib.noinst}/profiler4j-1.0-beta3-SC.jar"
-                prefix=""/>
-            <zipfileset src="${lib.noinst}/jdom.jar" prefix=""/>
-            <zipfileset src="${lib.noinst}/jcommon-1.0.0.jar" prefix=""/>
-            <zipfileset src="${lib.noinst}/jfreechart-1.0.1.jar" prefix=""/>
-            <fileset file="${lib.noinst}/p4j-exclusions.txt"/>
-        </jar>
-    </target>
-
     <!--BUNDLE-SimpleAccRegPlugin-->
     <target name="bundle-plugin-simpleaccreg">
         <jar compress="false" destfile="${bundles.dest}/simpleaccreg.jar"
@@ -2425,15 +2127,6 @@ javax.swing.event, javax.swing.border"/>
         </jar>
     </target>
 
-    <!-- BUNDLE-JFontChooser -->
-    <target name="bundle-jfontchooserlib">
-        <!-- Creates a bundle containing the jfontchooser lib.-->
-        <jar compress="false" destfile="${bundles.dest}/jfontchooserlib.jar"
-            manifest="${lib.noinst}/jfontchooser.manifest.mf">
-            <zipfileset src="${lib.noinst}/jfontchooser-1.0.5.jar" prefix=""/>
-        </jar>
-    </target>
-
     <!-- BUNDLE Arg Delegation Service -->
     <target name="bundle-argdelegation-service">
         <!-- Creates a bundle for the notifications.-->
@@ -2454,51 +2147,6 @@ javax.swing.event, javax.swing.border"/>
         </jar>
     </target>
 
-    <!--BUNDLE-ZRTP4J -->
-    <target name="bundle-zrtp4j">
-        <jar compress="true" destfile="${bundles.dest}/zrtp4j.jar"
-            filesetmanifest="merge">
-
-            <zipfileset src="${lib.noinst}/zrtp4j-light.jar" prefix=""/>
-            <manifest>
-                <attribute name="Export-Package" value="gnu.java.zrtp,
-gnu.java.zrtp.packets,
-gnu.java.zrtp.utils,
-gnu.java.zrtp.zidfile"/>
-                <attribute name="Import-Package" value="org.bouncycastle.asn1,
-org.bouncycastle.asn1.nist,
-org.bouncycastle.asn1.sec,
-org.bouncycastle.asn1.x9,
-org.bouncycastle.crypto,
-org.bouncycastle.crypto.agreement,
-org.bouncycastle.crypto.digests,
-org.bouncycastle.crypto.engines,
-org.bouncycastle.crypto.generators,
-org.bouncycastle.crypto.macs,
-org.bouncycastle.crypto.modes,
-org.bouncycastle.crypto.params,
-org.bouncycastle.crypto.prng,
-org.jitsi.bccontrib.digests,
-org.jitsi.bccontrib.engines,
-org.jitsi.bccontrib.macs,
-org.jitsi.bccontrib.params,
-org.jitsi.bccontrib.prng,
-org.bouncycastle.math.ec,
-org.bouncycastle.util.encoders,
-org.bouncycastle.util"/>
-                <attribute name="Bundle-Name" value="ZRTP4J"/>
-                <attribute name="Bundle-Description" value="ZRTP for Java library."/>
-                <attribute name="Bundle-Version" value="1.4.5"/>
-                <attribute name="Bundle-SymbolicName" value="gnu.java.zrtp4j"/>
-            </manifest>
-        </jar>
-    </target>
-
-    <!--BUNDLE-SDES4J -->
-    <target name="bundle-sdes4j">
-    	<copy file="${lib.noinst}/sdes4j-1.1.3.jar" tofile="${bundles.dest}/sdes4j.jar"/>
-    </target>
-
     <!--BUNDLE-JSON -->
     <target name="bundle-json">
         <jar compress="true" destfile="${bundles.dest}/json.jar"
@@ -2534,12 +2182,6 @@ org.bouncycastle.util"/>
         </jar>
     </target>
 
-    <!--BUNDLE-BOUNCYCASTLE -->
-    <target name="bundle-bouncycastle">
-        <copy file="${lib.noinst}/bcprov-jdk15on-151.jar" tofile="${bundles.dest}/bouncycastle.jar"/>
-        <copy file="${lib.noinst}/bccontrib-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/bccontrib.jar"/>
-    </target>
-
     <!--BUNDLE-PLUGIN-OTR -->
     <target name="bundle-plugin-otr">
         <jar compress="false" destfile="${bundles.dest}/otr.jar" manifest="${src}/net/java/sip/communicator/plugin/otr/otr.manifest.mf">
@@ -2548,6 +2190,7 @@ org.bouncycastle.util"/>
             <zipfileset src="${lib.noinst}/otr4j.jar"/>
         </jar>
     </target>
+
     <!--BUNDLE-METAHISTORY-SLICK-->
     <target name="bundle-metahistory-slick">
         <jar compress="false" destfile="${bundles.dest}/metahistory-slick.jar"
@@ -2833,7 +2476,6 @@ org.bouncycastle.util"/>
             <zipfileset dir="${dest}/net/java/sip/communicator/plugin/thunderbird"
                 prefix="net/java/sip/communicator/plugin/thunderbird" />
         </jar>
-        <copy file="${lib.noinst}/jmork-1.0.5-SNAPSHOT.jar" tofile="${bundles.dest}/jmork.jar"/>
     </target>
 
     <target name="bundle-certificate">