[jitsi-dev] [jitsi] Webstart dp (#48)


#1

You can merge this Pull Request by running:

  git pull https://github.com/dpocock/jitsi webstart-dp

Or you can view, comment on it, or merge it online at:

  https://github.com/jitsi/jitsi/pull/48

-- Commit Summary --

  * Ensure directories are created before ant-ext compile
  * Use Java 1.6 for compiling sc-launcher
  * Add support for a chained main class, for running a second app in the same JVM
  * Add attributes to manifests: Permissions, Codebase, Application-Name
  * Improve JAR signing: enforce pack/sign/compress order with depends, sign with both SHA-1 and SHA-256
  * Add attributes to manifests of third party JARs: Permissions, Codebase, Application-Name
  * Add attributes to manifests of JNLP and native JARs: Permissions, Codebase, Application-Name
  * Add jitsi-default*.properties into JNLP
  * JNLP file: add more Linux arch names
  * Handle the javaws command line arguments

-- File Changes --

    M build.xml (7)
    M lib/installer-exclude/bcprov.manifest.mf (3)
    M lib/installer-exclude/commons-lang3-3.1.manifest.mf (3)
    M lib/installer-exclude/httpclient.manifest.mf (3)
    M lib/installer-exclude/jfontchooser.manifest.mf (3)
    M lib/installer-exclude/jmdns.manifest.mf (3)
    M lib/installer-exclude/jna.manifest.mf (3)
    M lib/installer-exclude/smack.manifest.mf (3)
    M src/net/java/sip/communicator/impl/argdelegation/argdelegation.manifest.mf (3)
    M src/net/java/sip/communicator/impl/browserlauncher/browserlauncher.manifest.mf (3)
    M src/net/java/sip/communicator/impl/callhistory/callhistory.manifest.mf (3)
    M src/net/java/sip/communicator/impl/certificate/certificate.manifest.mf (3)
    M src/net/java/sip/communicator/impl/configuration/configuration.manifest.mf (3)
    M src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf (3)
    M src/net/java/sip/communicator/impl/credentialsstorage/credentialsstorage.manifest.mf (3)
    M src/net/java/sip/communicator/impl/dns/dns.manifest.mf (3)
    M src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf (3)
    M src/net/java/sip/communicator/impl/filehistory/filehistory.manifest.mf (3)
    M src/net/java/sip/communicator/impl/galagonotification/galagonotification.manifest.mf (3)
    M src/net/java/sip/communicator/impl/globaldisplaydetails/globaldisplaydetails.manifest.mf (3)
    M src/net/java/sip/communicator/impl/globalshortcut/globalshortcut.manifest.mf (3)
    M src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf (3)
    M src/net/java/sip/communicator/impl/growlnotification/growlnotification.manifest.mf (3)
    M src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf (3)
    M src/net/java/sip/communicator/impl/hid/hid.manifest.mf (3)
    M src/net/java/sip/communicator/impl/history/history.manifest.mf (3)
    M src/net/java/sip/communicator/impl/keybindings/keybindings.manifest.mf (3)
    M src/net/java/sip/communicator/impl/ldap/ldap.manifest.mf (3)
    M src/net/java/sip/communicator/impl/libjitsi/libjitsi.manifest.mf (3)
    M src/net/java/sip/communicator/impl/metahistory/metahistory.manifest.mf (3)
    M src/net/java/sip/communicator/impl/msghistory/msghistory.manifest.mf (3)
    M src/net/java/sip/communicator/impl/muc/muc.manifest.mf (3)
    M src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf (3)
    M src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf (3)
    M src/net/java/sip/communicator/impl/notification/notification.manifest.mf (3)
    M src/net/java/sip/communicator/impl/osdependent/osdependent.manifest.mf (3)
    M src/net/java/sip/communicator/impl/packetlogging/packetlogging.manifest.mf (3)
    M src/net/java/sip/communicator/impl/phonenumbers/phonenumbers.manifest.mf (3)
    M src/net/java/sip/communicator/impl/protocol/dict/dict.provider.manifest.mf (3)
    M src/net/java/sip/communicator/impl/protocol/gibberish/gibberish.provider.manifest.mf (3)
    M src/net/java/sip/communicator/impl/protocol/icq/icq.provider.manifest.mf (3)
    M src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf (3)
    M src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf (3)
    M src/net/java/sip/communicator/impl/protocol/mock/mock.provider.manifest.mf (3)
    M src/net/java/sip/communicator/impl/protocol/msn/msn.provider.manifest.mf (3)
    M src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf (3)
    M src/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf (3)
    M src/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf (3)
    M src/net/java/sip/communicator/impl/protocol/zeroconf/zeroconf.provider.manifest.mf (3)
    M src/net/java/sip/communicator/impl/provdisc/dhcp/dhcp.provdisc.manifest.mf (3)
    M src/net/java/sip/communicator/impl/provdisc/mdns/mdns.provdisc.manifest.mf (3)
    M src/net/java/sip/communicator/impl/replacement/bliptv/bliptv.source.manifest.mf (3)
    M src/net/java/sip/communicator/impl/replacement/dailymotion/dailymotion.source.manifest.mf (3)
    M src/net/java/sip/communicator/impl/replacement/directimage/directimage.source.manifest.mf (3)
    M src/net/java/sip/communicator/impl/replacement/flickr/flickr.source.manifest.mf (3)
    M src/net/java/sip/communicator/impl/replacement/hulu/hulu.source.manifest.mf (3)
    M src/net/java/sip/communicator/impl/replacement/metacafe/metacafe.source.manifest.mf (3)
    M src/net/java/sip/communicator/impl/replacement/smiley/smiley.source.manifest.mf (3)
    M src/net/java/sip/communicator/impl/replacement/twitpic/twitpic.source.manifest.mf (3)
    M src/net/java/sip/communicator/impl/replacement/vbox7/vbox7.source.manifest.mf (3)
    M src/net/java/sip/communicator/impl/replacement/viddler/viddler.source.manifest.mf (3)
    M src/net/java/sip/communicator/impl/replacement/vimeo/vimeo.source.manifest.mf (3)
    M src/net/java/sip/communicator/impl/replacement/youtube/youtube.source.manifest.mf (3)
    M src/net/java/sip/communicator/impl/resources/resourcemanagement.manifest.mf (3)
    M src/net/java/sip/communicator/impl/shutdowntimeout/shutdown.timeout.manifest.mf (3)
    M src/net/java/sip/communicator/impl/sparkle/sparkle.manifest.mf (3)
    M src/net/java/sip/communicator/impl/splashscreen/splashscreen.manifest.mf (3)
    M src/net/java/sip/communicator/impl/swingnotification/swingnotification.manifest.mf (3)
    M src/net/java/sip/communicator/impl/sysactivity/sysactivity.impl.manifest.mf (3)
    M src/net/java/sip/communicator/impl/version/version.impl.manifest.mf (3)
    M src/net/java/sip/communicator/launcher/SIPCommunicatorJWS.java (69)
    M src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/addrbook/addrbook.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/advancedconfig/advancedconfig.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/branding/branding.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/certconfig/certconfig.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/chatalerter/chatalerter.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/chatconfig/chatconfig.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/connectioninfo/connectioninfo.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/contactsourceconfig/contactsourceconfig.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/defaultresourcepack/defaultresourcepack.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/demuxcontactsource/demuxcontactsource.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/desktoputil/desktoputil.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/dnsconfig/dnsconfig.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/facebookaccregwizz/facebookaccregwizz.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/globalproxyconfig/globalproxyconfig.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/ippiaccregwizz/ippiaccregwizz.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/iptelaccregwizz/iptelaccregwizz.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/ldap/ldap.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/loggingutils/loggingutils.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/msofficecomm/msofficecomm.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/nimbuzzavatars/nimbuzzavatars.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/notificationwiring/notificationwiring.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/otr/otr.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/phonenumbercontactsource/phonenumbercontactsource.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/pluginmanager/pluginmanager.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/propertieseditor/propertieseditor.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/provisioning/provisioning.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/reconnectplugin/reconnectplugin.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/securityconfig/securityconfig.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/simpleaccreg/simpleaccreg.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/sip2sipaccregwizz/sip2sipaccregwizz.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/skinmanager/skinmanager.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/skinresourcepack/skinresourcepack.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/spellcheck/spellCheck.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/thunderbird/thunderbird.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/update/update.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/usersearch/usersearch.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/windowscleanshutdown/cleanshutdown.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf (3)
    M src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf (3)
    M src/net/java/sip/communicator/service/argdelegation/argdelegation.manifest.mf (3)
    M src/net/java/sip/communicator/service/contacteventhandler/contact.event.handler.manifest.mf (3)
    M src/net/java/sip/communicator/service/contactlist/contactlist.manifest.mf (3)
    M src/net/java/sip/communicator/service/contactsource/contactsource.manifest.mf (3)
    M src/net/java/sip/communicator/service/customavatar/customavatar.manifest.mf (3)
    M src/net/java/sip/communicator/service/customcontactactions/customcontactactions.manifest.mf (3)
    M src/net/java/sip/communicator/service/dns/dns.manifest.mf (3)
    M src/net/java/sip/communicator/service/googlecontacts/googlecontacts.manifest.mf (3)
    M src/net/java/sip/communicator/service/gui/gui.manifest.mf (3)
    M src/net/java/sip/communicator/service/hid/hid.manifest.mf (3)
    M src/net/java/sip/communicator/service/httputil/httputil.manifest.mf (3)
    M src/net/java/sip/communicator/service/ldap/ldap.manifest.mf (3)
    M src/net/java/sip/communicator/service/notification/notification.manifest.mf (3)
    M src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf (3)
    M src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf (3)
    M src/net/java/sip/communicator/service/provdisc/provdisc.manifest.mf (3)
    M src/net/java/sip/communicator/service/replacement/replacement.manifest.mf (3)
    M src/net/java/sip/communicator/service/systray/systray.manifest.mf (3)
    M src/net/java/sip/communicator/service/update/update.manifest.mf (3)
    M src/net/java/sip/communicator/util/util.manifest.mf (3)
    M test/junit/junit.manifest.mf (3)
    M test/net/java/sip/communicator/slick/callhistory/callhistory.slick.manifest.mf (3)
    M test/net/java/sip/communicator/slick/configuration/configuration.slick.manifest.mf (3)
    M test/net/java/sip/communicator/slick/contactlist/meta.cl.slick.manifest.mf (3)
    M test/net/java/sip/communicator/slick/credentialsstorage/credentialsstorage.slick.manifest.mf (3)
    M test/net/java/sip/communicator/slick/fileaccess/fileaccess.slick.manifest.mf (3)
    M test/net/java/sip/communicator/slick/history/history.slick.manifest.mf (3)
    M test/net/java/sip/communicator/slick/metahistory/metahistory.slick.manifest.mf (3)
    M test/net/java/sip/communicator/slick/msghistory/msghistory.slick.manifest.mf (3)
    M test/net/java/sip/communicator/slick/netaddr/netaddr.slick.manifest.mf (3)
    M test/net/java/sip/communicator/slick/popupmessagehandler/popupmessagehandler.slick.manifest.mf (3)
    M test/net/java/sip/communicator/slick/protocol/gibberish/gibberish.provider.slick.manifest.mf (3)
    M test/net/java/sip/communicator/slick/protocol/icq/icq.provider.slick.manifest.mf (3)
    M test/net/java/sip/communicator/slick/protocol/jabber/jabber.provider.slick.manifest.mf (3)
    M test/net/java/sip/communicator/slick/protocol/msn/msn.provider.slick.manifest.mf (3)
    M test/net/java/sip/communicator/slick/protocol/sip/sip.provider.slick.manifest.mf (3)
    M test/net/java/sip/communicator/slick/protocol/yahoo/yahoo.provider.slick.manifest.mf (3)
    M test/net/java/sip/communicator/slick/runner/slick-runner.manifest.mf (3)
    M test/net/java/sip/communicator/slick/slickless/slickless.manifest.mf (3)
    M test/net/java/sip/communicator/slick/version/version.slick.manifest.mf (3)
    M web-start/WebStartBuild.xml (65)
    M web-start/client.jnlp_template (16)

-- Patch Links --

https://github.com/jitsi/jitsi/pull/48.patch
https://github.com/jitsi/jitsi/pull/48.diff

···

---
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/jitsi/pull/48


#2

Why are these manifest changes necessary? Is that because of some weird new webstart security changes in recent JREs?

If they are really required, can't they be inserted into all jars by webstart-build? The section in the webstart build to add the properties to some jars is also too repetitive.

···

---
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/jitsi/pull/48#issuecomment-51503780


#3

Yes, the newer JREs give more warnings or disable some functionality if these manifest attributes are not present.

Can you please identify or cherry-pick the commits you are happy with?

Can you give an example of what should be changed in the other commits?

···

---
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/jitsi/pull/48#issuecomment-51506515


#4

I cannot cherry-pick currently, only merging with the Github button, sorry.
Okay: dfe0cbf, 3ef5bcd, bc123bc, cc87ccf, 765dbdb, 9a00370

···

---
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/jitsi/pull/48#issuecomment-52034482


#5

Closed #48.

···

---
Reply to this email directly or view it on GitHub:
https://github.com/jitsi/jitsi/pull/48#event-159020862