/hg/icedtea-web: Fix RH669942: Add support for packEnabled and v...
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Thu Feb 10 14:29:48 PST 2011
changeset 0768433ea58d in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=0768433ea58d
author: Omair Majid <omajid at redhat.com>
date: Thu Feb 10 17:25:18 2011 -0500
Fix RH669942: Add support for packEnabled and versionEnabled
This changeset adds support for explicitly using jars with pack200
compression and versioning. This requires no server side support,
but expects the client to try and find the right jar and fallback to
using uncompressed/unversioned jars if the versioned/compressed ones
can not be found.
2011-02-10 Omair Majid <omajid at redhat.com>
Fix RH669942; Add support for packEnabled and versionEnabled.
* NEWS: Update with bugfix.
* netx/net/sourceforge/jnlp/DownloadOptions.java: New file.
* netx/net/sourceforge/jnlp/JNLPFile.java (openURL): Use null for
DownloadOptions. (getResourceDescs): New method.
(getResourceDescs(Locale,String,String)): New method.
* netx/net/sourceforge/jnlp/Launcher.java (launchApplication): Add
image to downloader with null DownloadOptions.
* netx/net/sourceforge/jnlp/cache/CacheUtil.java
(getCachedResource): Add resource with null DownloadOptions.
* netx/net/sourceforge/jnlp/cache/Resource.java: Add new field
downloadLocation. (Resource): Initialize downloadLocation.
(getDownloadLocation): New method. (setDownloadLocation): New
method.
* netx/net/sourceforge/jnlp/cache/ResourceTracker.java: Add new field
downloadOptions. (addResource(URL,Version,UpdatePolicy)):
Renamed to...
(addResource(URL,Version,DownloadOptions,UpdatePolicy)): New method.
(downloadResource): Add support for explicit downloading of packed
jars as well as content-encoded packed jars.
(initializeResource): Invokde findBestUrl to find the best url. Set
that as the download location for the resource.
(getVersionedResourceURL): Remove. (findBestUrl): New method.
Use ResourceUrlCreator to get a list of all possible urls that
can be used to download this resource. Try them one by one until
one works and return that.
* netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java: New file.
* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
(initializeResources): Add resource with appropriate download
options. (activateJars): Likewise. (loadClass): Likewise.
(getDownloadOptionsForJar): New method.
diffstat:
10 files changed, 431 insertions(+), 59 deletions(-)
ChangeLog | 37 +++
NEWS | 1
netx/net/sourceforge/jnlp/DownloadOptions.java | 64 +++++
netx/net/sourceforge/jnlp/JNLPFile.java | 29 ++
netx/net/sourceforge/jnlp/Launcher.java | 2
netx/net/sourceforge/jnlp/cache/CacheUtil.java | 2
netx/net/sourceforge/jnlp/cache/Resource.java | 22 ++
netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 142 ++++++++-----
netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java | 163 +++++++++++++++
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 28 ++
diffs (truncated from 706 to 500 lines):
diff -r c4054514c102 -r 0768433ea58d ChangeLog
--- a/ChangeLog Thu Feb 10 11:19:53 2011 -0500
+++ b/ChangeLog Thu Feb 10 17:25:18 2011 -0500
@@ -1,3 +1,40 @@ 2011-02-10 Deepak Bhole <dbhole at redhat.
+2011-02-10 Omair Majid <omajid at redhat.com>
+
+ Fix RH669942; Add support for packEnabled and versionEnabled.
+ * NEWS: Update with bugfix.
+ * netx/net/sourceforge/jnlp/DownloadOptions.java: New file.
+ * netx/net/sourceforge/jnlp/JNLPFile.java
+ (openURL): Use null for DownloadOptions.
+ (getResourceDescs): New method.
+ (getResourceDescs(Locale,String,String)): New method.
+ * netx/net/sourceforge/jnlp/Launcher.java
+ (launchApplication): Add image to downloader with null DownloadOptions.
+ * netx/net/sourceforge/jnlp/cache/CacheUtil.java
+ (getCachedResource): Add resource with null DownloadOptions.
+ * netx/net/sourceforge/jnlp/cache/Resource.java: Add new field
+ downloadLocation.
+ (Resource): Initialize downloadLocation.
+ (getDownloadLocation): New method.
+ (setDownloadLocation): New method.
+ * netx/net/sourceforge/jnlp/cache/ResourceTracker.java: Add new field
+ downloadOptions.
+ (addResource(URL,Version,UpdatePolicy)): Renamed to...
+ (addResource(URL,Version,DownloadOptions,UpdatePolicy)): New method.
+ (downloadResource): Add support for explicit downloading of packed jars as
+ well as content-encoded packed jars.
+ (initializeResource): Invokde findBestUrl to find the best url. Set that
+ as the download location for the resource.
+ (getVersionedResourceURL): Remove.
+ (findBestUrl): New method. Use ResourceUrlCreator to get a list of all
+ possible urls that can be used to download this resource. Try them one by
+ one until one works and return that.
+ * netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java: New file.
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+ (initializeResources): Add resource with appropriate download options.
+ (activateJars): Likewise.
+ (loadClass): Likewise.
+ (getDownloadOptionsForJar): New method.
+
2011-02-10 Deepak Bhole <dbhole at redhat.com>
* netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java (initialize):
diff -r c4054514c102 -r 0768433ea58d NEWS
--- a/NEWS Thu Feb 10 11:19:53 2011 -0500
+++ b/NEWS Thu Feb 10 17:25:18 2011 -0500
@@ -11,6 +11,7 @@ New in release 1.1 (2011-XX-XX):
New in release 1.1 (2011-XX-XX):
* NetX
- Use Firefox's proxy settings if possible
+ - RH669942: javaws fails to download version/packed files (missing support for jnlp.packEnabled and jnlp.versionEnabled)
New in release 1.0 (2010-XX-XX):
diff -r c4054514c102 -r 0768433ea58d netx/net/sourceforge/jnlp/DownloadOptions.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/DownloadOptions.java Thu Feb 10 17:25:18 2011 -0500
@@ -0,0 +1,64 @@
+/* DownloadOptions.java
+ Copyright (C) 2011 Red Hat, Inc
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+package net.sourceforge.jnlp;
+
+public class DownloadOptions {
+
+ private final boolean usePack200;
+ private final boolean useVersion;
+
+ public DownloadOptions(boolean usePack, boolean useVersion) {
+ this.usePack200 = usePack;
+ this.useVersion = useVersion;
+ }
+
+ public boolean useExplicitPack() {
+ return usePack200;
+ }
+
+ public boolean useExplicitVersion() {
+ return useVersion;
+ }
+
+ @Override
+ public String toString() {
+ return "DownloadOptions[use pack: " + usePack200 + "; use version: " +
+ useVersion + "]";
+ }
+
+}
diff -r c4054514c102 -r 0768433ea58d netx/net/sourceforge/jnlp/JNLPFile.java
--- a/netx/net/sourceforge/jnlp/JNLPFile.java Thu Feb 10 11:19:53 2011 -0500
+++ b/netx/net/sourceforge/jnlp/JNLPFile.java Thu Feb 10 17:25:18 2011 -0500
@@ -248,7 +248,7 @@ public class JNLPFile {
try {
ResourceTracker tracker = new ResourceTracker(false); // no prefetch
- tracker.addResource(location, version, policy);
+ tracker.addResource(location, version, null, policy);
return tracker.getInputStream(location);
} catch (Exception ex) {
@@ -362,7 +362,7 @@ public class JNLPFile {
}
/**
- * Returns the information section of the JNLP file for the
+ * Returns the resources section of the JNLP file for the
* specified locale, os, and arch.
*/
public ResourcesDesc getResources(final Locale locale, final String os, final String arch) {
@@ -389,6 +389,31 @@ public class JNLPFile {
sharedResources.addResource(resource);
}
};
+ }
+
+ /**
+ * Returns the resources section of the JNLP file as viewed
+ * through the default locale and the os.name and os.arch
+ * properties.
+ */
+ public ResourcesDesc[] getResourceDescs() {
+ return getResourceDescs(defaultLocale, defaultOS, defaultArch);
+ }
+
+ /**
+ * Returns the resources section of the JNLP file for the
+ * specified locale, os, and arch.
+ */
+ public ResourcesDesc[] getResourceDescs(final Locale locale, final String os, final String arch) {
+ List<ResourcesDesc> matchingResources = new ArrayList<ResourcesDesc>();
+ for (ResourcesDesc rescDesc: resources) {
+ if (localMatches(locale, rescDesc.getLocales())
+ && stringMatches(os, rescDesc.getOS())
+ && stringMatches(arch, rescDesc.getArch())) {
+ matchingResources.add(rescDesc);
+ }
+ }
+ return matchingResources.toArray(new ResourcesDesc[0]);
}
/**
diff -r c4054514c102 -r 0768433ea58d netx/net/sourceforge/jnlp/Launcher.java
--- a/netx/net/sourceforge/jnlp/Launcher.java Thu Feb 10 11:19:53 2011 -0500
+++ b/netx/net/sourceforge/jnlp/Launcher.java Thu Feb 10 17:25:18 2011 -0500
@@ -417,7 +417,7 @@ public class Launcher {
IconDesc.SPLASH, preferredWidth, preferredHeight);
if (splashImageURL != null) {
ResourceTracker resourceTracker = new ResourceTracker(true);
- resourceTracker.addResource(splashImageURL, file.getFileVersion(), updatePolicy);
+ resourceTracker.addResource(splashImageURL, file.getFileVersion(), null, updatePolicy);
splashScreen = new JNLPSplashScreen(resourceTracker, null, null);
splashScreen.setSplashImageURL(splashImageURL);
if (splashScreen.isSplashScreenValid()) {
diff -r c4054514c102 -r 0768433ea58d netx/net/sourceforge/jnlp/cache/CacheUtil.java
--- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java Thu Feb 10 11:19:53 2011 -0500
+++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java Thu Feb 10 17:25:18 2011 -0500
@@ -76,7 +76,7 @@ public class CacheUtil {
*/
public static URL getCachedResource(URL location, Version version, UpdatePolicy policy) {
ResourceTracker rt = new ResourceTracker();
- rt.addResource(location, version, policy);
+ rt.addResource(location, version, null, policy);
try {
File f = rt.getCacheFile(location);
// TODO: Should be toURI().toURL()
diff -r c4054514c102 -r 0768433ea58d netx/net/sourceforge/jnlp/cache/Resource.java
--- a/netx/net/sourceforge/jnlp/cache/Resource.java Thu Feb 10 11:19:53 2011 -0500
+++ b/netx/net/sourceforge/jnlp/cache/Resource.java Thu Feb 10 17:25:18 2011 -0500
@@ -67,6 +67,9 @@ public class Resource {
/** the remote location of the resource */
URL location;
+ /** the location to use when downloading */
+ private URL downloadLocation;
+
/** the local file downloaded to */
File localFile;
@@ -96,6 +99,7 @@ public class Resource {
*/
private Resource(URL location, Version requestVersion, UpdatePolicy updatePolicy) {
this.location = location;
+ this.downloadLocation = location;
this.requestVersion = requestVersion;
this.updatePolicy = updatePolicy;
}
@@ -127,6 +131,24 @@ public class Resource {
*/
public URL getLocation() {
return location;
+ }
+
+ /**
+ * Returns the URL to use for downloading the resource. This can be
+ * different from the original location since it may use a different
+ * file name to support versioning and compression
+ * @return the url to use when downloading
+ */
+ public URL getDownloadLocation() {
+ return downloadLocation;
+ }
+
+ /**
+ * Set the url to use for downloading the resource
+ * @param location
+ */
+ public void setDownloadLocation(URL location) {
+ downloadLocation = location;
}
/**
diff -r c4054514c102 -r 0768433ea58d netx/net/sourceforge/jnlp/cache/ResourceTracker.java
--- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Thu Feb 10 11:19:53 2011 -0500
+++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Thu Feb 10 17:25:18 2011 -0500
@@ -29,12 +29,15 @@ import java.net.URL;
import java.net.URL;
import java.net.URLConnection;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.jar.JarOutputStream;
import java.util.jar.Pack200;
import java.util.jar.Pack200.Unpacker;
import java.util.zip.GZIPInputStream;
+import net.sourceforge.jnlp.DownloadOptions;
import net.sourceforge.jnlp.Version;
import net.sourceforge.jnlp.event.DownloadEvent;
import net.sourceforge.jnlp.event.DownloadListener;
@@ -117,6 +120,9 @@ public class ResourceTracker {
/** resources requested to be downloaded */
private static ArrayList<Resource> queue = new ArrayList<Resource>();
+ private static Map<Resource, DownloadOptions> downloadOptions =
+ new HashMap<Resource, DownloadOptions>();
+
/** resource trackers threads are working for (used for load balancing across multi-tracker downloads) */
private static ArrayList<ResourceTracker> active =
new ArrayList<ResourceTracker>(); //
@@ -163,7 +169,7 @@ public class ResourceTracker {
* @param version the resource version
* @param updatePolicy whether to check for updates if already in cache
*/
- public void addResource(URL location, Version version, UpdatePolicy updatePolicy) {
+ public void addResource(URL location, Version version, DownloadOptions options, UpdatePolicy updatePolicy) {
if (location == null)
throw new IllegalArgumentException("location==null");
@@ -176,6 +182,11 @@ public class ResourceTracker {
resource.addTracker(this);
resources.add(resource);
}
+
+ if (options == null) {
+ options = new DownloadOptions(false, false);
+ }
+ downloadOptions.put(resource, options);
// checkCache may take a while (loads properties file). this
// should really be synchronized on resources, but the worst
@@ -621,7 +632,8 @@ public class ResourceTracker {
try {
// create out second in case in does not exist
- URLConnection con = getVersionedResourceURL(resource).openConnection();
+ URL realLocation = resource.getDownloadLocation();
+ URLConnection con = realLocation.openConnection();
con.addRequestProperty("Accept-Encoding", "pack200-gzip, gzip");
con.connect();
@@ -636,16 +648,16 @@ public class ResourceTracker {
String contentEncoding = con.getContentEncoding();
if (JNLPRuntime.isDebug()) {
- System.err.println("Content encoding for " + resource.location + ": "
- + contentEncoding);
+ System.err.println("Downloading" + resource.location + " using " +
+ realLocation + " (encoding : " + contentEncoding + ")");
+
}
- if (contentEncoding != null) {
- if (contentEncoding.equals("gzip")) {
- downloadLocation = new URL(downloadLocation.toString() + ".gz");
- } else if (contentEncoding.equals("pack200-gzip")) {
- downloadLocation = new URL(downloadLocation.toString() + ".pack.gz");
- }
+ if ("gzip".equals(contentEncoding)) {
+ downloadLocation = new URL(downloadLocation.toString() + ".gz");
+ } else if ("pack200-gzip".equals(contentEncoding) ||
+ realLocation.getPath().endsWith(".pack.gz")) {
+ downloadLocation = new URL(downloadLocation.toString() + ".pack.gz");
}
InputStream in = new BufferedInputStream(con.getInputStream());
@@ -668,40 +680,41 @@ public class ResourceTracker {
/*
* If the file was compressed, uncompress it.
*/
- if (contentEncoding != null) {
- if (contentEncoding.equals("gzip")) {
- GZIPInputStream gzInputStream = new GZIPInputStream(new FileInputStream(CacheUtil
- .getCacheFile(downloadLocation, resource.downloadVersion)));
- InputStream inputStream = new BufferedInputStream(gzInputStream);
- BufferedOutputStream outputStream = new BufferedOutputStream(
- new FileOutputStream(CacheUtil.getCacheFile(resource.location,
- resource.downloadVersion)));
+ if ("gzip".equals(contentEncoding)) {
+ GZIPInputStream gzInputStream = new GZIPInputStream(new FileInputStream(CacheUtil
+ .getCacheFile(downloadLocation, resource.downloadVersion)));
+ InputStream inputStream = new BufferedInputStream(gzInputStream);
- while (-1 != (rlen = inputStream.read(buf))) {
- outputStream.write(buf, 0, rlen);
- }
+ BufferedOutputStream outputStream = new BufferedOutputStream(
+ new FileOutputStream(CacheUtil.getCacheFile(resource.location,
+ resource.downloadVersion)));
- outputStream.close();
- inputStream.close();
- gzInputStream.close();
+ while (-1 != (rlen = inputStream.read(buf))) {
+ outputStream.write(buf, 0, rlen);
+ }
- } else if (contentEncoding.equals("pack200-gzip")) {
- GZIPInputStream gzInputStream = new GZIPInputStream(new FileInputStream(
- CacheUtil.getCacheFile(downloadLocation, resource.downloadVersion)));
- InputStream inputStream = new BufferedInputStream(gzInputStream);
+ outputStream.close();
+ inputStream.close();
+ gzInputStream.close();
- JarOutputStream outputStream = new JarOutputStream(new FileOutputStream(
- CacheUtil.getCacheFile(resource.location, resource.downloadVersion)));
+ } else if ("pack200-gzip".equals(contentEncoding) ||
+ realLocation.getPath().endsWith(".pack.gz")) {
+ GZIPInputStream gzInputStream = new GZIPInputStream(new FileInputStream(
+ CacheUtil.getCacheFile(downloadLocation, resource.downloadVersion)));
+ InputStream inputStream = new BufferedInputStream(gzInputStream);
- Unpacker unpacker = Pack200.newUnpacker();
- unpacker.unpack(inputStream, outputStream);
+ JarOutputStream outputStream = new JarOutputStream(new FileOutputStream(
+ CacheUtil.getCacheFile(resource.location, resource.downloadVersion)));
- outputStream.close();
- inputStream.close();
- gzInputStream.close();
- }
+ Unpacker unpacker = Pack200.newUnpacker();
+ unpacker.unpack(inputStream, outputStream);
+
+ outputStream.close();
+ inputStream.close();
+ gzInputStream.close();
}
+
resource.changeStatus(DOWNLOADING, DOWNLOADED);
synchronized (lock) {
@@ -731,7 +744,9 @@ public class ResourceTracker {
File localFile = CacheUtil.getCacheFile(resource.location, resource.downloadVersion);
// connect
- URLConnection connection = getVersionedResourceURL(resource).openConnection(); // this won't change so should be okay unsynchronized
+ URL finalLocation = findBestUrl(resource);
+ resource.setDownloadLocation(finalLocation);
+ URLConnection connection = finalLocation.openConnection(); // this won't change so should be okay unsynchronized
connection.addRequestProperty("Accept-Encoding", "pack200-gzip, gzip");
int size = connection.getContentLength();
@@ -777,27 +792,46 @@ public class ResourceTracker {
}
/**
- * Returns the versioned url for a resource
- * @param resource the resource to get the url for
+ * Returns the best URL to use for downloading the resource
+ *
+ * @param resource the resource
+ * @return a URL or null
*/
- private URL getVersionedResourceURL(Resource resource) {
- String actualLocation = resource.location.getProtocol() + "://"
- + resource.location.getHost();
- if (resource.location.getPort() != -1) {
- actualLocation += ":" + resource.location.getPort();
+ private URL findBestUrl(Resource resource) {
+ DownloadOptions options = downloadOptions.get(resource);
+ if (options == null) {
+ options = new DownloadOptions(false, false);
}
- actualLocation += resource.location.getPath();
- if (resource.requestVersion != null
- && resource.requestVersion.isVersionId()) {
- actualLocation += "?version-id=" + resource.requestVersion;
+
+ List<URL> urls = new ResourceUrlCreator(resource, options).getUrls();
+ if (JNLPRuntime.isDebug()) {
+ System.err.println("All possible urls for " +
+ resource.toString() + " : " + urls);
}
- URL versionedURL;
- try {
- versionedURL = new URL(actualLocation);
- } catch (MalformedURLException e) {
- return resource.location;
+ URL bestUrl = null;
+ for (int i = 0; i < urls.size(); i++) {
+ URL url = urls.get(i);
+ try {
+ URLConnection connection = url.openConnection();
+ connection.addRequestProperty("Accept-Encoding", "pack200-gzip, gzip");
+ if (connection instanceof HttpURLConnection) {
+ HttpURLConnection con = (HttpURLConnection)connection;
+ int responseCode = con.getResponseCode();
+ if (responseCode == -1 || responseCode < 200 || responseCode >= 300) {
+ continue;
+ }
+ }
+ if (JNLPRuntime.isDebug()) {
+ System.err.println("best url for " + resource.toString() + " is " + url.toString());
+ }
+ bestUrl = url;
+ break;
+ } catch (IOException e) {
+ // continue
+ }
}
- return versionedURL;
+
+ return bestUrl;
}
/**
diff -r c4054514c102 -r 0768433ea58d netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java Thu Feb 10 17:25:18 2011 -0500
@@ -0,0 +1,163 @@
+/* ResourceUrlCreator.java
+ Copyright (C) 2011 Red Hat, Inc
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
More information about the distro-pkg-dev
mailing list