/hg/icedtea-web: 2 new changesets
asu at icedtea.classpath.org
asu at icedtea.classpath.org
Wed Jun 8 13:22:56 PDT 2011
changeset a25cdbe75706 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=a25cdbe75706
author: Andrew Su <asu at redhat.com>
date: Wed Jun 08 16:12:38 2011 -0400
Change jar resource names to be stored in HashSet instead of
String[].
changeset 011a29a0d8a2 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=011a29a0d8a2
author: Andrew Su <asu at redhat.com>
date: Wed Jun 08 13:32:54 2011 -0400
Enable passing applet parameters through JNLP files.
diffstat:
ChangeLog | 21 +++++++++++++++++++
NEWS | 1 +
netx/net/sourceforge/jnlp/JNLPFile.java | 24 ++++++++++++++++++---
netx/net/sourceforge/jnlp/Parser.java | 25 +++++++++++++++++++++-
netx/net/sourceforge/jnlp/PluginBridge.java | 32 +++++++++++++++++++---------
5 files changed, 88 insertions(+), 15 deletions(-)
diffs (224 lines):
diff -r 2cfa903b7216 -r 011a29a0d8a2 ChangeLog
--- a/ChangeLog Wed Jun 08 14:38:52 2011 -0400
+++ b/ChangeLog Wed Jun 08 13:32:54 2011 -0400
@@ -1,3 +1,24 @@
+2011-07-08 Andrew Su <asu at redhat.com>
+
+ * NEWS: Updated.
+ * netx/net/sourceforge/jnlp/JNLPFile.java:
+ (JNLPFile): Calls new constructor.
+ (JNLPFile): New constructor to take an option for forcing a codebase.
+ (JNLPFile): Call parse with extra parameter.
+ (parse): Use the given codebase passed in if we did not find one.
+ * netx/net/sourceforge/jnlp/Parser.java:
+ (Parser): Calls new constructor.
+ (Parser): New constructor which takes in a codebase as a last option.
+ * netx/net/sourceforge/jnlp/PluginBridge.java:
+ (PluginBridge): Calls new JNLPFile's constructor with current codebase
+
+2011-07-08 Andrew Su <asu at redhat.com>
+
+ * netx/net/sourceforge/jnlp/PluginBridge.java:
+ (jars): Changed to use HashSet instead of String[].
+ (PluginBridge): Updated to work with HashSet instead of String[]
+ (getResources): Likewise.
+
2011-06-08 Deepak Bhole <dbhole at redhat.com>
PR721: IcedTeaPlugin.so cannot run g_main_context_iteration on a different
diff -r 2cfa903b7216 -r 011a29a0d8a2 NEWS
--- a/NEWS Wed Jun 08 14:38:52 2011 -0400
+++ b/NEWS Wed Jun 08 13:32:54 2011 -0400
@@ -26,6 +26,7 @@
- Use Firefox's proxy settings if possible
- The user's default browser (determined from xdg-open or $BROWSER) is used
- RH669942: javaws fails to download version/packed files (missing support for jnlp.packEnabled and jnlp.versionEnabled)
+ - PR464: plugin can now load parameters from jnlp files.
- PR658: now jnlp.packEnabled works with applets.
- PR726: closing javaws -about no longer throws exceptions.
- PR727: cache now properly removes files.
diff -r 2cfa903b7216 -r 011a29a0d8a2 netx/net/sourceforge/jnlp/JNLPFile.java
--- a/netx/net/sourceforge/jnlp/JNLPFile.java Wed Jun 08 14:38:52 2011 -0400
+++ b/netx/net/sourceforge/jnlp/JNLPFile.java Wed Jun 08 13:32:54 2011 -0400
@@ -174,8 +174,24 @@
* @throws ParseException if the JNLP file was invalid
*/
public JNLPFile(URL location, Version version, boolean strict, UpdatePolicy policy) throws IOException, ParseException {
+ this(location, version, strict, policy, null);
+ }
+
+ /**
+ * 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
+ * @param forceCodebase codebase to use if not specified in JNLP file.
+ * @throws IOException if an IO exception occurred
+ * @throws ParseException if the JNLP file was invalid
+ */
+ protected JNLPFile(URL location, Version version, boolean strict, UpdatePolicy policy, URL forceCodebase) throws IOException, ParseException {
Node root = Parser.getRootNode(openURL(location, version, policy));
- parse(root, strict, location);
+ parse(root, strict, location, forceCodebase);
//Downloads the original jnlp file into the cache if possible
//(i.e. If the jnlp file being launched exist locally, but it
@@ -222,7 +238,7 @@
* @throws ParseException if the JNLP file was invalid
*/
public JNLPFile(InputStream input, boolean strict) throws ParseException {
- parse(Parser.getRootNode(input), strict, null);
+ parse(Parser.getRootNode(input), strict, null, null);
}
/**
@@ -574,12 +590,12 @@
* @param strict whether to enforce the spec when
* @param location the file location or null
*/
- private void parse(Node root, boolean strict, URL location) throws ParseException {
+ private void parse(Node root, boolean strict, URL location, URL forceCodebase) throws ParseException {
try {
//if (location != null)
// location = new URL(location, "."); // remove filename
- Parser parser = new Parser(this, location, root, strict, true); // true == allow extensions
+ Parser parser = new Parser(this, location, root, strict, true, forceCodebase); // true == allow extensions
// JNLP tag information
specVersion = parser.getSpecVersion();
diff -r 2cfa903b7216 -r 011a29a0d8a2 netx/net/sourceforge/jnlp/Parser.java
--- a/netx/net/sourceforge/jnlp/Parser.java Wed Jun 08 14:38:52 2011 -0400
+++ b/netx/net/sourceforge/jnlp/Parser.java Wed Jun 08 13:32:54 2011 -0400
@@ -110,6 +110,27 @@
* @throws ParseException if the JNLP file is invalid
*/
public Parser(JNLPFile file, URL base, Node root, boolean strict, boolean allowExtensions) throws ParseException {
+ this(file, base, root, strict, allowExtensions, null);
+ }
+
+ /**
+ * Create a parser for the JNLP file. If the location
+ * parameters is not null it is used as the default codebase
+ * (does not override value of jnlp element's href
+ * attribute).<p>
+ *
+ * The root node may be normalized as a side effect of this
+ * constructor.
+ *
+ * @param file the (uninitialized) file reference
+ * @param base if codebase is not specified, a default base for relative URLs
+ * @param root the root node
+ * @param strict whether to enforce strict compliance with the JNLP spec
+ * @param allowExtensions whether to allow extensions to the JNLP spec
+ * @param codebase codebase to use if we did not parse one from JNLP file.
+ * @throws ParseException if the JNLP file is invalid
+ */
+ public Parser(JNLPFile file, URL base, Node root, boolean strict, boolean allowExtensions, URL codebase) throws ParseException {
this.file = file;
this.root = root;
this.strict = strict;
@@ -122,7 +143,9 @@
// JNLP tag information
this.spec = getVersion(root, "spec", "1.0+");
this.codebase = addSlash(getURL(root, "codebase", base));
- this.base = (codebase != null) ? codebase : base; // if codebase not specified use default codebase
+ if (this.codebase == null) // We only override it if it is not specified.
+ this.codebase = codebase;
+ this.base = (this.codebase != null) ? this.codebase : base; // if codebase not specified use default codebase
fileLocation = getURL(root, "href", this.base);
// normalize the text nodes
diff -r 2cfa903b7216 -r 011a29a0d8a2 netx/net/sourceforge/jnlp/PluginBridge.java
--- a/netx/net/sourceforge/jnlp/PluginBridge.java Wed Jun 08 14:38:52 2011 -0400
+++ b/netx/net/sourceforge/jnlp/PluginBridge.java Wed Jun 08 13:32:54 2011 -0400
@@ -24,7 +24,9 @@
import java.net.URL;
import java.net.MalformedURLException;
+import java.util.HashSet;
import java.util.Hashtable;
+import java.util.Iterator;
import java.util.Locale;
import java.util.List;
import java.util.ArrayList;
@@ -35,7 +37,7 @@
public class PluginBridge extends JNLPFile {
String name;
- String[] jars = new String[0];
+ HashSet<String> jars = new HashSet<String>();
String[] cacheJars = new String[0];
String[] cacheExJars = new String[0];
Hashtable<String, String> atts;
@@ -51,17 +53,23 @@
fileVersion = new Version("1.1");
this.codeBase = codebase;
this.sourceLocation = documentBase;
+ this.atts = atts;
if (atts.containsKey("jnlp_href")) {
try {
URL jnlp = new URL(codeBase.toExternalForm() + atts.get("jnlp_href"));
- JNLPFile jnlpFile = new JNLPFile(jnlp);
+ JNLPFile jnlpFile = new JNLPFile(jnlp, null, false, JNLPRuntime.getDefaultUpdatePolicy(), this.codeBase);
Map<String, String> jnlpParams = jnlpFile.getApplet().getParameters();
// Change the parameter name to lowercase to follow conventions.
for (Map.Entry<String, String> entry : jnlpParams.entrySet()) {
- atts.put(entry.getKey().toLowerCase(), entry.getValue());
+ this.atts.put(entry.getKey().toLowerCase(), entry.getValue());
}
+ JARDesc[] jarDescs = jnlpFile.getResources().getJARs();
+ for (JARDesc jarDesc : jarDescs) {
+ String fileName = jarDesc.getLocation().toExternalForm();
+ this.jars.add(fileName);
+ }
} catch (MalformedURLException e) {
// Don't fail because we cannot get the jnlp file. Parameters are optional not required.
// it is the site developer who should ensure that file exist.
@@ -101,11 +109,13 @@
}
if (jar != null && jar.length() > 0) {
- this.jars = jar.split(",");
+ String[] jars = jar.split(",");
// trim white spaces
- for (int i = 0; i < this.jars.length; i++) {
- this.jars[i] = this.jars[i].trim();
+ for (int i = 0; i < jars.length; i++) {
+ String jarName = jars[i].trim();
+ if (jarName.length() > 0)
+ this.jars.add(jarName);
}
if (JNLPRuntime.isDebug()) {
@@ -113,7 +123,6 @@
System.err.println("jars length: " + jars.length);
}
}
- this.atts = atts;
name = atts.get("name");
if (name == null)
@@ -191,10 +200,13 @@
List<JARDesc> jarDescs = new ArrayList<JARDesc>();
jarDescs.addAll(sharedResources.getResources(JARDesc.class));
- for (int i = 0; i < jars.length; i++)
- if (jars[i].length() > 0)
- jarDescs.add(new JARDesc(new URL(codeBase, jars[i]),
+ Iterator<String> it = jars.iterator();
+ while(it.hasNext()) {
+ String name = it.next();
+ if (name.length() > 0)
+ jarDescs.add(new JARDesc(new URL(codeBase, name),
null, null, false, true, false, true));
+ }
boolean cacheable = true;
More information about the distro-pkg-dev
mailing list