diff options
| author | Damian Minkov <damencho@jitsi.org> | 2013-05-18 11:49:26 +0300 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2013-05-18 12:08:35 +0300 |
| commit | e35e4a7974d3949500b7d94625d9a08394fa94d8 (patch) | |
| tree | 7a949ba03912bcf6dbadc26492cf52f44ab4db5a /build.xml | |
| parent | 76631ca877852bc446283d1b4073ff2615127781 (diff) | |
| download | jitsi-e35e4a7974d3949500b7d94625d9a08394fa94d8.zip jitsi-e35e4a7974d3949500b7d94625d9a08394fa94d8.tar.gz jitsi-e35e4a7974d3949500b7d94625d9a08394fa94d8.tar.bz2 | |
Creates authenticate windows service that will create the dialog and will show it to user used with different impl on android and desktop.
Expose some common functionality in httputil and reuse it in xcap implementation in sip provider.
Wraps sslSocketFactory to use the constructor that is common for android and desktop httpclient lib.
Creates separate bundle for httpclient libs in order to separate it from httputil bundle which will be used in android.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 37 |
1 files changed, 19 insertions, 18 deletions
@@ -921,7 +921,8 @@ bundle-plugin-icqaccregwizz,bundle-plugin-jabberaccregwizz, bundle-plugin-msnaccregwizz,bundle-plugin-sipaccregwizz, bundle-plugin-yahooaccregwizz,bundle-plugin-aimaccregwizz, - bundle-commons-codec,bundle-httputil,bundle-plugin-spellcheck, + bundle-commons-codec,bundle-commons-logging, + 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, @@ -1964,20 +1965,8 @@ javax.swing.event, javax.swing.border"/> <!--BUNDLE-COMMONS-LOGGING --> <target name="bundle-commons-logging"> - <jar compress="true" destfile="lib/bundle/commons-logging.jar" - filesetmanifest="merge"> - <zipfileset src="${lib.noinst}/commons-logging-1.1.1.jar" - prefix=""/> - <manifest> - <attribute name="Export-Package" - value="org.apache.commons.logging"/> - <attribute name="Bundle-Name" - value="Apache Commons Logging"/> - <attribute name="Bundle-Description" - value="An ultra-thin bridge between different logging implementations."/> - <attribute name="System-Bundle" value="yes"/> - </manifest> - </jar> + <copy file="${lib.noinst}/commons-logging-1.1.2.jar" + tofile="${bundles.dest}/commons-logging.jar"/> </target> <!--BUNDLE-COMMONS-CODEC --> @@ -1999,9 +1988,21 @@ javax.swing.event, javax.swing.border"/> manifest="${src}/net/java/sip/communicator/service/httputil/httputil.manifest.mf"> <zipfileset dir="${dest}/net/java/sip/communicator/service/httputil" prefix="net/java/sip/communicator/service/httputil"/> - <zipfileset src="${lib.noinst}/httpclient-osgi-4.2.3.jar" prefix=""/> - <zipfileset src="${lib.noinst}/httpcore-osgi-4.2.3.jar" prefix=""/> </jar> + <!-- + Re-packaging into new bundle as original having wrong paths in osgi + bundle manifest and getting exceptions + 'No paths specified in header' while loading + --> + <jar + compress="false" destfile="${bundles.dest}/httpclient.jar" + manifest="${lib.noinst}/httpclient.manifest.mf"> + <zipfileset src="${lib.noinst}/httpclient-osgi-4.2.3.jar" + prefix=""/> + <zipfileset src="${lib.noinst}/httpcore-osgi-4.2.3.jar" + prefix=""/> + </jar> + </target> <!-- BUNDLE-NOTIFICATION --> @@ -2369,7 +2370,7 @@ javax.swing.event, javax.swing.border"/> <!--BUNDLE-BOUNCYCASTLE --> <target name="bundle-bouncycastle"> <copy file="${lib.noinst}/bcprov-jdk15on-148.jar" tofile="${bundles.dest}/bouncycastle.jar"/> - <copy file="${lib.noinst}/bccontrib-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/bccontrib.jar"/> + <copy file="${lib.noinst}/bccontrib-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/bccontrib.jar"/> </target> <!--BUNDLE-PLUGIN-OTR --> |