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

[Saad Mohammad]

Hi Adam,

I have implemented all the changes you have suggested from the previous patch 
including these:
-> JNLPClassLoader no longer depend on JNLPFile to determine overwritten main class
-> Optimized code and testcases
-> Removed doubly nested extension reproducers
-> Added comments to jnlp files explaining their differences and purpose

Thanks for looking into the patches. Please see attached files for the updated 
patches.

Changelog:
2012-06-22  Saad Mohammad  <smohammad at redhat.com>

     * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
     (JNLPClassLoader): Accepts an optional parameter that stores the main class
     name and assigns it as the loader's main class.
     (getInstance): Accepts mainName as parameter to override application's
     main class name
     (initializeExtensions): Passes in the name of the application's main class
     when creating a new JNLPClassLoader instance.
     (initializeResources): If the loader owns no jars, it will consider
     itself as signed if all of its extension loaders are signed. Also, if the
     extension jars has the main class, it will assign foundMainJar to true.
     (initializeResources): If the main class was not found, check if it was
     found within the extension jars.
     (checkForMain): Uses the overwritten main class name (if assigned) when
     searching for the main within the jars.
     (hasMainJar): Returns true if this loader holds the main jar.
     (hasMainInExtensions): Returns true if extension loaders have the main jar
     * tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp1.jnlp:
     * tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp2.jnlp:
     * tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp3.jnlp:
     * tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp4.jnlp:
     Launching jnlp that launches SignedJarResource class.
     * tests/jnlp_tests/signed/ExtensionJnlp/resources/ExtensionJnlp5.jnlp:
     Launching jnlp that launches SignedJnlpResource class.
     * tests/jnlp_tests/signed/ExtensionJnlp/testcases/ExtensionJnlpTest.java:
     Testcase that tests the launching of jnlp files containing extension jnlps
     as resource.
     * tests/jnlp_tests/signed/SignedJarResource/resources/SignedJarResource1.jnlp:
     Component jnlp file that is used as an extension resource.
     * tests/jnlp_tests/signed/SignedJarResource/srcs/SignedJarResource.java:
     A simple java class that outputs a string.
     * 
tests/jnlp_tests/signed/SignedJnlpResource/resources/SignedJnlpResource1.jnlp:
     Component jnlp file that is used as an extension resource that does not
     match the signed jnlp file.
     * 
tests/jnlp_tests/signed/SignedJnlpResource/resources/SignedJnlpResource2.jnlp:
     Component jnlp file that is used as an extension resource that matches the
     signed jnlp file.
     * 
tests/jnlp_tests/signed/SignedJnlpResource/srcs/JNLP-INF/APPLICATION_TEMPLATE.jnlp:
     Signed Jnlp File.
     * tests/jnlp_tests/signed/SignedJnlpResource/srcs/SignedJnlpResource.java:
     A simple java class that outputs a string.

>> +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)
>> >
The 2nd assert is there to check if SignedJnlpResource class exists and if it is 
outputting what is expected. Since there is a signed jnlp that does not match 
the launching jnlp, it throws a signed jnlp exception during launch. I was 
checking if the stderr contained this exception to validate whether the resource 
was found. As you can see, this was probably not the best way to do this 
validation because if something went wrong during the signed jnlp check, it will 
fail the test. So in the updated patch, I use a matching launching jnlp file to 
check if SignedJnlpResource class is outputting what is expected.

-- 
Cheers,
Saad Mohammad


-------------- next part --------------
A non-text attachment was scrubbed...
Name: fix03.patch
Type: text/x-patch
Size: 8598 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120622/c3f64dca/fix03.patch 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: reproducers03.patch
Type: text/x-patch
Size: 33489 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20120622/c3f64dca/reproducers03.patch