OpenJDK / bsd-port / jdk9 / jdk
changeset 3868:c43811a602a8
7028490: better suggestion for jarsigner when TSA is not accessible
Reviewed-by: mullan
| author | weijun |
|---|---|
| date | Wed, 23 Mar 2011 18:26:58 +0800 |
| parents | fe232d7e4ff1 |
| children | b58572df94f1 b8259e08543b |
| files | src/share/classes/sun/security/tools/JarSigner.java src/share/classes/sun/security/tools/JarSignerResources.java |
| diffstat | 2 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/security/tools/JarSigner.java Tue Mar 22 18:56:16 2011 -0400 +++ b/src/share/classes/sun/security/tools/JarSigner.java Wed Mar 23 18:26:58 2011 +0800 @@ -1238,10 +1238,13 @@ // Provide a helpful message when TSA is beyond a firewall error(rb.getString("unable.to.sign.jar.") + rb.getString("no.response.from.the.Timestamping.Authority.") + - rb.getString("When.connecting.from.behind.a.firewall.then.an.HTTP.proxy.may.need.to.be.specified.") + + rb.getString("When.connecting.from.behind.a.firewall.an.HTTP.or.HTTPS.proxy.may.need.to.be.specified.") + rb.getString("Supply.the.following.options.to.jarsigner.") + - "\n -J-Dhttp.proxyHost=<hostname> " + - "\n -J-Dhttp.proxyPort=<portnumber> ", e); + "\n -J-Dhttp.proxyHost=<hostname>" + + "\n -J-Dhttp.proxyPort=<portnumber>\n" + + rb.getString("or") + + "\n -J-Dhttps.proxyHost=<hostname> " + + "\n -J-Dhttps.proxyPort=<portnumber> ", e); } sfFilename = sf.getMetaName();
--- a/src/share/classes/sun/security/tools/JarSignerResources.java Tue Mar 22 18:56:16 2011 -0400 +++ b/src/share/classes/sun/security/tools/JarSignerResources.java Wed Mar 23 18:26:58 2011 +0800 @@ -182,10 +182,11 @@ {"TSA.certificate.", "TSA certificate: "}, {"no.response.from.the.Timestamping.Authority.", "no response from the Timestamping Authority. "}, - {"When.connecting.from.behind.a.firewall.then.an.HTTP.proxy.may.need.to.be.specified.", - "When connecting from behind a firewall then an HTTP proxy may need to be specified. "}, + {"When.connecting.from.behind.a.firewall.an.HTTP.or.HTTPS.proxy.may.need.to.be.specified.", + "When connecting from behind a firewall an HTTP or HTTPS proxy may need to be specified. "}, {"Supply.the.following.options.to.jarsigner.", "Supply the following options to jarsigner: "}, + {"or", "or"}, {"Certificate.not.found.for.alias.alias.must.reference.a.valid.KeyStore.entry.containing.an.X.509.public.key.certificate.for.the", "Certificate not found for: {0}. {1} must reference a valid KeyStore entry containing an X.509 public key certificate for the Timestamping Authority."}, {"using.an.alternative.signing.mechanism",