[RFC][icedtea-web]: Fix for PR1040, PR1041, PR1042 w/ reproducers

Adam Domurad adomurad at redhat.com
Fri Jun 22 11:03:00 PDT 2012


Reproducers look good, however there are 7 similar ExtensionJnlp files,
and 3 similar SignedJarResource files, could you perhaps give them names
signifying their differences ? 

>From what I understand, SignedJarResource3 is brought through an
extension, and brings in a jnlp extension, that brings in another jnlp
extension (I may be mistaken in the intent ? Descriptive names would
help here). In interest of keeping the tests simple, I would recommend
not doing more than a singly nested extension. 

Also, it would be easier if you pasted your change logs into the content
of your message.

Some small comments inline.

> diff --git a/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp1.jnlp b/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp1.jnlp
> new file mode 100644
> --- /dev/null
> +++ b/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp1.jnlp
> @@ -0,0 +1,59 @@
> +<!--
> +
> +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="ExtensionJnlp1.jnlp" codebase=".">
> +  <information>
> +    <title>ExtensionJnlp</title>
> +    <vendor>IcedTea</vendor>
> +    <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
> +    <description>ExtensionJnlp</description>
> +    <offline/>
> +  </information>
> +
> +  <security>
> +      <all-permissions/>
> +  </security> 
> +
> +  <resources>
> +    <j2se version="1.6+"/>
> +    <extension name="SignedJarResource1"   href="./SignedJarResource1.jnlp"/>
> +  </resources>
> +
> +  <application-desc main-class="SignedJarResource">
> +  </application-desc>
> +</jnlp>
> diff --git a/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp2.jnlp b/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp2.jnlp
> new file mode 100644
> --- /dev/null
> +++ b/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp2.jnlp
> @@ -0,0 +1,59 @@
> +<!--
> +
> +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="ExtensionJnlp2.jnlp" codebase=".">
> +  <information>
> +    <title>ExtensionJnlp</title>
> +    <vendor>IcedTea</vendor>
> +    <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
> +    <description>ExtensionJnlp</description>
> +    <offline/>
> +  </information>
> +
> +  <security>
> +      <all-permissions/>
> +  </security> 
> +
> +  <resources>
> +    <j2se version="1.6+"/>
> +    <extension name="SignedJarResource2"   href="./SignedJarResource2.jnlp"/>
> +  </resources>
> +
> +  <application-desc main-class="SignedJarResource">
> +  </application-desc>
> +</jnlp>
> diff --git a/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp3.jnlp b/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp3.jnlp
> new file mode 100644
> --- /dev/null
> +++ b/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp3.jnlp
> @@ -0,0 +1,60 @@
> +<!--
> +
> +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="ExtensionJnlp3.jnlp" codebase=".">
> +  <information>
> +    <title>ExtensionJnlp</title>
> +    <vendor>IcedTea</vendor>
> +    <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
> +    <description>ExtensionJnlp</description>
> +    <offline/>
> +  </information>
> +
> +  <security>
> +      <all-permissions/>
> +  </security> 
> +
> +  <resources>
> +    <j2se version="1.6+"/>
> +    <jar href="SignedJnlpResource.jar" main="false"/>
> +    <extension name="SignedJarResource1"   href="./SignedJarResource1.jnlp"/>
> +  </resources>
> +
> +  <application-desc main-class="SignedJarResource">
> +  </application-desc>
> +</jnlp>
> diff --git a/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp4.jnlp b/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp4.jnlp
> new file mode 100644
> --- /dev/null
> +++ b/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp4.jnlp
> @@ -0,0 +1,59 @@
> +<!--
> +
> +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="ExtensionJnlp4.jnlp" codebase=".">
> +  <information>
> +    <title>ExtensionJnlp</title>
> +    <vendor>IcedTea</vendor>
> +    <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
> +    <description>ExtensionJnlp</description>
> +    <offline/>
> +  </information>
> +
> +  <security>
> +      <all-permissions/>
> +  </security> 
> +
> +  <resources>
> +    <j2se version="1.6+"/>
> +    <extension name="SignedJnlpResource1"   href="./SignedJnlpResource1.jnlp"/>
> +  </resources>
> +
> +  <application-desc main-class="SignedJnlpResource">
> +  </application-desc>
> +</jnlp>
> diff --git a/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp5.jnlp b/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp5.jnlp
> new file mode 100644
> --- /dev/null
> +++ b/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp5.jnlp
> @@ -0,0 +1,59 @@
> +<!--
> +
> +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="ExtensionJnlp5.jnlp" codebase=".">
> +  <information>
> +    <title>ExtensionJnlp</title>
> +    <vendor>IcedTea</vendor>
> +    <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
> +    <description>ExtensionJnlp</description>
> +    <offline/>
> +  </information>
> +
> +  <security>
> +      <all-permissions/>
> +  </security> 
> +
> +  <resources>
> +    <j2se version="1.6+"/>
> +    <extension name="SignedJnlpResource3"   href="./SignedJarResource3.jnlp"/>
> +  </resources>
> +
> +  <application-desc main-class="SignedJnlpResource">
> +  </application-desc>
> +</jnlp>
> diff --git a/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp6.jnlp b/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp6.jnlp
> new file mode 100644
> --- /dev/null
> +++ b/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp6.jnlp
> @@ -0,0 +1,59 @@
> +<!--
> +
> +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="ExtensionJnlp6.jnlp" codebase=".">
> +  <information>
> +    <title>ExtensionJnlp</title>
> +    <vendor>IcedTea</vendor>
> +    <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
> +    <description>ExtensionJnlp</description>
> +    <offline/>
> +  </information>
> +
> +  <security>
> +      <all-permissions/>
> +  </security> 
> +
> +  <resources>
> +    <j2se version="1.6+"/>
> +    <jar href="SignedJarResource.jar" main="true"/>
> +  </resources>
> +
> +  <application-desc main-class="SignedJarResource">
> +  </application-desc>
> +</jnlp>
> diff --git a/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp7.jnlp b/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp7.jnlp
> new file mode 100644
> --- /dev/null
> +++ b/tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp7.jnlp
> @@ -0,0 +1,59 @@
> +<!--
> +
> +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="ExtensionJnlp7.jnlp" codebase=".">
> +  <information>
> +    <title>ExtensionJnlp</title>
> +    <vendor>IcedTea</vendor>
> +    <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
> +    <description>ExtensionJnlp</description>
> +    <offline/>
> +  </information>
> +
> +  <security>
> +      <all-permissions/>
> +  </security> 
> +
> +  <resources>
> +    <j2se version="1.6+"/>
> +    <jar href="SignedJnlpResource.jar" main="true"/>
> +  </resources>
> +
> +  <application-desc main-class="SignedJnlpResource">
> +  </application-desc>
> +</jnlp>
> diff --git a/tests/jnlp_tests/signed/ExtensionJnlp/testcases/ExtensionJnlpTest.java b/tests/jnlp_tests/signed/ExtensionJnlp/testcases/ExtensionJnlpTest.java
> new file mode 100644
> --- /dev/null
> +++ b/tests/jnlp_tests/signed/ExtensionJnlp/testcases/ExtensionJnlpTest.java
> @@ -0,0 +1,99 @@
> +/* ExtensionJnlpTest.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 java.util.Arrays;
> +import java.util.Collections;
> +import java.util.List;
> +import net.sourceforge.jnlp.ServerAccess;
> +import net.sourceforge.jnlp.annotations.Bug;
> +
> +import org.junit.Assert;
> +import org.junit.Test;
> +
> +public class ExtensionJnlpTest {
> +
> +    private static ServerAccess server = new ServerAccess();
> +    private final List<String> l = Collections.unmodifiableList(Arrays.asList(new String[] { "-Xtrustall" }));
> +    private final String jarOutput = "Running SignedJarResource..";
> +    private final String signedJnlpException = "net.sourceforge.jnlp.LaunchException: Fatal: Application Error: "
> +            + "The signed JNLP file did not match the launching JNLP file. Missing Resource: Signed Application "
> +            + "did not match launching JNLP File";
> +
> +    @Test
> +    public void checkingForRequiredResources() throws Exception {
> +        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/ExtensionJnlp6.jnlp");
> +        Assert.assertTrue("Could not locate SignedJarResource", pr.stdout.contains(jarOutput));
> +
> +        pr = server.executeJavawsHeadless(l, "/ExtensionJnlp7.jnlp");
> +        Assert.assertTrue("Could not locate SignedJnlpResource", pr.stderr.contains(signedJnlpException));
A correct message would be something about receiving the expected exception.

What does this 2nd assert attempt to test ? (Just asking, as I don't
know why this exception is happening)
> +    }
> +
> +    @Bug(id="PR1040")
> +    @Test
> +    public void usingSignedExtension() throws Exception {
> +        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/ExtensionJnlp1.jnlp");
> +        Assert.assertTrue("Stdout should contains " + jarOutput + " but did not", pr.stdout.contains(jarOutput));
Could you change this to 'should contain' for this and the ones below ? I know this was copy pasted but I can't help nitpick : )
> +    }
> +
> +    @Bug(id="PR1040")
> +    @Test
> +    public void usingNestedExtensionJars() throws Exception {
> +        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/ExtensionJnlp2.jnlp");
> +        Assert.assertTrue("Stdout should contains " + jarOutput + " but did not", pr.stdout.contains(jarOutput));
> +    }
> +
> +    @Bug(id="PR1041")
> +    @Test
> +    public void mainJarInExtension() throws Exception {
> +        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/ExtensionJnlp3.jnlp");
> +        Assert.assertTrue("Stdout should contains " + jarOutput + " but did not", pr.stdout.contains(jarOutput));
> +    }
> +
> +    @Bug(id="PR1042")
> +    @Test
> +    public void checkingSignedJnlpInExtension() throws Exception {
> +        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/ExtensionJnlp4.jnlp");
> +        Assert.assertTrue("Stdout should contains " + signedJnlpException + " but did not", pr.stderr.contains(signedJnlpException));
> +    }
> +
> +    @Bug(id="PR1042")
> +    @Test
> +    public void checkingSignedJnlpInNestedExtension() throws Exception {
> +        ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/ExtensionJnlp5.jnlp");
> +        Assert.assertTrue("Stdout should contains " + signedJnlpException + " but did not", pr.stderr.contains(signedJnlpException));
> +    }
> +}
> diff --git a/tests/jnlp_tests/signed/SignedJarResource/resources/SignedJarResource1.jnlp b/tests/jnlp_tests/signed/SignedJarResource/resources/SignedJarResource1.jnlp
> new file mode 100644
> --- /dev/null
> +++ b/tests/jnlp_tests/signed/SignedJarResource/resources/SignedJarResource1.jnlp
> @@ -0,0 +1,58 @@
> +<!--
> +
> +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="SignedJarResource1.jnlp" codebase=".">
> +  <information>
> +    <title>SignedJarResource</title>
> +    <vendor>IcedTea</vendor>
> +    <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
> +    <description>SignedJarResource</description>
> +    <offline/>
> +  </information>
> +
> +  <security>
> +      <all-permissions/>
> +  </security> 
> +
> +  <resources>
> +    <j2se version="1.6+"/>
> +    <jar href="SignedJarResource.jar" main="true"/>
> +  </resources>
> +
> +  <component-desc />
> +</jnlp>
> diff --git a/tests/jnlp_tests/signed/SignedJarResource/resources/SignedJarResource2.jnlp b/tests/jnlp_tests/signed/SignedJarResource/resources/SignedJarResource2.jnlp
> new file mode 100644
> --- /dev/null
> +++ b/tests/jnlp_tests/signed/SignedJarResource/resources/SignedJarResource2.jnlp
> @@ -0,0 +1,58 @@
> +<!--
> +
> +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="SignedJarResource2.jnlp" codebase=".">
> +  <information>
> +    <title>SignedJarResource</title>
> +    <vendor>IcedTea</vendor>
> +    <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
> +    <description>SignedJarResource</description>
> +    <offline/>
> +  </information>
> +
> +  <security>
> +      <all-permissions/>
> +  </security> 
> +
> +  <resources>
> +    <j2se version="1.6+"/>
> +    <extension name="SignedJarResource1"   href="./SignedJarResource1.jnlp"/>
> +  </resources>
> +
> +  <component-desc />
> +</jnlp>
> diff --git a/tests/jnlp_tests/signed/SignedJarResource/resources/SignedJarResource3.jnlp b/tests/jnlp_tests/signed/SignedJarResource/resources/SignedJarResource3.jnlp
> new file mode 100644
> --- /dev/null
> +++ b/tests/jnlp_tests/signed/SignedJarResource/resources/SignedJarResource3.jnlp
> @@ -0,0 +1,58 @@
> +<!--
> +
> +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="SignedJarResource3.jnlp" codebase=".">
> +  <information>
> +    <title>SignedJarResource</title>
> +    <vendor>IcedTea</vendor>
> +    <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
> +    <description>SignedJarResource</description>
> +    <offline/>
> +  </information>
> +
> +  <security>
> +      <all-permissions/>
> +  </security> 
> +
> +  <resources>
> +    <j2se version="1.6+"/>
> +    <extension name="SignedJnlpResource2"   href="./SignedJnlpResource2.jnlp"/>
> +  </resources>
> +
> +  <component-desc />
> +</jnlp>
> diff --git a/tests/jnlp_tests/signed/SignedJarResource/srcs/SignedJarResource.java b/tests/jnlp_tests/signed/SignedJarResource/srcs/SignedJarResource.java
> new file mode 100644
> --- /dev/null
> +++ b/tests/jnlp_tests/signed/SignedJarResource/srcs/SignedJarResource.java
> @@ -0,0 +1,43 @@
> +/* SignedJarResource.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.
> + */
> +
> +public class SignedJarResource {
> +
> +    public static void main(String[] args){
> +        System.out.println("Running SignedJarResource..");
> +    }
> +}
> diff --git a/tests/jnlp_tests/signed/SignedJnlpResource/resources/SignedJnlpResource1.jnlp b/tests/jnlp_tests/signed/SignedJnlpResource/resources/SignedJnlpResource1.jnlp
> new file mode 100644
> --- /dev/null
> +++ b/tests/jnlp_tests/signed/SignedJnlpResource/resources/SignedJnlpResource1.jnlp
> @@ -0,0 +1,58 @@
> +<!--
> +
> +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="SignedJnlpResource1.jnlp" codebase=".">
> +  <information>
> +    <title>SignedJnlpResource</title>
> +    <vendor>IcedTea</vendor>
> +    <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
> +    <description>SignedJnlpResource</description>
> +    <offline/>
> +  </information>
> +
> +  <security>
> +      <all-permissions/>
> +  </security> 
> +
> +  <resources>
> +    <j2se version="1.6+"/>
> +    <jar href="SignedJnlpResource.jar" main="true"/>
> +  </resources>
> +
> +  <component-desc />
> +</jnlp>
> diff --git a/tests/jnlp_tests/signed/SignedJnlpResource/resources/SignedJnlpResource2.jnlp b/tests/jnlp_tests/signed/SignedJnlpResource/resources/SignedJnlpResource2.jnlp
> new file mode 100644
> --- /dev/null
> +++ b/tests/jnlp_tests/signed/SignedJnlpResource/resources/SignedJnlpResource2.jnlp
> @@ -0,0 +1,58 @@
> +<!--
> +
> +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="SignedJnlpResource2.jnlp" codebase=".">
> +  <information>
> +    <title>SignedJnlpResource</title>
> +    <vendor>IcedTea</vendor>
> +    <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
> +    <description>SignedJnlpResource</description>
> +    <offline/>
> +  </information>
> +
> +  <security>
> +      <all-permissions/>
> +  </security> 
> +
> +  <resources>
> +    <j2se version="1.6+"/>
> +    <extension name="SignedJnlpResource1"   href="./SignedJnlpResource1.jnlp"/>
> +  </resources>
> +
> +  <component-desc />
> +</jnlp>
> diff --git a/tests/jnlp_tests/signed/SignedJnlpResource/srcs/JNLP-INF/APPLICATION_TEMPLATE.jnlp b/tests/jnlp_tests/signed/SignedJnlpResource/srcs/JNLP-INF/APPLICATION_TEMPLATE.jnlp
> new file mode 100644
> --- /dev/null
> +++ b/tests/jnlp_tests/signed/SignedJnlpResource/srcs/JNLP-INF/APPLICATION_TEMPLATE.jnlp
> @@ -0,0 +1,62 @@
> +<!--
> +
> +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="*" codebase=".">
> +  <information>
> +    <title>DoesNotMatchLaunchingJnlpFile</title>
> +    <vendor>IcedTea</vendor>
> +    <homepage href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/>
> +    <description>*</description>
> +    <offline/>
> +  </information>
> +
> +  <security>
> +      <all-permissions/>
> +  </security> 
> +
> +   <resources>
> +        <property name="*" value="*"/>
> +   </resources>
> +
> +  <resources>
> +    <j2se version="1.6+"/>
> +    <jar href="DoesNotMatchLaunchingJnlpFile.jar"/>
> +  </resources>
> +  <application-desc main-class="DoesNotMatchLaunchingJnlpFile">
> +  </application-desc>
> +</jnlp>
> diff --git a/tests/jnlp_tests/signed/SignedJnlpResource/srcs/SignedJnlpResource.java b/tests/jnlp_tests/signed/SignedJnlpResource/srcs/SignedJnlpResource.java
> new file mode 100644
> --- /dev/null
> +++ b/tests/jnlp_tests/signed/SignedJnlpResource/srcs/SignedJnlpResource.java
> @@ -0,0 +1,43 @@
> +/* SignedJnlpResource..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.
> + */
> +
> +public class SignedJnlpResource {
> +
> +    public static void main(String[] args){
> +        System.out.println("Running SignedJnlpResource...");
> +    }
> +}




More information about the distro-pkg-dev mailing list