RFC: Netx/Plugin - Add support for pack200 and gzip compression

[Deepak Bhole]

* Omair Majid <omajid at redhat.com> [2009-07-09 14:34]:
> Hi,
>
> The attached patch adds support for pack200 and gzip compression to Netx  
>  and plugin.
>
> ChangeLog:
> 2009-07-09  Omair Majid  <omajid at redhat.com>
>
>   * rt/net/sourceforge/jnlp/cache/ResourceTracker.java
>   (downloadResource): Accept and download content with pack200 or gzip
>   compression and uncompress it on the fly.
>   (initializeResource): Accept content with pack200 or gzip compression.
>   (getVersionedResourceURL): Add javadoc.
>
> Any comments?
>
> Cheers,
> Omair

Already reviewed this patch attachment to the bug. Looks good to me.

Deepak

> diff -r bb7ad7d43804 rt/net/sourceforge/jnlp/cache/ResourceTracker.java
> --- a/rt/net/sourceforge/jnlp/cache/ResourceTracker.java	Thu Jul 09 12:49:11 2009 +0200
> +++ b/rt/net/sourceforge/jnlp/cache/ResourceTracker.java	Thu Jul 09 14:02:35 2009 -0400
> @@ -17,14 +17,30 @@
>  
>  package net.sourceforge.jnlp.cache;
>  
> -import java.io.*;
> -import java.net.*;
> -import java.util.*;
> +import java.io.BufferedInputStream;
> +import java.io.BufferedOutputStream;
> +import java.io.File;
> +import java.io.FileInputStream;
> +import java.io.FileOutputStream;
> +import java.io.IOException;
> +import java.io.InputStream;
> +import java.io.OutputStream;
> +import java.net.HttpURLConnection;
> +import java.net.MalformedURLException;
> +import java.net.URL;
> +import java.net.URLConnection;
> +import java.util.ArrayList;
> +import java.util.List;
> +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.*;
> -import net.sourceforge.jnlp.event.*;
> -import net.sourceforge.jnlp.runtime.*;
> -import net.sourceforge.jnlp.util.*;
> +import net.sourceforge.jnlp.Version;
> +import net.sourceforge.jnlp.event.DownloadEvent;
> +import net.sourceforge.jnlp.event.DownloadListener;
> +import net.sourceforge.jnlp.runtime.JNLPRuntime;
> +import net.sourceforge.jnlp.util.WeakList;
>  
>  /**
>   * This class tracks the downloading of various resources of a
> @@ -598,7 +614,9 @@
>      }
>  
>      /**
> -     * Downloads an resource to a file.
> +     * Downloads a resource to a file, uncompressing it if required
> +     * 
> +     * @param resource the resource to download
>       */
>      private void downloadResource(Resource resource) {
>          resource.fireDownloadEvent(); // fire DOWNLOADING
> @@ -606,12 +624,37 @@
>          try {
>              // create out second in case in does not exist
>              URLConnection con = getVersionedResourceURL(resource).openConnection();
> +            con.addRequestProperty("Accept-Encoding", "pack200-gzip, gzip");
>              
>              if (resource.getCookieStr() != null && resource.getCookieStr().length() > 0)
>                  con.setRequestProperty("Cookie", resource.getCookieStr());
>  
> +            con.connect();
> +
> +            /*
> +             * We dont really know what we are downloading. If we ask for
> +             * foo.jar, the server might send us foo.jar.pack.gz or foo.jar.gz
> +             * instead. So we save the file with the appropriate extension
> +             */
> +            URL downloadLocation = resource.location;
> +
> +            String contentEncoding = con.getContentEncoding();
> +            
> +            if (JNLPRuntime.isDebug()) {
> +                    System.err.println("Content encoding for " + resource.location + ": "
> +                            + 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");
> +                }
> +            }
> +            
>              InputStream in = new BufferedInputStream(con.getInputStream());
> -            OutputStream out = CacheUtil.getOutputStream(resource.location, resource.downloadVersion);
> +            OutputStream out = CacheUtil.getOutputStream(downloadLocation, resource.downloadVersion);
>              byte buf[] = new byte[1024];
>              int rlen;
>  
> @@ -626,7 +669,45 @@
>              // explicitly close the URLConnection.
>              if (con instanceof HttpURLConnection)
>                  ((HttpURLConnection)con).disconnect();
> +            
> +            /*
> +             * 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)));
> +
> +                    while (-1 != (rlen = inputStream.read(buf))) {
> +                        outputStream.write(buf, 0, rlen);
> +                    }
> +
> +                    outputStream.close();
> +                    inputStream.close();
> +                    gzInputStream.close();
> +                    
> +                } else if (contentEncoding.equals("pack200-gzip")) {
> +                    GZIPInputStream gzInputStream = new GZIPInputStream(new FileInputStream(
> +                            CacheUtil.getCacheFile(downloadLocation, resource.downloadVersion)));
> +                    InputStream inputStream = new BufferedInputStream(gzInputStream);
> +
> +                    JarOutputStream outputStream = new JarOutputStream(new FileOutputStream(
> +                            CacheUtil.getCacheFile(resource.location, resource.downloadVersion)));
> +
> +                    Unpacker unpacker = Pack200.newUnpacker();
> +                    unpacker.unpack(inputStream, outputStream);
> +
> +                    outputStream.close();
> +                    inputStream.close();
> +                    gzInputStream.close();
> +                }
> +            }
> +            
>              resource.changeStatus(DOWNLOADING, DOWNLOADED);
>              synchronized(lock) {
>                  lock.notifyAll(); // wake up wait's to check for completion
> @@ -657,6 +738,7 @@
>  
>              // connect
>              URLConnection connection = getVersionedResourceURL(resource).openConnection(); // this won't change so should be okay unsynchronized
> +            connection.addRequestProperty("Accept-Encoding", "pack200-gzip, gzip");
>              
>              if (resource.getCookieStr() != null && resource.getCookieStr().length() > 0)
>                  connection.setRequestProperty("Cookie", resource.getCookieStr());
> @@ -704,8 +786,10 @@
>          }
>      }
>  
> -    
> - 
> +    /**
> +     * Returns the versioned url for a resource
> +     * @param resource the resource to get the url for 
> +     */
>      private URL getVersionedResourceURL(Resource resource) {
>          String actualLocation = resource.location.getProtocol() + "://"
>                  + resource.location.getHost();