[RFC]: implement codebase_lookup for applets

[Deepak Bhole]

* Denis Lila <dlila at redhat.com> [2011-03-25 18:02]:
> > Either the "|| file.getResources().getJARs().length == 0" condition
> > should be
> > kept, or a proper error should be thrown when codebase_lookup == false
> > and jar length is 0. I am in favor of the latter.
> 
> Good point. I've updated the patch.
>

Looks good to me. Okay for head.

Cheers,
Deepak
 
> Thank you,
> Denis.
> 
> ----- Original Message -----
> > * Denis Lila <dlila at redhat.com> [2011-03-25 17:13]:
> > > Hi.
> > >
> > >
> > <snip>
> > > - if (enableCodeBase || file.getResources().getJARs().length == 0)
> > > + if (enableCodeBase)
> > <snip>
> > >              JNLPClassLoader loader =
> > >              JNLPClassLoader.getInstance(file, updatePolicy);
> > >
> > > - if (enableCodeBase || file.getResources().getJARs().length == 0)
> > > + if (enableCodeBase)
> > 
> 
> > 
> > Without that, if there is no jar and codebase_lookup is false, it will
> > fail with an NPE when loadClass fails to get the main class.
> > 
> > Cheers,
> > Deepak
> > 
> > >                  loader.enableCodeBase();
> > >
> > >              String appletName = file.getApplet().getMainClass();
> > > @@ -742,7 +742,7 @@
> > >                  if (isPlugin) {
> > >                      // Do not display download indicators if we're
> > >                      using gcjwebplugin.
> > >                      JNLPRuntime.setDefaultDownloadIndicator(null);
> > > - application = getApplet(file, true, cont);
> > > + application = getApplet(file,
> > > ((PluginBridge)file).codeBaseLookup(), cont);
> > >                  } else {
> > >                      if (file.isApplication())
> > >                          application = launchApplication(file);
> > > diff -r 92486f15be36 netx/net/sourceforge/jnlp/PluginBridge.java
> > > --- a/netx/net/sourceforge/jnlp/PluginBridge.java Thu Mar 24
> > > 09:34:51 2011 -0400
> > > +++ b/netx/net/sourceforge/jnlp/PluginBridge.java Fri Mar 25
> > > 13:11:02 2011 -0400
> > > @@ -42,6 +42,7 @@
> > >      Hashtable<String, String> atts;
> > >      private boolean usePack;
> > >      private boolean useVersion;
> > > + private boolean codeBaseLookup;
> > >
> > >      public PluginBridge(URL codebase, URL documentBase, String jar,
> > >      String main,
> > >                          int width, int height, Hashtable<String,
> > >                          String> atts)
> > > @@ -152,6 +153,12 @@
> > >                  }
> > >              }
> > >          }
> > > + String cbl = atts.get("codebase_lookup");
> > > + codeBaseLookup = cbl == null || (Boolean.valueOf(cbl));
> > > + }
> > > +
> > > + public boolean codeBaseLookup() {
> > > + return codeBaseLookup;
> > >      }
> > >
> > >      /**

> diff -r 92486f15be36 ChangeLog
> --- a/ChangeLog	Thu Mar 24 09:34:51 2011 -0400
> +++ b/ChangeLog	Fri Mar 25 13:58:05 2011 -0400
> @@ -1,3 +1,12 @@
> +2011-03-25  Denis Lila <dlila at redhat.com>
> +
> +	* netx/net/sourceforge/jnlp/PluginBridge.java
> +	(codeBaseLookup): new member and getter for it.
> +	(PluginBridge): set codeBaseLookup.
> +	* netx/net/sourceforge/jnlp/Launcher.java:
> +	(createApplet, createAppletObject): call enableCodeBase() if and
> +	only if the enableCodeBase argument is true.
> +
>  2011-03-24  Omair Majid  <omajid at redhat.com>
>  
>  	* Makefile.am (EXTRA_DIST): Add $(top_srcdir)/tests.
> diff -r 92486f15be36 NEWS
> --- a/NEWS	Thu Mar 24 09:34:51 2011 -0400
> +++ b/NEWS	Fri Mar 25 13:58:05 2011 -0400
> @@ -16,6 +16,7 @@
>    - IcedTea-Web now installs to a FHS-compliant location
>    - IcedTea-Web can now handle Proxy Auto Config files
>    - Binary launchers replaced with simple shell scripts
> +  - Can now use codebase_lookup=false with applets.
>  * Common Fixes and Improvements
>    - PR497: Mercurial revision detection not very reliable
>    - PR638: JNLPClassLoader.loadClass(String name) can return null
> diff -r 92486f15be36 netx/net/sourceforge/jnlp/Launcher.java
> --- a/netx/net/sourceforge/jnlp/Launcher.java	Thu Mar 24 09:34:51 2011 -0400
> +++ b/netx/net/sourceforge/jnlp/Launcher.java	Fri Mar 25 13:58:05 2011 -0400
> @@ -563,8 +563,11 @@
>          try {
>              JNLPClassLoader loader = JNLPClassLoader.getInstance(file, updatePolicy);
>  
> -            if (enableCodeBase || file.getResources().getJARs().length == 0)
> +            if (enableCodeBase) {
>                  loader.enableCodeBase();
> +            } else if (file.getResources().getJARs().length == 0) {
> +                throw new ClassNotFoundException("Can't do a codebase look up and there are no jars. Failing sooner rather than later");
> +            }
>  
>              AppThreadGroup group = (AppThreadGroup) Thread.currentThread().getThreadGroup();
>  
> @@ -603,8 +606,11 @@
>          try {
>              JNLPClassLoader loader = JNLPClassLoader.getInstance(file, updatePolicy);
>  
> -            if (enableCodeBase || file.getResources().getJARs().length == 0)
> +            if (enableCodeBase) {
>                  loader.enableCodeBase();
> +            } else if (file.getResources().getJARs().length == 0) {
> +                throw new ClassNotFoundException("Can't do a codebase look up and there are no jars. Failing sooner rather than later");
> +            }
>  
>              String appletName = file.getApplet().getMainClass();
>  
> @@ -742,7 +748,7 @@
>                  if (isPlugin) {
>                      // Do not display download indicators if we're using gcjwebplugin.
>                      JNLPRuntime.setDefaultDownloadIndicator(null);
> -                    application = getApplet(file, true, cont);
> +                    application = getApplet(file, ((PluginBridge)file).codeBaseLookup(), cont);
>                  } else {
>                      if (file.isApplication())
>                          application = launchApplication(file);
> diff -r 92486f15be36 netx/net/sourceforge/jnlp/PluginBridge.java
> --- a/netx/net/sourceforge/jnlp/PluginBridge.java	Thu Mar 24 09:34:51 2011 -0400
> +++ b/netx/net/sourceforge/jnlp/PluginBridge.java	Fri Mar 25 13:58:05 2011 -0400
> @@ -24,7 +24,6 @@
>  
>  import java.net.URL;
>  import java.net.MalformedURLException;
> -import java.util.Calendar;
>  import java.util.Hashtable;
>  import java.util.Locale;
>  import java.util.List;
> @@ -42,6 +41,7 @@
>      Hashtable<String, String> atts;
>      private boolean usePack;
>      private boolean useVersion;
> +    private boolean codeBaseLookup;
>  
>      public PluginBridge(URL codebase, URL documentBase, String jar, String main,
>                          int width, int height, Hashtable<String, String> atts)
> @@ -152,6 +152,12 @@
>                  }
>              }
>          }
> +        String cbl = atts.get("codebase_lookup");
> +        codeBaseLookup = cbl == null || (Boolean.valueOf(cbl));
> +    }
> +
> +    public boolean codeBaseLookup() {
> +    	return codeBaseLookup;
>      }
>  
>      /**