gmane.comp.java.openjdk.distro-packaging.devel

[rfc][icedtea-web] handling of multiple testing certificates in bulk

Jiri Vanek — 2012-05-26T19:56:02

Hi!

There come an need to test applications consisted from several jars, each signed by different certificate. Also there is need to work with diferent certificates in custom-makefiles reproducers.
This changeset is introducing unlimited number of certificates for future purposes.
Even if this multiple certs will never be used, I'm for put it in, because it is gathering copy pasted code to variables.

J.


* Makefile.am: EXPORTED_TEST_CERT by EXPORTED_TEST_CERT_PREFIX and EXPORTED_TEST_CERT_SUFIX for further composition
SIGNED_REPRODUCERS new variable for  iterating through signed reproducers
SIMPLE_REPRODUCERS new variable for  iterating through simple reproducers
ALL_REPRODUCER new variable for  iterating through all reproducers
(junit-jnlp-dist-signed.txt) replaced by (stamps/junit-jnlp-dist-signed.stamp) which generates junit-jnlp-dist-signedX.txt for each directory with signed reproducers
(stamps/netx-dist-tests-prepare-reproducers.stamp) (stamps/change-dots-to-paths.stamp) (stamps/netx-dist-test

[rfc] [icedtea-web] reproducers with custom makefile

Jiri Vanek — 2012-05-26T19:39:32

Hi!

We have been speaking with Danes that although current reproducers compilation and signing mechanism is very powerful, sometimes it really can not cover some extraordinary case.
For this purpose we ahve come with idea to have special class of reproducers (next to signed and simple) - in this patch called custom - which will have its own makefile and will take care for itself.
This is implementation of this idea. What do you think? both for idea and implementation :)

One think I do not like on this change -  exporting of variables. In plain Makefile I would use "export". It looks like in Automake this is not possible. (I suspect comaptibility issues gnu x normal make), so I have exported most crucial variables manually.
When I saw result Makefile I was wandering that the makefile is still working.... Well loks like was working correctly. Any hint welcomed!

J.

* Makefile.am:  Most crucial variables exported to be used by custom Makefiles
(junit-jnlp-dist-custom.txt): new target scanning for directori

[Bug 1013] New: Icedtea

2012-05-26T16:17:24

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1013

          Priority: P3
            Bug ID: 1013
                CC: unassigned-HMOWzH9t1bryS2n3IP37Vh1hho49/T1E< at >public.gmane.org
          Assignee: xerxes-AlRT2CgK2nOzQB+pC5nmwQ< at >public.gmane.org
           Summary: Icedtea
          Severity: critical
    Classification: Unclassified
                OS: Linux
          Reporter: imc.coder-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org
          Hardware: x86
            Status: NEW
           Version: 7-1.0
         Component: JamVM
           Product: IcedTea

#
# A fatal error has been detected by the Java Runtime Environment:
#
#  SIGSEGV (0xb) at pc=0xb2c9aa1d, pid=6694, tid=3000683376
#
# JRE version: 7.0_03-b147
# Java VM: OpenJDK Client VM (22.0-b10 mixed mode, sharing linux-x86 )
# Derivative: IcedTea7 2.1.1pre
# Distribution: Debian GNU/Linux unstable (sid), package 7~u3-2.1.1~pre1-2
# Problematic frame:
# C  [liblcms2.so.2+0x12a1d]  cmsSaveProfileToIOhandler+0x2d
#
# Failed to write core dump. C

[rfc][icedtea-web] Ignore invalid .jar files specified for plugin

Adam Domurad — 2012-05-25T19:17:48

So, first patch that isn't something trivial, I'll definitely need
people to weigh in on this one. 

The proprietary plug-in seems to just skip over any malformed .jar files
and carry on loading. This patch emulates that behaviour. 
This alleviates some of the symptoms of
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1011 
However, the plugin should still parse folders differently and look for
resources in folders like the proprietary plug-in does.

ChangeLog:
2012-05-25  Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>

Ignore invalid jar files, like the oracle plugin does.
* netx/net/sourceforge/jnlp/tools/JarCertVerifier.java: Added extra 
possible verification result, INVALID_JAR. This value occurs if the
.jar file could not be properly loaded. The .jar file is then ignored.

/hg/icedtea-web: Changed for-loops over iterators and indices to...

2012-05-25T15:44:55

changeset 6df151bb5320 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6df151bb5320
author: Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Fri May 25 11:44:13 2012 -0400

Changed for-loops over iterators and indices to for-each loops if they
were sufficient and clearer.


diffstat:

 ChangeLog                                                         |  18 ++++
 netx/net/sourceforge/jnlp/JNLPFile.java                           |   4 +-
 netx/net/sourceforge/jnlp/PluginBridge.java                       |   4 +-
 netx/net/sourceforge/jnlp/ResourcesDesc.java                      |  17 ++--
 netx/net/sourceforge/jnlp/cache/CacheUtil.java                    |  31 ++++----
 netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java     |   8 +-
 netx/net/sourceforge/jnlp/cache/Resource.java                     |   3 +-
 netx/net/sourceforge/jnlp/cache/ResourceTracker.java              |  37 ++++-----
 netx/net/sourceforge/jnlp/runtime/AppletEnvir

/hg/icedtea-web: Introduced constant NUM_STR_BUFFER_SIZE to repl...

2012-05-25T15:24:26

changeset 082f04822f12 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=082f04822f12
author: Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Fri May 25 11:23:47 2012 -0400

Introduced constant NUM_STR_BUFFER_SIZE to replace magic constants.
Clarified some uses of snprintf.


diffstat:

 ChangeLog                              |   13 ++++
 plugin/icedteanp/IcedTeaNPPlugin.cc    |    6 +-
 plugin/icedteanp/IcedTeaPluginUtils.cc |  106 +++++++++++++++-----------------
 plugin/icedteanp/IcedTeaPluginUtils.h  |    4 +
 4 files changed, 71 insertions(+), 58 deletions(-)

diffs (199 lines):

diff -r 9d422db340b8 -r 082f04822f12 ChangeLog
--- a/ChangeLogFri May 25 10:34:24 2012 -0400
+++ b/ChangeLogFri May 25 11:23:47 2012 -0400
< at >< at > -1,3 +1,16 < at >< at >
+2012-05-23  Adam Domurad  <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
+Removed instances of snprintf where buffer size was not known. Added
+buffer size constant for allocating buffers for numeric c

vm_start_mutex use in IcedTeaNPPlugin.cc looks fishy

Martin Olsson — 2012-05-23T14:50:19

The usage of "vm_start_mutex" in IcedTeaNPPlugin.cc looks buggy to me.
Won't each thread just create and lock it's own mutex, thereby voiding the
raison d'être of the mutex?


Martin

[PATCH] fix mutex related crash + cleanup .hgignore

Martin Olsson — 2012-05-23T14:46:58

Two patches for icedtea-web attached.

which package do I need to avoid: "package org.junit does not exist"

Martin Olsson — 2012-05-23T14:45:06

When I try to run tests using:

        rm -rf ~/ice
        mkdir ~/ice
        ./autogen.sh
        ./configure --prefix=/home/molsson/ice
--with-jdk-home=/usr/lib/jvm/java-6-openjdk-amd64
        make
        make check
        make install
        make run-netx-dist-tests

Then I get this error:

tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ResourcesTest.java:42:
package org.junit does not exist

Full error:

        http://pastebin.com/4MTg03ni

...I assume I need to install some missing package (junit?), any ideas on
which one? I'm on Ubuntu 12.04

/hg/icedtea-web: Fix whitelisting to use src dir instead of buil...

2012-05-25T14:35:06

changeset 9d422db340b8 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=9d422db340b8
author: Danesh Dadachanji <ddadacha-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Fri May 25 10:34:24 2012 -0400

Fix whitelisting to use src dir instead of build dir.


diffstat:

 ChangeLog   |  6 ++++++
 Makefile.am |  2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r 2c84a314c411 -r 9d422db340b8 ChangeLog
--- a/ChangeLogThu May 24 15:37:30 2012 -0400
+++ b/ChangeLogFri May 25 10:34:24 2012 -0400
< at >< at > -1,3 +1,9 < at >< at >
+2012-05-24  Danesh Dadachanji <ddadacha-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
+
+Fix use of src dir instead of build dir when whitelisting.
+* Makefile.am (REPRODUCERS_CLASS_WHITELIST): Use abs_top_srcdir
+instead of abs_top_builddir.
+
 2012-05-23  Martin Olsson <martin-Gwph8TgvYLDLoDKTGw+V6w< at >public.gmane.org>
 
 * plugin/icedteanp/IcedTeaPluginUtils.cc:
diff -r 2c84a314c411 -r 9d422db340b8 Makefile.am
--- a/Makefile.amThu May

[rfc][icedtea-web] Simple for-each loop style patch

Adam Domurad — 2012-05-25T13:56:22

Hey all. I find the for-each syntax that Java 1.5 to be pretty clear in
intent when it comes to data structure iteration. I went through the
code and changed some occurrences of explicit index/iterator loops to
for-each.

OK for HEAD ? (Ran with run-netx-dist-tests with 21/104 failures)

Changelog:
2012-05-25  Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>

Changed for-loops over iterators and indices to for-each loops if they
were sufficient and clearer.
*netx/net/sourceforge/jnlp/JNLPFile.java: Changed for-loops that could
be expressed more clearly as for-each loops.
*netx/net/sourceforge/jnlp/PluginBridge.java: Same
*netx/net/sourceforge/jnlp/ResourcesDesc.java: Same
*netx/net/sourceforge/jnlp/cache/CacheUtil.java: Same
*netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java: Same
*netx/net/sourceforge/jnlp/cache/Resource.java: Same
*netx/net/sourceforge/jnlp/cache/ResourceTracker.java: Same
*netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java: Same
*netx/net/sour

/hg/icedtea7: Bump to OpenJDK7u6 b10.

2012-05-25T13:05:11

changeset 2c3c929e038c in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=2c3c929e038c
author: Andrew John Hughes <ahughes-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Fri May 25 14:04:55 2012 +0100

Bump to OpenJDK7u6 b10.

2012-05-25  Andrew John Hughes  <ahughes-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>

* Makefile.am:
(OPENJDK_VERSION): Bump to b10.
(JDK_UPDATE_VERSION): Bump to u6.
(CORBA_CHANGESET): Update to IcedTea7 forest head.
(HOTSPOT_CHANGESET): Likewise.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(HOTSPOT_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(STRIP_POLICY): Changed from ALT_STRIP_POLICY
due to upstream changes.
* patches/boot/ecj-diamond.patch:
Recreated, new case added in java.io.FileDescriptor.
* patches/boot/ecj-trywi

[rfc] [icedtea-web] get rid of repated sout/serr in reproducerstestcases

Jiri Vanek — 2012-05-25T12:55:28

Hi!

I would like to get rid of repeating std out/err reprint in reproducers by moving this into 
ServerAccess class. This patch is adding simple loging interface for stdout/err and (mainly) is 
hiding reprinting (logging since now:-) of processes out/err and "connectng: " message into 
executeProcess.

My goal in longer term is to have html file (generated from logged xml file probably) which I will 
be able to link (anchor inlcuded) from current test results html files.And so I will be able to 
quickly find whats wrong. Now it is becoming little bit painfull. >(Both stdou/err of processes and 
searching in looong output file)

Saad, Danesh - you have number of reproducers in development. Please count with this change.


Thanx in advance
    J.
diff -r 2c84a314c411 tests/jnlp_tests/signed/AppletTestSigned/testcases/AppletTestSignedTests.java
--- a/tests/jnlp_tests/signed/AppletTestSigned/testcases/AppletTestSignedTests.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/signed/AppletTestSigned/testca

/hg/gfx-test: * src/org/gfxtest/testsuites/PrintTestLines.java:

2012-05-25T10:04:21

changeset b56f62052e46 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=b56f62052e46
author: Pavel Tisnovsky <ptisnovs-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Fri May 25 12:07:03 2012 +0200

* src/org/gfxtest/testsuites/PrintTestLines.java:
Added new tests to this test suite.


diffstat:

 ChangeLog                                      |    5 +
 src/org/gfxtest/testsuites/PrintTestLines.java |  239 ++++++++++++++++++++++++-
 2 files changed, 241 insertions(+), 3 deletions(-)

diffs (317 lines):

diff -r ab51d1f4d8ba -r b56f62052e46 ChangeLog
--- a/ChangeLogThu May 24 11:41:36 2012 +0200
+++ b/ChangeLogFri May 25 12:07:03 2012 +0200
< at >< at > -1,3 +1,8 < at >< at >
+2012-05-25  Pavel Tisnovsky  <ptisnovs-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
+
+* src/org/gfxtest/testsuites/PrintTestLines.java:
+Added new tests to this test suite.
+
 2012-05-24  Pavel Tisnovsky  <ptisnovs-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
 
 * src/org/gfxtest/framework/PrintTest.java:
diff -r ab51d1f4

/hg/icedtea-web: Fixed spaces -> tabs in ChangeLog

2012-05-24T19:38:11

changeset 2c84a314c411 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2c84a314c411
author: Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 15:37:30 2012 -0400

Fixed spaces -> tabs in ChangeLog


diffstat:

 ChangeLog |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r c6e355e0c034 -r 2c84a314c411 ChangeLog
--- a/ChangeLogThu May 24 14:59:04 2012 -0400
+++ b/ChangeLogThu May 24 15:37:30 2012 -0400
< at >< at > -1,7 +1,7 < at >< at >
 2012-05-23  Martin Olsson <martin-Gwph8TgvYLDLoDKTGw+V6w< at >public.gmane.org>
 
-       * plugin/icedteanp/IcedTeaPluginUtils.cc:
-       Tiny fixup for changeset 383; don't do free(stack_variable).
+* plugin/icedteanp/IcedTeaPluginUtils.cc:
+Tiny fixup for changeset 383; don't do free(stack_variable).
 
 2012-05-20  Jiri Vanek  <jvanek-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
 
< at >< at > -23,6 +23,7 < at >< at >
 If there is no match, will not be included. 
 
 2012-05-24  Martin Olsson <martin-Gwph8

/hg/icedtea-web: Removed residual free(str) on stack variable.

2012-05-24T18:59:11

changeset c6e355e0c034 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c6e355e0c034
author: Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 14:59:04 2012 -0400

Removed residual free(str) on stack variable.


diffstat:

 ChangeLog                              |  5 +++++
 plugin/icedteanp/IcedTeaPluginUtils.cc |  1 -
 2 files changed, 5 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r 7b3855664763 -r c6e355e0c034 ChangeLog
--- a/ChangeLogThu May 24 19:57:14 2012 +0200
+++ b/ChangeLogThu May 24 14:59:04 2012 -0400
< at >< at > -1,3 +1,8 < at >< at >
+2012-05-23  Martin Olsson <martin-Gwph8TgvYLDLoDKTGw+V6w< at >public.gmane.org>
+
+       * plugin/icedteanp/IcedTeaPluginUtils.cc:
+       Tiny fixup for changeset 383; don't do free(stack_variable).
+
 2012-05-20  Jiri Vanek  <jvanek-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
 
 Reproducers engine enhanced for jars in subdirectories by "." naming convention
diff -r 7b3855664763 -r c6e355e0c034 plugin/

/hg/icedtea-web: 2 new changesets

2012-05-24T17:54:39

changeset 52fbab80caf4 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=52fbab80caf4
author: Jiri Vanek <jvanek-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 19:52:17 2012 +0200

Introduced whitelist for reproducers


changeset 7b3855664763 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=7b3855664763
author: Jiri Vanek <jvanek-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 19:57:14 2012 +0200

Reproducers engine enhanced for jars in subdirectories by "." naming convention


diffstat:

 ChangeLog                 |  19 ++++++++++++++++
 Makefile.am               |  54 ++++++++++++++++++++++++++++++++++++++++++++--
 netx-dist-tests-whitelist |   1 +
 3 files changed, 71 insertions(+), 3 deletions(-)

diffs (122 lines):

diff -r 2c4154754aef -r 7b3855664763 ChangeLog
--- a/ChangeLogThu May 24 10:31:44 2012 -0400
+++ b/ChangeLogThu May 24 19:57:14 2012 +0200
< at >< at > -1,3 +1,22 < at >< at >
+2012-05-20  Jiri Vanek  <jv

[rfc][icedtea-web] Removal of 'magic' numbers and more consistentbuffer sizes in C++ side of plugin

Adam Domurad — 2012-05-24T14:59:18

Hey all. This is a response to comments from Pavel on a patch that I
created earlier. I decided to re-post with [rfc] in the name to be
clear. This addresses the issue of magic numbers being used for the
buffer sizes, and the somewhat unclear 'sizeof' usage (that I originally
used) to get the buffer size. As well it avoids using snprintf for
emptying a string, opting for the somewhat clearer strcpy.

Changelog:
2012-05-23  Adam Domurad  <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
        Removed instances of snprintf where buffer size was not known.
Added
        buffer size constant for allocating buffers for numeric
conversions.
        * plugin/icedteanp/IcedTeaNPPlugin.cc: Removed usage of snprintf
for 
        simple blanking of strings. Buffer size was misguided
previously. 
        Used NUM_STR_BUFFER_SIZE constant to replace magic numbers.
        * plugin/icedteanp/IcedTeaPluginUtils.cc: Made 
        NPVariantToString(NPVariant variant, std::string* result) use
space 
        indentation. Us

/hg/MauveTestCoverage: * src/ReportGenerator.java:

2012-05-24T14:52:36

changeset 8d326a855021 in /hg/MauveTestCoverage
details: http://icedtea.classpath.org/hg/MauveTestCoverage?cmd=changeset;node=8d326a855021
author: Pavel Tisnovsky <ptisnovs-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 16:55:09 2012 +0200

* src/ReportGenerator.java:
Fixed an exception occuring when class list
contains an empty line (usually at the end
of file).


diffstat:

 ChangeLog                |   7 +++++++
 src/ReportGenerator.java |  10 +++++++++-
 2 files changed, 16 insertions(+), 1 deletions(-)

diffs (34 lines):

diff -r b6c8372f5723 -r 8d326a855021 ChangeLog
--- a/ChangeLogWed May 16 10:59:45 2012 +0200
+++ b/ChangeLogThu May 24 16:55:09 2012 +0200
< at >< at > -1,3 +1,10 < at >< at >
+2012-05-24  Pavel Tisnovsky  <ptisnovs-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
+
+* src/ReportGenerator.java:
+Fixed an exception occuring when class list
+contains an empty line (usually at the end
+of file).
+
 2012-05-16  Pavel Tisnovsky  <ptisnovs-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
 
 * src/ClassInf

/hg/icedtea-web: 3 new changesets

2012-05-24T14:34:28

changeset f19299dd8144 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f19299dd8144
author: Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 10:21:14 2012 -0400

Backed out changeset 43a78616b1dd


changeset bb68413d52fb in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bb68413d52fb
author: Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 10:28:47 2012 -0400

Finished commit rollbacks.


changeset 2c4154754aef in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2c4154754aef
author: Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 10:31:44 2012 -0400

Reapplied the patches, sorry for the mess!


diffstat:

 ChangeLog |  58 +++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 49 insertions(+), 9 deletions(-)

diffs (75 lines):

diff -r 43a78616b1dd -r 2c4154754aef Chan

/hg/icedtea-web: 2 new changesets

2012-05-24T13:12:42

changeset cb6d6d2e086a in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=cb6d6d2e086a
author: Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 09:10:41 2012 -0400

Added Martin Olsson's typo fix


changeset 43a78616b1dd in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=43a78616b1dd
author: Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 09:12:38 2012 -0400

fixing conflict in ChangeLog


diffstat:

 AUTHORS                                                  |   1 +
 ChangeLog                                                |   4 +
 netx/net/sourceforge/jnlp/resources/Messages.properties  |   6 +-
 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java   |  89 ++++++++++-----
 netx/net/sourceforge/jnlp/security/CertificateUtils.java |   3 +-
 netx/net/sourceforge/jnlp/security/KeyStores.java        |  15 ++
 plugin/icedteanp/IcedTeaNPPlugin.cc                      |