[RFC][icedtea-web]: Small fix for PR1189 w/ reproducer
Adam Domurad
adomurad at redhat.com
Mon Dec 10 11:13:34 PST 2012
On 12/10/2012 01:12 PM, Saad Mohammad wrote:
> Hi Adam,
>
> Sorry for the late follow-up. I see a lot has changed since the last patch -
> please take a look at the updated patches attached.
>
>
> *Note*
>
> As I mentioned earlier on IRC, Google Chrome does not launch applets that do not
> have a code attribute defined. This is rather unfortunate as the main-class name
> can be found within the jnlp file, if jnlp_href is used.
>
> As for Firefox, however, there is no dependency on the code attribute to
> continue launching the applet. Just like the proprietary plugin, we should also
> avoid the dependency of the code attribute if the information can be found
> elsewhere. In cases where the jnlp file is missing the main-class attribute, it
> will lead to a ParseException resembling similar behaviour of the proprietary
> plugin since it's a requirement in a jnlp applet file.
>
> CHANGELOG - BUG FIX
> ========================================================================
> 2012-12-10 Saad Mohammad <smohammad at redhat.com>
>
> Fix PR1189: Icedtea-plugin requires code attribute when using jnlp_href.
> * netx/net/sourceforge/jnlp/PluginParameters.java (PluginParameters):
> Updated if condition to prevent PluginParameterException from being thrown
> if applet tag contains jnlp_href but is missing code/object parameters.
>
> CHANGELOG - REPRODUCER
> ========================================================================
> 2012-12-10 Saad Mohammad <smohammad at redhat.com>
>
> Add reproducer for PR1189.
> *
> tests/reproducers/simple/AppletTagWithMissingCodeAttribute/resources/AppletTagWithMissingCodeAttribute.html:
> Simple webpage which contains an applet tag with no code attribute.
> *
> tests/reproducers/simple/AppletTagWithMissingCodeAttribute/resources/AppletTagWithMissingCodeAttribute.jnlp:
> Jnlp file that is used by the webpages using jnlp_href.
> *
> tests/reproducers/simple/AppletTagWithMissingCodeAttribute/testcases/AppletTagWithMissingCodeAttribute.java:
> Testcase that tests applets without code attribute in html pages.
> * tests/reproducers/simple/SimpleApplet/srcs/SimpleApplet.java:
> Simple applet class that outputs a string.
>
>
>
>
Thanks for the update! comments below.
> diff --git a/netx/net/sourceforge/jnlp/PluginParameters.java b/netx/net/sourceforge/jnlp/PluginParameters.java
> --- a/netx/net/sourceforge/jnlp/PluginParameters.java
> +++ b/netx/net/sourceforge/jnlp/PluginParameters.java
> @@ -54,7 +54,8 @@
> this.parameters = createParameterTable(params);
>
> if (this.parameters.get("code") == null
> - && this.parameters.get("object") == null) {
> + && this.parameters.get("object") == null
> + && this.parameters.get("jnlp_href") == null) {
> throw new PluginParameterException(R("BNoCodeOrObjectApplet"));
> }
> }
Is this all that is currently needed, ie are the main-class-name related
changes from the previous patch already added ?
A comment here about why jnlp_href causes the exception not to occur may
be good.
Can you take a look at the unit test (PluginParametersTest) and add
something that executes this code-path (ie has a jnlp_href but not the
other two) ?
Otherwise good.
> diff --git a/tests/reproducers/simple/AppletTagWithMissingCodeAttribute/resources/AppletJnlpWithMainClass.jnlp b/tests/reproducers/simple/AppletTagWithMissingCodeAttribute/resources/AppletJnlpWithMainClass.jnlp
> new file mode 100644
> --- /dev/null
> +++ b/tests/reproducers/simple/AppletTagWithMissingCodeAttribute/resources/AppletJnlpWithMainClass.jnlp
> @@ -0,0 +1,57 @@
> +<!--
> +This file is part of IcedTea.
> +
> +IcedTea is free software; you can redistribute it and/or modify
> +it under the terms of the GNU General Public License as published by
> +the Free Software Foundation; either version 2, or (at your option)
> +any later version.
> +
> +IcedTea is distributed in the hope that it will be useful, but
> +WITHOUT ANY WARRANTY; without even the implied warranty of
> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> +General Public License for more details.
> +
> +You should have received a copy of the GNU General Public License
> +along with IcedTea; see the file COPYING. If not, write to the
> +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> +02110-1301 USA.
> +
> +Linking this library statically or dynamically with other modules is
> +making a combined work based on this library. Thus, the terms and
> +conditions of the GNU General Public License cover the whole
> +combination.
> +
> +As a special exception, the copyright holders of this library give you
> +permission to link this library with independent modules to produce an
> +executable, regardless of the license terms of these independent
> +modules, and to copy and distribute the resulting executable under
> +terms of your choice, provided that you also meet, for each linked
> +independent module, the terms and conditions of the license of that
> +module. An independent module is a module which is not derived from
> +or based on this library. If you modify this library, you may extend
> +this exception to your version of the library, but you are not
> +obligated to do so. If you do not wish to do so, delete this
> +exception statement from your version.
> +
> +-->
> +<?xml version="1.0" encoding="utf-8"?>
> +<jnlp spec="1.0" href="AppletJnlpWithMainClass.jnlp">
> + <information>
> + <title>AppletJnlpWithMainClass</title>
> + <vendor>IcedTea</vendor>
> + <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
> + <description>AppletJnlpWithMainClass</description>
> + <offline/>
> + </information>
> + <resources>
> + <j2se version="1.4+"/>
> + <jar href="SimpleApplet.jar"/>
> + </resources>
> + <applet-desc
> + documentBase="."
> + name="SimpleApplet"
> + main-class="SimpleApplet"
> + width="100"
> + height="100">
> + </applet-desc>
> +</jnlp>
> diff --git a/tests/reproducers/simple/AppletTagWithMissingCodeAttribute/resources/AppletTagWithMissingCodeAttribute.html b/tests/reproducers/simple/AppletTagWithMissingCodeAttribute/resources/AppletTagWithMissingCodeAttribute.html
> new file mode 100644
> --- /dev/null
> +++ b/tests/reproducers/simple/AppletTagWithMissingCodeAttribute/resources/AppletTagWithMissingCodeAttribute.html
> @@ -0,0 +1,44 @@
> +<!--
> +This file is part of IcedTea.
> +
> +IcedTea is free software; you can redistribute it and/or modify
> +it under the terms of the GNU General Public License as published by
> +the Free Software Foundation; either version 2, or (at your option)
> +any later version.
> +
> +IcedTea is distributed in the hope that it will be useful, but
> +WITHOUT ANY WARRANTY; without even the implied warranty of
> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> +General Public License for more details.
> +
> +You should have received a copy of the GNU General Public License
> +along with IcedTea; see the file COPYING. If not, write to the
> +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> +02110-1301 USA.
> +
> +Linking this library statically or dynamically with other modules is
> +making a combined work based on this library. Thus, the terms and
> +conditions of the GNU General Public License cover the whole
> +combination.
> +
> +As a special exception, the copyright holders of this library give you
> +permission to link this library with independent modules to produce an
> +executable, regardless of the license terms of these independent
> +modules, and to copy and distribute the resulting executable under
> +terms of your choice, provided that you also meet, for each linked
> +independent module, the terms and conditions of the license of that
> +module. An independent module is a module which is not derived from
> +or based on this library. If you modify this library, you may extend
> +this exception to your version of the library, but you are not
> +obligated to do so. If you do not wish to do so, delete this
> +exception statement from your version.
> +
> + -->
> +<html><head></head><body bgcolor="black">
> +<p>
> + <applet width="800" height="600">
> + <param name="jnlp_href" value="AppletJnlpWithMainClass.jnlp">
> + </applet>
> +</p>
> +</body>
> +</html>
> diff --git a/tests/reproducers/simple/AppletTagWithMissingCodeAttribute/testcases/AppletTagWithMissingCodeAttribute.java b/tests/reproducers/simple/AppletTagWithMissingCodeAttribute/testcases/AppletTagWithMissingCodeAttribute.java
> new file mode 100644
> --- /dev/null
> +++ b/tests/reproducers/simple/AppletTagWithMissingCodeAttribute/testcases/AppletTagWithMissingCodeAttribute.java
> @@ -0,0 +1,57 @@
> +/* AppletTagWithMissingCodeAttribute.java
> + Copyright (C) 2012 Red Hat, Inc.
> +
> +This file is part of IcedTea.
> +
> +IcedTea is free software; you can redistribute it and/or
> +modify it under the terms of the GNU General Public License as published by
> +the Free Software Foundation, version 2.
> +
> +IcedTea is distributed in the hope that it will be useful,
> +but WITHOUT ANY WARRANTY; without even the implied warranty of
> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> +General Public License for more details.
> +
> +You should have received a copy of the GNU General Public License
> +along with IcedTea; see the file COPYING. If not, write to
> +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> +02110-1301 USA.
> +
> +Linking this library statically or dynamically with other modules is
> +making a combined work based on this library. Thus, the terms and
> +conditions of the GNU General Public License cover the whole
> +combination.
> +
> +As a special exception, the copyright holders of this library give you
> +permission to link this library with independent modules to produce an
> +executable, regardless of the license terms of these independent
> +modules, and to copy and distribute the resulting executable under
> +terms of your choice, provided that you also meet, for each linked
> +independent module, the terms and conditions of the license of that
> +module. An independent module is a module which is not derived from
> +or based on this library. If you modify this library, you may extend
> +this exception to your version of the library, but you are not
> +obligated to do so. If you do not wish to do so, delete this
> +exception statement from your version.
> +*/
> +
> +import junit.framework.Assert;
> +import net.sourceforge.jnlp.ProcessResult;
> +import net.sourceforge.jnlp.ServerAccess.AutoClose;
> +import net.sourceforge.jnlp.browsertesting.BrowserTest;
> +import net.sourceforge.jnlp.browsertesting.Browsers;
> +import net.sourceforge.jnlp.closinglisteners.AutoOkClosingListener;
> +import net.sourceforge.jnlp.annotations.TestInBrowsers;
> +import org.junit.Test;
> +
> +public class AppletTagWithMissingCodeAttribute extends BrowserTest {
> +
> + final static String closingString = AutoOkClosingListener.MAGICAL_OK_CLOSING_STRING;
> +
> + @Test
> + @TestInBrowsers(testIn = { Browsers.firefox })
> + public void EmbeddedAppletWithMissingCodeAttribute() throws Exception {
> + ProcessResult pr = server.executeBrowser("/AppletTagWithMissingCodeAttribute.html", AutoClose.CLOSE_ON_CORRECT_END);
> + Assert.assertTrue("Stdout should contain " + closingString + " but did not", pr.stdout.contains(closingString));
> + }
> +}
> diff --git a/tests/reproducers/simple/SimpleApplet/srcs/SimpleApplet.java b/tests/reproducers/simple/SimpleApplet/srcs/SimpleApplet.java
> new file mode 100644
> --- /dev/null
> +++ b/tests/reproducers/simple/SimpleApplet/srcs/SimpleApplet.java
> @@ -0,0 +1,47 @@
> +/* SimpleApplet.java
> +Copyright (C) 2011 Red Hat, Inc.
> +
> +This file is part of IcedTea.
> +
> +IcedTea is free software; you can redistribute it and/or
> +modify it under the terms of the GNU General Public License as published by
> +the Free Software Foundation, version 2.
> +
> +IcedTea is distributed in the hope that it will be useful,
> +but WITHOUT ANY WARRANTY; without even the implied warranty of
> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> +General Public License for more details.
> +
> +You should have received a copy of the GNU General Public License
> +along with IcedTea; see the file COPYING. If not, write to
> +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> +02110-1301 USA.
> +
> +Linking this library statically or dynamically with other modules is
> +making a combined work based on this library. Thus, the terms and
> +conditions of the GNU General Public License cover the whole
> +combination.
> +
> +As a special exception, the copyright holders of this library give you
> +permission to link this library with independent modules to produce an
> +executable, regardless of the license terms of these independent
> +modules, and to copy and distribute the resulting executable under
> +terms of your choice, provided that you also meet, for each linked
> +independent module, the terms and conditions of the license of that
> +module. An independent module is a module which is not derived from
> +or based on this library. If you modify this library, you may extend
> +this exception to your version of the library, but you are not
> +obligated to do so. If you do not wish to do so, delete this
> +exception statement from your version.
> + */
> +
> +import java.applet.Applet;
> +
> + at SuppressWarnings("serial")
> +public class SimpleApplet extends Applet {
> +
> + @Override
> + public void start() {
> + System.out.println("*** APPLET FINISHED ***");
> + }
> +}
Reproducer looks good.
Happy hacking,
- Adam
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121210/826aabe6/attachment.html
More information about the distro-pkg-dev
mailing list