changeset in /hg/icedtea6: Netx: Use version based download prot...
Omair Majid
omajid at redhat.com
Mon Jul 13 12:21:01 PDT 2009
changeset 96da5a90598a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=96da5a90598a
description:
Netx: Use version based download protocol for JNLP files too
2009-07-13 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 use it when creating a
JNLPFile.
(initializeExtensions): Use the extension version when requesting a
JNLPClassLoader.
diffstat:
6 files changed, 59 insertions(+), 19 deletions(-)
ChangeLog | 22 +++++++++++
rt/net/sourceforge/jnlp/JNLPFile.java | 35 ++++++++++++------
rt/net/sourceforge/jnlp/Launcher.java | 4 +-
rt/net/sourceforge/jnlp/cache/Resource.java | 6 +--
rt/net/sourceforge/jnlp/cache/ResourceTracker.java | 2 -
rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 9 +++-
diffs (183 lines):
diff -r dd1ce0a6da73 -r 96da5a90598a ChangeLog
--- a/ChangeLog Fri Jul 10 19:02:10 2009 -0400
+++ b/ChangeLog Mon Jul 13 15:22:34 2009 -0400
@@ -1,3 +1,25 @@ 2009-07-10 Deepak Bhole <dbhole at redhat
+2009-07-13 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 use it when creating a
+ JNLPFile.
+ (initializeExtensions): Use the extension version when requesting a
+ JNLPClassLoader.
+
2009-07-10 Deepak Bhole <dbhole at redhat.com>
* Makefile.am: Update makefile to pick up plugin C++ files from new
diff -r dd1ce0a6da73 -r 96da5a90598a rt/net/sourceforge/jnlp/JNLPFile.java
--- a/rt/net/sourceforge/jnlp/JNLPFile.java Fri Jul 10 19:02:10 2009 -0400
+++ b/rt/net/sourceforge/jnlp/JNLPFile.java Mon Jul 13 15:22:34 2009 -0400
@@ -138,21 +138,36 @@ public class JNLPFile {
* @throws ParseException if the JNLP file was invalid
*/
public JNLPFile(URL location, boolean strict) throws IOException, ParseException {
- this(location, strict, JNLPRuntime.getDefaultUpdatePolicy());
- }
-
- /**
- * Create a JNLPFile from a URL checking for updates using the
- * specified policy.
+ 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 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 @@ public class JNLPFile {
* 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 dd1ce0a6da73 -r 96da5a90598a rt/net/sourceforge/jnlp/Launcher.java
--- a/rt/net/sourceforge/jnlp/Launcher.java Fri Jul 10 19:02:10 2009 -0400
+++ b/rt/net/sourceforge/jnlp/Launcher.java Mon Jul 13 15:22:34 2009 -0400
@@ -337,10 +337,10 @@ public class Launcher {
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 dd1ce0a6da73 -r 96da5a90598a rt/net/sourceforge/jnlp/cache/Resource.java
--- a/rt/net/sourceforge/jnlp/cache/Resource.java Fri Jul 10 19:02:10 2009 -0400
+++ b/rt/net/sourceforge/jnlp/cache/Resource.java Mon Jul 13 15:22:34 2009 -0400
@@ -95,7 +95,7 @@ public class Resource {
/**
* 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 @@ public class Resource {
* 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 dd1ce0a6da73 -r 96da5a90598a rt/net/sourceforge/jnlp/cache/ResourceTracker.java
--- a/rt/net/sourceforge/jnlp/cache/ResourceTracker.java Fri Jul 10 19:02:10 2009 -0400
+++ b/rt/net/sourceforge/jnlp/cache/ResourceTracker.java Mon Jul 13 15:22:34 2009 -0400
@@ -168,7 +168,7 @@ public class ResourceTracker {
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 dd1ce0a6da73 -r 96da5a90598a rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Jul 10 19:02:10 2009 -0400
+++ b/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Mon Jul 13 15:22:34 2009 -0400
@@ -51,6 +51,7 @@ import net.sourceforge.jnlp.PluginBridge
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 @@ public class JNLPClassLoader extends URL
* 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 @@ public class JNLPClassLoader extends URL
//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