RFC: Netx - Use version based download protocol for JNLP files
Deepak Bhole
dbhole at redhat.com
Mon Jul 13 11:07:48 PDT 2009
* Omair Majid <omajid at redhat.com> [2009-07-10 11:51]:
> Hi,
>
> This patch makes Netx use the version based download protocol for JNLP
> files.
>
> Netx tries to use the version based download protocol whenever possible
> to download files. This wasn't being done for JNLP file that were
> specified as extensions by other JNLP files. This patch fixes the issue
> making JNLP applications like aerith[1] work. This is also required to
> run JavaFX applications.
>
> While adding that support, I noticed that function arguments that
> involved Urls and versions were inconsistent: some used function(URL,
> Version, blah) while others used function(URL, blah, Version). I have
> tried to fix them to be function(URL, Version, blah) consistently.
>
> ChangeLog:
> 2009-07-10 Omair Majid <omajid at redhat.com>
>
> * rt/net/sourceforge/jnlp/JNLPFile.java
> (JNLPFile): Delegate to the Version-based constructor.
> (JNLPFile): New constructor.
> (JNLPFile): Modified to take an additional version argument used in
> downloading the JNLP file.
> (openURL): Take an additional version argument and use when
> downloading the URL.
> * rt/net/sourceforge/jnlp/Launcher.java
> (toFile): Use the new JNLPFile constructor.
> * rt/net/sourceforge/jnlp/cache/Resource.java
> (Resource): Rearrange argument order.
> (getResource): Likewise. Fix parameters to constructor.
> * rt/net/sourceforge/jnlp/cache/ResourceTracker.java
> (addResource): Fix arguments to Resource.getResource.
> * rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
> (getInstance): Take additional version argument and useit when
> creating a JNLPFile.
> (initializeExtensions): Use the extension version when requesting a
> JNLPClassLoader.
>
>
Looks good. One question though.. why are the order of arguments to
Resource() and getResource() being changed?
Deepak
> Any comments?
>
> Cheers,
> Omair
>
> [1] https://aerith.dev.java.net/
> diff -r 7acbff01007f rt/net/sourceforge/jnlp/JNLPFile.java
> --- a/rt/net/sourceforge/jnlp/JNLPFile.java Thu Jul 09 17:29:13 2009 -0400
> +++ b/rt/net/sourceforge/jnlp/JNLPFile.java Fri Jul 10 11:11:59 2009 -0400
> @@ -138,21 +138,36 @@
> * @throws ParseException if the JNLP file was invalid
> */
> public JNLPFile(URL location, boolean strict) throws IOException, ParseException {
> - this(location, strict, JNLPRuntime.getDefaultUpdatePolicy());
> + this(location, (Version) null, strict);
> + }
> +
> + /**
> + * Create a JNLPFile from a URL and a Version checking for updates using
> + * the default policy.
> + *
> + * @param location the location of the JNLP file
> + * @param version the version of the JNLP file
> + * @param strict whether to enforce the spec when
> + * @throws IOException if an IO exception occurred
> + * @throws ParseException if the JNLP file was invalid
> + */
> + public JNLPFile(URL location, Version version, boolean strict) throws IOException, ParseException {
> + this(location, version, strict, JNLPRuntime.getDefaultUpdatePolicy());
> }
>
> /**
> - * Create a JNLPFile from a URL checking for updates using the
> - * specified policy.
> + * Create a JNLPFile from a URL and a version, checking for updates
> + * using the specified policy.
> *
> * @param location the location of the JNLP file
> + * @param version the version of the JNLP file
> * @param strict whether to enforce the spec when
> * @param policy the update policy
> * @throws IOException if an IO exception occurred
> * @throws ParseException if the JNLP file was invalid
> */
> - public JNLPFile(URL location, boolean strict, UpdatePolicy policy) throws IOException, ParseException {
> - Node root = Parser.getRootNode(openURL(location, policy));
> + public JNLPFile(URL location, Version version, boolean strict, UpdatePolicy policy) throws IOException, ParseException {
> + Node root = Parser.getRootNode(openURL(location, version, policy));
> parse(root, strict, location);
>
> this.fileLocation = location;
> @@ -186,13 +201,13 @@
> * Open the jnlp file URL from the cache if there, otherwise
> * download to the cache. Called from constructor.
> */
> - private static InputStream openURL(URL location, UpdatePolicy policy) throws IOException {
> + private static InputStream openURL(URL location, Version version, UpdatePolicy policy) throws IOException {
> if (location == null || policy == null)
> throw new IllegalArgumentException(R("NullParameter"));
>
> try {
> ResourceTracker tracker = new ResourceTracker(false); // no prefetch
> - tracker.addResource(location, null/*version*/, policy);
> + tracker.addResource(location, version , policy);
>
> return tracker.getInputStream(location);
> }
> diff -r 7acbff01007f rt/net/sourceforge/jnlp/Launcher.java
> --- a/rt/net/sourceforge/jnlp/Launcher.java Thu Jul 09 17:29:13 2009 -0400
> +++ b/rt/net/sourceforge/jnlp/Launcher.java Fri Jul 10 11:11:59 2009 -0400
> @@ -337,10 +337,10 @@
> JNLPFile file = null;
>
> try {
> - file = new JNLPFile(location, true, updatePolicy); // strict
> + file = new JNLPFile(location, (Version) null, true, updatePolicy); // strict
> }
> catch (ParseException ex) {
> - file = new JNLPFile(location, false, updatePolicy);
> + file = new JNLPFile(location, (Version) null, false, updatePolicy);
>
> // only here if strict failed but lax did not fail
> LaunchException lex =
> diff -r 7acbff01007f rt/net/sourceforge/jnlp/cache/Resource.java
> --- a/rt/net/sourceforge/jnlp/cache/Resource.java Thu Jul 09 17:29:13 2009 -0400
> +++ b/rt/net/sourceforge/jnlp/cache/Resource.java Fri Jul 10 11:11:59 2009 -0400
> @@ -95,7 +95,7 @@
> /**
> * Create a resource.
> */
> - private Resource(URL location, UpdatePolicy updatePolicy, Version requestVersion) {
> + private Resource(URL location, Version requestVersion, UpdatePolicy updatePolicy) {
> this.location = location;
> this.requestVersion = requestVersion;
> this.updatePolicy = updatePolicy;
> @@ -105,9 +105,9 @@
> * Return a shared Resource object representing the given
> * location and version.
> */
> - public static Resource getResource(URL location, UpdatePolicy updatePolicy, Version requestVersion) {
> + public static Resource getResource(URL location, Version requestVersion, UpdatePolicy updatePolicy) {
> synchronized (resources) {
> - Resource resource = new Resource(location, updatePolicy, requestVersion);
> + Resource resource = new Resource(location, requestVersion, updatePolicy);
>
> int index = resources.indexOf(resource);
> if (index >= 0) { // return existing object
> diff -r 7acbff01007f rt/net/sourceforge/jnlp/cache/ResourceTracker.java
> --- a/rt/net/sourceforge/jnlp/cache/ResourceTracker.java Thu Jul 09 17:29:13 2009 -0400
> +++ b/rt/net/sourceforge/jnlp/cache/ResourceTracker.java Fri Jul 10 11:11:59 2009 -0400
> @@ -168,7 +168,7 @@
> if (location == null)
> throw new IllegalArgumentException("location==null");
>
> - Resource resource = Resource.getResource(location, updatePolicy, version);
> + Resource resource = Resource.getResource(location, version, updatePolicy);
> boolean downloaded = false;
>
> synchronized (resources) {
> diff -r 7acbff01007f rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
> --- a/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Jul 09 17:29:13 2009 -0400
> +++ b/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Jul 10 11:11:59 2009 -0400
> @@ -51,6 +51,7 @@
> import net.sourceforge.jnlp.PluginBridge;
> import net.sourceforge.jnlp.ResourcesDesc;
> import net.sourceforge.jnlp.SecurityDesc;
> +import net.sourceforge.jnlp.Version;
> import net.sourceforge.jnlp.cache.CacheUtil;
> import net.sourceforge.jnlp.cache.ResourceTracker;
> import net.sourceforge.jnlp.cache.UpdatePolicy;
> @@ -232,13 +233,15 @@
> * location.
> *
> * @param location the file's location
> + * @param version the file's version
> * @param policy the update policy to use when downloading resources
> */
> - public static JNLPClassLoader getInstance(URL location, UpdatePolicy policy) throws IOException, ParseException, LaunchException {
> + public static JNLPClassLoader getInstance(URL location, Version version, UpdatePolicy policy)
> + throws IOException, ParseException, LaunchException {
> JNLPClassLoader loader = (JNLPClassLoader) urlToLoader.get(location);
>
> if (loader == null)
> - loader = getInstance(new JNLPFile(location, false, policy), policy);
> + loader = getInstance(new JNLPFile(location, version, false, policy), policy);
>
> return loader;
> }
> @@ -256,7 +259,7 @@
> //if (ext != null) {
> for (int i=0; i < ext.length; i++) {
> try {
> - JNLPClassLoader loader = getInstance(ext[i].getLocation(), updatePolicy);
> + JNLPClassLoader loader = getInstance(ext[i].getLocation(), ext[i].getVersion(), updatePolicy);
> loaderList.add(loader);
> }
> catch (Exception ex) {
More information about the distro-pkg-dev
mailing list