[icedtea-web] RFC: remove version check when parsing jnlp files

[Deepak Bhole]

* Omair Majid <omajid at redhat.com> [2010-12-08 10:44]:
> Hi,
> 
> The attached patch removes the explicit check for jnlp spec version
> when parsing a JNLP file.
> 
> A number of JNLP files that I have come across contain invalid spec
> number - the only valid spec numbers that I know of are 1.0, 1.5 and
> 6.0 (and updates). If Netx encounters a spec number that it does not
> recognize, it current fails by throwing a ParseException. Over the
> years, more and more spec numbers were added as "supported" in order
> to be compatible with JNLP files that were perfectly valid but
> contained an invalid spec number. With this patch, I am removing
> this check: Netx will attempt to run all JNLP files without looking
> at the spec number.
> 
> This patch is for HEAD only.
> 

OK for HEAD.

Cheers,
Deepak

> ChangeLog:
> 2010-12-08  Omair Majid  <omajid at redhat.com>
> 
>     * netx/net/sourceforge/jnlp/JNLPFile.java
>     (getSupportedVersions): Removed.
>     * netx/net/sourceforge/jnlp/Parser.java: Remove supportedVersions.
>     (Parser(JNLPFile,URL,Node,boolean,boolean)): Remove check for
>     supported version.
>     (getSupportedVersions): Remove method.
>     * netx/net/sourceforge/jnlp/resources/Messages.properties:
>     Remove PSpecUnsupported.
> 
> Any thoughts or comments?
> 
> Cheers,
> Omair

> diff -r a5fbac599561 netx/net/sourceforge/jnlp/JNLPFile.java
> --- a/netx/net/sourceforge/jnlp/JNLPFile.java	Wed Dec 08 08:45:51 2010 -0500
> +++ b/netx/net/sourceforge/jnlp/JNLPFile.java	Wed Dec 08 10:33:59 2010 -0500
> @@ -257,13 +257,6 @@
>      }
>  
>      /**
> -     * Returns the JNLP specification versions supported.
> -     */
> -    public static Version getSupportedVersions() {
> -        return Parser.getSupportedVersions();
> -    }
> -
> -    /**
>       * Returns the JNLP file's title.  This method returns the same
>       * value as InformationDesc.getTitle().
>       */
> diff -r a5fbac599561 netx/net/sourceforge/jnlp/Parser.java
> --- a/netx/net/sourceforge/jnlp/Parser.java	Wed Dec 08 08:45:51 2010 -0500
> +++ b/netx/net/sourceforge/jnlp/Parser.java	Wed Dec 08 10:33:59 2010 -0500
> @@ -65,9 +65,6 @@
>      };
>      */
>  
> -    /** the supported JNLP file versions */
> -    private static Version supportedVersions = new Version("1.0 1.1 1.2 1.3 1.4 1.5 1.6 6.0");
> -
>      // fix: some descriptors need to use the jnlp file at a later
>      // date and having file ref lets us pass it to their
>      // constructors
> @@ -128,22 +125,11 @@
>          this.base = (codebase != null) ? codebase : base; // if codebase not specified use default codebase
>          fileLocation = getURL(root, "href", this.base);
>  
> -        // ensure version is supported
> -        if (!supportedVersions.matchesAny(spec))
> -            throw new ParseException(R("PSpecUnsupported", supportedVersions));
> -
>          // normalize the text nodes
>          root.normalize();
>      }
>  
>      /**
> -     * Return the JNLP specification versions supported.
> -     */
> -    public static Version getSupportedVersions() {
> -        return supportedVersions;
> -    }
> -
> -    /**
>       * Returns the file version.
>       */
>      public Version getFileVersion() {
> diff -r a5fbac599561 netx/net/sourceforge/jnlp/resources/Messages.properties
> --- a/netx/net/sourceforge/jnlp/resources/Messages.properties	Wed Dec 08 08:45:51 2010 -0500
> +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties	Wed Dec 08 10:33:59 2010 -0500
> @@ -87,7 +87,6 @@
>  
>  # Parser
>  PInvalidRoot=Root node is not a jnlp node
> -PSpecUnsupported=Spec version not supported (supports {0})
>  PNoResources=No resources section defined
>  PUntrustedNative=nativelib element cannot be specified unless a trusted environment is requested.
>  PExtensionHasJ2SE=j2se element cannot be specified in a component extension file.