/hg/icedtea-web: 3 new changesets
dlila at icedtea.classpath.org
dlila at icedtea.classpath.org
Mon Mar 7 06:16:13 PST 2011
changeset 669de8a29c6e in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=669de8a29c6e
author: Denis Lila <dlila at redhat.com>
date: Fri Mar 04 17:36:23 2011 -0500
Fixed packed jar naming and pack.gz decompression problem.
changeset 8c953caa05bc in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=8c953caa05bc
author: Denis Lila <dlila at redhat.com>
date: Fri Mar 04 17:45:57 2011 -0500
merge
changeset f1a5201c6b04 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f1a5201c6b04
author: Denis Lila <dlila at redhat.com>
date: Fri Mar 04 18:16:07 2011 -0500
Fix PR658
diffstat:
ChangeLog | 49 ++++
NEWS | 2 +
netx/net/sourceforge/jnlp/JNLPFile.java | 28 ++
netx/net/sourceforge/jnlp/PluginBridge.java | 30 ++-
netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 44 ++--
netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java | 2 +-
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 134 ++++++++++--
netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 12 +-
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 9 +-
9 files changed, 257 insertions(+), 53 deletions(-)
diffs (496 lines):
diff -r 64b9d3a8239c -r f1a5201c6b04 ChangeLog
--- a/ChangeLog Thu Mar 03 17:56:00 2011 -0500
+++ b/ChangeLog Fri Mar 04 18:16:07 2011 -0500
@@ -1,3 +1,52 @@
+2011-03-04 Denis Lila <dlila at redhat.com>
+
+ * netx/net/sourceforge/jnlp/JNLPFile.java:
+ (getDownloadOptionsForJar): Moved here from JNLPClassLoader.java.
+ * netx/net/sourceforge/jnlp/PluginBridge.java
+ (usePack, useVersion): added.
+ (PluginBridge): initializing usePack and useVersion.
+ (getDownloadOptionsForJar): return the download options.
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+ (getDownloadOptionsForJar): logic moved to JNLPFile.java and its
+ subclasses. Now just calling file.getDownloadOptionsForJar.
+ * NEWS: Updated with fix of PR658.
+
+2011-03-04 Denis Lila <dlila at redhat.com>
+
+ * netx/net/sourceforge/jnlp/cache/ResourceTracker.java
+ (downloadResource): changed the order in which pack200+gz compression
+ and gzip compression are checked.
+ * netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java
+ (getUrl): if usePack now concatenating strings instead of replacing.
+
+2011-03-04 Deepak Bhole <dbhole at redhat.com>
+
+ * NEWS: Updated.
+ * netx/net/sourceforge/jnlp/PluginBridge.java (PluginBridge): Use
+ documentbase as a uniquekey so that the classloader may be shared by
+ applets from the same page.
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Added new
+ CodeBaseClassLoader class to load codebase (from path instead of a file)
+ classes.
+ (getInstance): Try to match file locations only for Web Start apps. For
+ plugin, merge the new loader into current one.
+ (enableCodeBase): Use the new addToCodeBaseLoader method.
+ (findLoadedClassAll): Search the codebase loader if the class was not
+ found in the file loaders.
+ (findClass): Likewise.
+ (getResource): Likewise.
+ (findResources): Likewise.
+ (merge): Merge codebase loaders.
+ (addToCodeBaseLoader): New method. Adds a given url to the codebase loader
+ if it is a path.
+ (CodeBaseClassLoader): New inner class. Extends URLClassLoader to expose
+ its protected methods like addURL.
+ * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java
+ (getApplication): Accomodate the fact that the classloader for a class may
+ be a CodeBaseClassLoader.
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (run):
+ Likewise.
+
2011-03-03 Deepak Bhole <dbhole at redhat.com>
* plugin/icedteanp/IcedTeaNPPlugin.cc
diff -r 64b9d3a8239c -r f1a5201c6b04 NEWS
--- a/NEWS Thu Mar 03 17:56:00 2011 -0500
+++ b/NEWS Fri Mar 04 18:16:07 2011 -0500
@@ -20,7 +20,9 @@
* NetX
- Use Firefox's proxy settings if possible
- RH669942: javaws fails to download version/packed files (missing support for jnlp.packEnabled and jnlp.versionEnabled)
+ - PR658: now jnlp.packEnabled works with applets.
* Plugin
+ - PR475, RH604061: Allow applets from the same page to use the same classloader
- PR612: NetDania application ends on java.security.AccessControlException: access denied (java.util.PropertyPermission browser read)
New in release 1.0 (2010-XX-XX):
diff -r 64b9d3a8239c -r f1a5201c6b04 netx/net/sourceforge/jnlp/JNLPFile.java
--- a/netx/net/sourceforge/jnlp/JNLPFile.java Thu Mar 03 17:56:00 2011 -0500
+++ b/netx/net/sourceforge/jnlp/JNLPFile.java Fri Mar 04 18:16:07 2011 -0500
@@ -645,4 +645,32 @@
return newVMArgs;
}
+ /**
+ * XXX: this method does a "==" comparison between the input JARDesc and
+ * jars it finds through getResourcesDescs(). If ever the implementation
+ * of that function should change to return copies of JARDescs objects,
+ * then the "jar == aJar" comparison below should change accordingly.
+ * @param jar: the jar whose download options to get.
+ * @return the download options.
+ */
+ public DownloadOptions getDownloadOptionsForJar(JARDesc jar) {
+ boolean usePack = false;
+ boolean useVersion = false;
+ ResourcesDesc[] descs = getResourcesDescs();
+ for (ResourcesDesc desc: descs) {
+ JARDesc[] jars = desc.getJARs();
+ for (JARDesc aJar: jars) {
+ if (jar == aJar/*jar.getLocation().equals(aJar.getLocation())*/) {
+ if (Boolean.valueOf(desc.getPropertiesMap().get("jnlp.packEnabled"))) {
+ usePack = true;
+ }
+ if (Boolean.valueOf(desc.getPropertiesMap().get("jnlp.versionEnabled"))) {
+ useVersion = true;
+ }
+ }
+ }
+ }
+ return new DownloadOptions(usePack, useVersion);
+ }
+
}
diff -r 64b9d3a8239c -r f1a5201c6b04 netx/net/sourceforge/jnlp/PluginBridge.java
--- a/netx/net/sourceforge/jnlp/PluginBridge.java Thu Mar 03 17:56:00 2011 -0500
+++ b/netx/net/sourceforge/jnlp/PluginBridge.java Fri Mar 04 18:16:07 2011 -0500
@@ -40,6 +40,8 @@
String[] cacheJars = new String[0];
String[] cacheExJars = new String[0];
Hashtable<String, String> atts;
+ private boolean usePack;
+ private boolean useVersion;
public PluginBridge(URL codebase, URL documentBase, String jar, String main,
int width, int height, Hashtable<String, String> atts)
@@ -130,9 +132,31 @@
else
security = null;
- this.uniqueKey = Calendar.getInstance().getTimeInMillis() + "-" +
- Math.abs(((new java.util.Random()).nextInt())) + "-" +
- documentBase;
+ // Plugin needs to share classloaders so that applet instances from
+ // same page can communicate (there are applets known to require
+ // such communication for proper functionality)
+ this.uniqueKey = documentBase.toString();
+
+ usePack = false;
+ useVersion = false;
+ String jargs = atts.get("java_arguments");
+ if (jargs != null) {
+ for (String s : jargs.split(" ")) {
+ String[] parts = s.trim().split("=");
+ if (parts.length == 2 && Boolean.valueOf(parts[1])) {
+ if ("-Djnlp.packEnabled".equals(parts[0])) {
+ usePack = true;
+ } else if ("-Djnlp.versionEnabled".equals(parts[0])) {
+ useVersion = true;
+ }
+ }
+ }
+ }
+ }
+
+ @Override
+ public DownloadOptions getDownloadOptionsForJar(JARDesc jar) {
+ return new DownloadOptions(usePack, useVersion);
}
public String getTitle() {
diff -r 64b9d3a8239c -r f1a5201c6b04 netx/net/sourceforge/jnlp/cache/ResourceTracker.java
--- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Thu Mar 03 17:56:00 2011 -0500
+++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Fri Mar 04 18:16:07 2011 -0500
@@ -653,11 +653,14 @@
}
- if ("gzip".equals(contentEncoding)) {
+ boolean packgz = "pack200-gzip".equals(contentEncoding) ||
+ realLocation.getPath().endsWith(".pack.gz");
+ boolean gzip = "gzip".equals(contentEncoding);
+
+ if (packgz) {
+ downloadLocation = new URL(downloadLocation.toString() + ".pack.gz");
+ } else if (gzip) {
downloadLocation = new URL(downloadLocation.toString() + ".gz");
- } else if ("pack200-gzip".equals(contentEncoding) ||
- realLocation.getPath().endsWith(".pack.gz")) {
- downloadLocation = new URL(downloadLocation.toString() + ".pack.gz");
}
InputStream in = new BufferedInputStream(con.getInputStream());
@@ -681,7 +684,21 @@
* If the file was compressed, uncompress it.
*/
- if ("gzip".equals(contentEncoding)) {
+ if (packgz) {
+ 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();
+ } else if (gzip) {
GZIPInputStream gzInputStream = new GZIPInputStream(new FileInputStream(CacheUtil
.getCacheFile(downloadLocation, resource.downloadVersion)));
InputStream inputStream = new BufferedInputStream(gzInputStream);
@@ -697,25 +714,8 @@
outputStream.close();
inputStream.close();
gzInputStream.close();
-
- } else if ("pack200-gzip".equals(contentEncoding) ||
- realLocation.getPath().endsWith(".pack.gz")) {
- 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
diff -r 64b9d3a8239c -r f1a5201c6b04 netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java
--- a/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java Thu Mar 03 17:56:00 2011 -0500
+++ b/netx/net/sourceforge/jnlp/cache/ResourceUrlCreator.java Fri Mar 04 18:16:07 2011 -0500
@@ -122,7 +122,7 @@
filename = name + "__V" + resource.requestVersion + "." + extension;
}
if (usePack) {
- filename = filename.replace(".jar", ".pack.gz");
+ filename = filename + ".pack.gz";
}
location = location.substring(0, lastSlash + 1) + filename;
diff -r 64b9d3a8239c -r f1a5201c6b04 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Mar 03 17:56:00 2011 -0500
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Mar 04 18:16:07 2011 -0500
@@ -145,6 +145,9 @@
/** Map of specific codesources to securitydesc */
private HashMap<URL, SecurityDesc> jarLocationSecurityMap =
new HashMap<URL, SecurityDesc>();
+
+ /** Loader for codebase (which is a path, rather than a file) */
+ private CodeBaseClassLoader codeBaseLoader;
/**
* Create a new JNLPClassLoader from the specified file.
@@ -276,10 +279,12 @@
try {
- // If base loader is null, or the baseloader's file and this
- // file is different, initialize a new loader
+
+ // A null baseloader implies that no loader has been created
+ // for this codebase/jnlp yet. Create one.
if (baseLoader == null ||
- !baseLoader.getJNLPFile().getFileLocation().equals(file.getFileLocation())) {
+ (file.isApplication() &&
+ !baseLoader.getJNLPFile().getFileLocation().equals(file.getFileLocation()))) {
loader = new JNLPClassLoader(file, policy);
@@ -303,6 +308,13 @@
} else {
// if key is same and locations match, this is the loader we want
+ if (!file.isApplication()) {
+ // If this is an applet, we do need to consider its loader
+ loader = new JNLPClassLoader(file, policy);
+
+ if (baseLoader != null)
+ baseLoader.merge(loader);
+ }
loader = baseLoader;
}
@@ -529,7 +541,7 @@
* loaded from the codebase are not cached.
*/
public void enableCodeBase() {
- addURL(file.getCodeBase()); // nothing happens if called more that once?
+ addToCodeBaseLoader(file.getCodeBase());
}
/**
@@ -958,8 +970,13 @@
if (result != null)
return result;
}
-
- return null;
+
+ // Result is still null. Return what the codebaseloader
+ // has (which returns null if it is not loaded there either)
+ if (codeBaseLoader != null)
+ return codeBaseLoader.findLoadedClassFromParent(name);
+ else
+ return null;
}
/**
@@ -1067,6 +1084,11 @@
}
}
+ // Try codebase loader
+ if (codeBaseLoader != null)
+ return codeBaseLoader.findClass(name);
+
+ // All else failed. Throw CNFE
throw new ClassNotFoundException(name);
}
@@ -1109,6 +1131,10 @@
for (int i = 1; i < loaders.length; i++)
if (result == null)
result = loaders[i].getResource(name);
+
+ // If result is still null, look in the codebase loader
+ if (result == null && codeBaseLoader != null)
+ result = codeBaseLoader.getResource(name);
return result;
}
@@ -1120,9 +1146,9 @@
@Override
public Enumeration<URL> findResources(String name) throws IOException {
Vector<URL> resources = new Vector<URL>();
+ Enumeration<URL> e;
for (int i = 0; i < loaders.length; i++) {
- Enumeration<URL> e;
if (loaders[i] == this)
e = super.findResources(name);
@@ -1133,6 +1159,14 @@
resources.add(e.nextElement());
}
+ // Add resources from codebase (only if nothing was found above,
+ // otherwise the server will get hammered)
+ if (resources.isEmpty() && codeBaseLoader != null) {
+ e = codeBaseLoader.findResources(name);
+ while (e.hasMoreElements())
+ resources.add(e.nextElement());
+ }
+
return resources.elements();
}
@@ -1250,6 +1284,9 @@
// jars
for (URL u : extLoader.getURLs())
addURL(u);
+
+ // Codebase
+ addToCodeBaseLoader(extLoader.file.getCodeBase());
// native search paths
for (File nativeDirectory : extLoader.getNativeDirectories())
@@ -1261,26 +1298,75 @@
}
}
- private DownloadOptions getDownloadOptionsForJar(JARDesc jar) {
- boolean usePack = false;
- boolean useVersion = false;
+ /**
+ * Adds the given path to the path loader
+ *
+ * @param URL the path to add
+ * @throws IllegalArgumentException If the given url is not a path
+ */
+ private void addToCodeBaseLoader(URL u) {
- ResourcesDesc[] descs = file.getResourcesDescs();
- for (ResourcesDesc desc: descs) {
- JARDesc[] jars = desc.getJARs();
- for (JARDesc aJar: jars) {
- if (jar == aJar) {
- if (Boolean.valueOf(desc.getPropertiesMap().get("jnlp.packEnabled"))) {
- usePack = true;
- }
- if (Boolean.valueOf(desc.getPropertiesMap().get("jnlp.versionEnabled"))) {
- useVersion = true;
- }
- }
- }
+ // Only paths may be added
+ if (!u.getFile().endsWith("/")) {
+ throw new IllegalArgumentException("addToPathLoader only accepts path based URLs");
}
- return new DownloadOptions(usePack, useVersion);
+ // If there is no loader yet, create one, else add it to the
+ // existing one (happens when called from merge())
+ if (codeBaseLoader == null) {
+ codeBaseLoader = new CodeBaseClassLoader(new URL[] { u }, this);
+ } else {
+ codeBaseLoader.addURL(u);
+ }
}
+ private DownloadOptions getDownloadOptionsForJar(JARDesc jar) {
+ return file.getDownloadOptionsForJar(jar);
+ }
+
+ /*
+ * Helper class to expose protected URLClassLoader methods.
+ */
+
+ public class CodeBaseClassLoader extends URLClassLoader {
+
+ JNLPClassLoader parentJNLPClassLoader;
+
+ public CodeBaseClassLoader(URL[] urls, JNLPClassLoader cl) {
+ super(urls);
+ parentJNLPClassLoader = cl;
+ }
+
+ @Override
+ public void addURL(URL url) {
+ super.addURL(url);
+ }
+
+ @Override
+ public Class<?> findClass(String name) throws ClassNotFoundException {
+ return super.findClass(name);
+ }
+
+ /**
+ * Returns the output of super.findLoadedClass().
+ *
+ * The method is renamed because ClassLoader.findLoadedClass() is final
+ *
+ * @param name The name of the class to find
+ * @return Output of ClassLoader.findLoadedClass() which is the class if found, null otherwise
+ * @see java.lang.ClassLoader#findLoadedClass(String)
+ */
+ public Class<?> findLoadedClassFromParent(String name) {
+ return findLoadedClass(name);
+ }
+
+ /**
+ * Returns JNLPClassLoader that encompasses this loader
+ *
+ * @return parent JNLPClassLoader
+ */
+ public JNLPClassLoader getParentJNLPClassLoader() {
+ return parentJNLPClassLoader;
+ }
+ }
}
diff -r 64b9d3a8239c -r f1a5201c6b04 netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Thu Mar 03 17:56:00 2011 -0500
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java Fri Mar 04 18:16:07 2011 -0500
@@ -199,8 +199,16 @@
// this needs to be tightened up
for (int i = 0; i < stack.length && i < maxDepth; i++) {
- if (stack[i].getClassLoader() instanceof JNLPClassLoader) {
- JNLPClassLoader loader = (JNLPClassLoader) stack[i].getClassLoader();
+ ClassLoader cl = stack[i].getClassLoader();
+
+ // Since we want to deal with JNLPClassLoader, extract it if this
+ // is a codebase loader
+ if (cl instanceof JNLPClassLoader.CodeBaseClassLoader)
+ cl = ((JNLPClassLoader.CodeBaseClassLoader) cl).getParentJNLPClassLoader();
+
+ if (cl instanceof JNLPClassLoader) {
+
+ JNLPClassLoader loader = (JNLPClassLoader) cl;
if (loader != null && loader.getApplication() != null) {
return loader.getApplication();
diff -r 64b9d3a8239c -r f1a5201c6b04 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu Mar 03 17:56:00 2011 -0500
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri Mar 04 18:16:07 2011 -0500
@@ -1646,7 +1646,14 @@
{
public void run()
{
- ThreadGroup tg = ((JNLPClassLoader) p.applet.getClass().getClassLoader()).getApplication().getThreadGroup();
+ ClassLoader cl = p.applet.getClass().getClassLoader();
+
+ // Since we want to deal with JNLPClassLoader, extract it if this
+ // is a codebase loader
+ if (cl instanceof JNLPClassLoader.CodeBaseClassLoader)
+ cl = ((JNLPClassLoader.CodeBaseClassLoader) cl).getParentJNLPClassLoader();
+
+ ThreadGroup tg = ((JNLPClassLoader) cl).getApplication().getThreadGroup();
appletShutdown(p);
appletPanels.removeElement(p);
More information about the distro-pkg-dev
mailing list